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

103503 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Madhura Jayaratne
dc5e057fe2 Fix #11607 Unable to change password from Login information tab - make the error message more explicit 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-27 08:09:43 +11:00
Weblate
7a9b224071 Merge remote-tracking branch 'origin/master' 2015-10-26 21:37:03 +01:00
Kyeong Su Shin
a8e4f4d428 Translated using Weblate (Korean) 
Currently translated at 77.1% (2490 of 3228 strings)

[CI skip]
 2015-10-26 21:37:02 +01:00
Madhura Jayaratne
b78f215ad5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-10-27 07:36:45 +11:00
Madhura Jayaratne
c2846af4c8 Fix #11606 PMA_Util not found when changing password 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-27 07:34:13 +11:00
Michal Čihař
402d9ff8e6 Translated using Weblate (Korean) 
Currently translated at 77.1% (2489 of 3228 strings)

[CI skip]
 2015-10-26 11:00:37 +01:00
Madhura Jayaratne
7c43e1f631 Fix #11603 Namespace clash for class Error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-26 19:49:51 +11:00
Madhura Jayaratne
5087a2d2b1 Merge branch 'QA_4_5' 2015-10-26 19:23:37 +11:00
Madhura Jayaratne
653d800a5b Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-10-26 19:15:39 +11:00
Madhura Jayaratne
5ca47d209b Search clause is also a part of the query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-26 19:14:12 +11:00
Kristjan Räts
3c15a3351b Translated using Weblate (Estonian) 
Currently translated at 100.0% (3228 of 3228 strings)

[CI skip]
 2015-10-26 08:20:58 +01:00
Kristjan Räts
cfaa76c4ae Translated using Weblate (Estonian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-26 08:17:39 +01:00
Madhura Jayaratne
06646c8303 Merge branch 'QA_4_5' 2015-10-26 17:51:24 +11:00
Madhura Jayaratne
2a0b927606 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-10-26 17:49:13 +11:00
Madhura Jayaratne
2625cf3ba3 Merge branch 'QA_4_5' 2015-10-26 17:34:08 +11:00
Madhura Jayaratne
f859287249 Update dummy queries as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-26 17:32:38 +11:00
Madhura Jayaratne
fdf9c25be0 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-10-26 17:28:02 +11:00
Madhura Jayaratne
02a266e9b2 Consistent spacing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-26 17:26:19 +11:00