gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,521 Commits 12 Branches 481 Tags 2.4 GiB
ffd2a95519
Commit Graph

103521 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
ffd2a95519 Fix failing test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-28 10:28:41 -04:00
Marc Delisle
0e57191f0a Merge branch 'QA_4_5' 2015-10-28 08:44:19 -04:00
Marc Delisle
fd7612be92 Merge commit '3e1da79' 2015-10-28 08:44:11 -04:00
Marc Delisle
9fb7b9828d Merge pull request #11615 from devenbansod/fix_11605_2 
Fix issue 11605 - new
 2015-10-28 08:43:01 -04:00
Deven Bansod
d604a36135 Fix issue 11605 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-28 22:18:38 +05:30
Marc Delisle
1fdc24ad24 Translated using Weblate (French) 
Currently translated at 100.0% (3228 of 3228 strings)

[CI skip]
 2015-10-28 12:02:07 +01:00
Weblate
2e1b742386 Merge remote-tracking branch 'origin/master' 2015-10-28 10:28:09 +01:00
Domen
12002ad299 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3228 of 3228 strings)

[CI skip]
 2015-10-28 10:28:08 +01:00
Madhura Jayaratne
38ce691b70 Merge branch 'QA_4_5' 2015-10-28 20:27:53 +11:00
Weblate
3e1da7914e Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-28 08:44:42 +01:00
Παναγιώτης Παπάζογλου
85873bf1b5 Translated using Weblate (Greek) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-28 08:44:42 +01:00
Madhura Jayaratne
4fd5a3a0ad Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 
Conflicts:
	ChangeLog
 2015-10-28 18:44:31 +11:00
Madhura Jayaratne
4b4f032046 Fix #11614 Undefined variable: db 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-28 18:42:34 +11:00
Domen
2936ecc418 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-28 00:33:43 +01:00
Παναγιώτης Παπάζογλου
3726fc201f Translated using Weblate (Greek) 
Currently translated at 100.0% (3228 of 3228 strings)

[CI skip]
 2015-10-27 19:00:00 +01:00
Marc Delisle
560b321d0c Merge branch 'QA_4_5' 2015-10-27 12:57:21 -04:00
Marc Delisle
c0b387acf2 Merge commit '1e6f128' 2015-10-27 12:57:10 -04:00
Deven Bansod
1e6f128202 Fix issue 11605 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-28 03:17:51 +05:30
Marc Delisle
d456a0f64d Merge commit '1b2cd3c' 2015-10-27 12:56:56 -04:00
Marc Delisle
2838f2505b ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-27 12:56:27 -04:00
Marc Delisle
d7ba4a5449 Merge pull request #11613 from devenbansod/fix_11605 
Fix issue #11605
 2015-10-27 12:55:37 -04:00
Marc Delisle
9bf888e222 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-10-27 10:22:37 -04:00
Marc Delisle
973283cd0c Fix typo in property name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-27 10:22:30 -04:00
Weblate
43760ab3ce Merge remote-tracking branch 'origin/master' 2015-10-27 15:04:07 +01:00
Marc Delisle
479a2c6363 Translated using Weblate (French) 
Currently translated at 99.9% (3227 of 3228 strings)

[CI skip]
 2015-10-27 15:04:05 +01:00
Marc Delisle
1d0c502a2c Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-27 10:03:56 -04:00
Marc Delisle
1b2cd3c39f Translated using Weblate (French) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-27 12:44:15 +01:00
Madhura Jayaratne
73d1de8ad7 Add supported file format for Archive storage engine 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-27 20:47:48 +11:00
Madhura Jayaratne
48020180fd Merge branch 'QA_4_5' 
Conflicts:
	libraries/operations.lib.php
 2015-10-27 20:41:17 +11:00
Madhura Jayaratne
3b4d9ddcf2 #11612 Undefined index: new_row_format 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-27 20:37:55 +11:00
Weblate
1a20138c50 Merge remote-tracking branch 'origin/master' 2015-10-27 09:52:23 +01:00
Burak Yavuz
938e8abf41 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3228 of 3228 strings)

[CI skip]
 2015-10-27 09:52:23 +01:00
Kristjan Räts
30d2f5be01 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3228 of 3228 strings)

[CI skip]
 2015-10-27 09:52:21 +01:00
dingo thirteen
f0987b5340 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3228 of 3228 strings)

[CI skip]
 2015-10-27 09:52:20 +01:00
Madhura Jayaratne
abffc62a02 Merge branch 'QA_4_5' 2015-10-27 19:52:05 +11:00
Weblate
71c1551c58 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-27 09:48:57 +01:00
Stefano Martinelli
2e9f7c7170 Translated using Weblate (Italian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-27 09:48:56 +01:00
Madhura Jayaratne
c9df59687d Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-10-27 19:48:21 +11:00
Madhura Jayaratne
ac97a97cb8 Fix #11610, #11611 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-27 19:45:39 +11:00
Stefano Martinelli
6ef7721248 Translated using Weblate (Italian) 
Currently translated at 100.0% (3228 of 3228 strings)

[CI skip]
 2015-10-27 09:44:54 +01:00
dingo thirteen
5264982990 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-27 09:00:33 +01:00
Kristjan Räts
332a61c697 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-27 08:28:47 +01:00
Burak Yavuz
a63075fed9 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-27 05:44:32 +01:00
Marc Delisle
5e0bd4d04e Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-26 20:01:34 -04:00
Marc Delisle
90277f9f0c Merge branch 'QA_4_5' 2015-10-26 20:01:04 -04:00
Marc Delisle
be2f978a6a Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-26 19:59:33 -04:00
Madhura Jayaratne
690c18f0ae Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-10-27 08:14:16 +11:00
Madhura Jayaratne
4d4cb9a5c2 Merge branch 'QA_4_5' 
Conflicts:
	server_privileges.php
 2015-10-27 08:12:53 +11:00
Weblate
aa770c3de5 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-26 22:10:07 +01:00
Michal Čihař
085087061c Translated using Weblate (Korean) 
Currently translated at 77.9% (2503 of 3211 strings)

[CI skip]
 2015-10-26 22:10:07 +01:00