gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,531 Commits 12 Branches 481 Tags 2.4 GiB
39771f44c0
Commit Graph

104531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
39771f44c0 Simplify code 
For ages we set $GLOBALS['lang'] to language code, so it's safe to use
it here.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-12 14:50:13 +01:00
Michal Čihař
3ecafc5973 Move mysql_charset_map to common.inc.php 
It should be later removed (as it's IMHO not needed), but we move it out
of select_lang.inc.php where it really doesn't belong.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-12 14:50:13 +01:00
Michal Čihař
ff21ad8e0e Remove unused use 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-12 14:49:40 +01:00
Atul Pratap Singh
ea9a8aeadd Merge branch 'QA_4_5' 2016-01-12 18:43:51 +05:30
Atul Pratap Singh
f03d49e674 Merge commit '0f23dd5' 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>

Conflicts:
	js/messages.php
 2016-01-12 18:43:15 +05:30
Weblate
6b781d7fd7 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-12 14:04:30 +01:00
Xosé Calvo
5b577198bb Translated using Weblate (Galician) 
Currently translated at 85.0% (2730 of 3210 strings)

[CI skip]
 2016-01-12 14:04:28 +01:00
Marc Delisle
814ea29854 Translated using Weblate (French) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-12 14:04:28 +01:00
Kristjan Räts
5613c32029 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-12 14:04:28 +01:00
Atul Pratap Singh
0f23dd51d8 Add localStorage availability checks, update the error message 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-01-12 18:30:04 +05:30
Marc Delisle
c32e2ed3a5 Translated using Weblate (French) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-01-12 12:37:13 +01:00
Madhura Jayaratne
682f5eb79a Remove more removeProp() function calls 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-12 20:25:04 +11:00
Madhura Jayaratne
702fc182ae Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-01-12 20:22:58 +11:00
Madhura Jayaratne
723b4bdfbe Fix #11846 Grid editing window is disabled the second time 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-12 20:21:12 +11:00
Madhura Jayaratne
614b7d55ab Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-12 20:16:27 +11:00
Weblate
eca5e8f5c3 Merge remote-tracking branch 'origin/master' 2016-01-12 09:53:13 +01:00
Xosé Calvo
351f330f5a Translated using Weblate (Galician) 
Currently translated at 84.0% (2704 of 3217 strings)

[CI skip]
 2016-01-12 09:53:10 +01:00
Madhura Jayaratne
a8f960bcc2 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-01-12 19:52:51 +11:00
Madhura Jayaratne
9873f76e5f Fix #11771 Transformation column path problem 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-12 19:51:33 +11:00
Weblate
b3e5fc7534 Merge remote-tracking branch 'origin/master' 2016-01-11 14:12:28 +01:00
Kristjan Räts
63a5849964 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-01-11 14:12:26 +01:00
Marc Delisle
bc295fdb30 Use strict comparison 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-11 08:12:11 -05:00
Madhura Jayaratne
99cb7f1237 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-01-11 17:54:24 +11:00
Madhura Jayaratne
04bf7696ff Merge branch 'QA_4_5' 2016-01-11 17:54:02 +11:00
Madhura Jayaratne
c8eeccf87b Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2016-01-11 17:50:29 +11:00
Madhura Jayaratne
7d261f45fe Fix #11840 Index comments not working properly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-11 17:49:17 +11:00
Weblate
61def5438f Merge remote-tracking branch 'origin/master' 2016-01-10 22:47:29 +01:00
Martin Lacina
dd0b36903d Translated using Weblate (Slovak) 
Currently translated at 83.0% (2673 of 3217 strings)

[CI skip]
 2016-01-10 22:47:28 +01:00
Madhura Jayaratne
5e692c2d4b Merge branch 'QA_4_5' 2016-01-11 08:46:56 +11:00
Weblate
8b561a00bf Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-10 22:43:14 +01:00
Martin Lacina
355e36d55d Translated using Weblate (Slovak) 
Currently translated at 83.9% (2694 of 3210 strings)

[CI skip]
 2016-01-10 22:43:13 +01:00
Madhura Jayaratne
5a54fb1ee1 Fix #11772 Table pagination does nothing when session expired 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-11 08:42:55 +11:00
Marc Delisle
348f4dea37 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-10 07:43:01 -05:00
Marc Delisle
e8b648f920 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-10 07:39:54 -05:00
Marc Delisle
cc0b6497c0 Fix unit tests 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-10 07:38:48 -05:00
Marc Delisle
6089849fcc Merge commit '66d7c50bee6986c5ff308bca288c01b673a2f69f' 2016-01-10 07:30:26 -05:00
Weblate
4c482a64d9 Merge remote-tracking branch 'origin/master' 2016-01-10 12:42:55 +01:00
Martin Lacina
77ac017cc9 Translated using Weblate (Slovak) 
Currently translated at 82.9% (2667 of 3217 strings)

[CI skip]
 2016-01-10 12:42:54 +01:00
Kyeong Su Shin
ce228d1eb4 Translated using Weblate (Korean) 
Currently translated at 78.1% (2514 of 3217 strings)

[CI skip]
 2016-01-10 12:42:54 +01:00
Atul Pratap Singh
af7f2aa54b Merge branch 'QA_4_5' 2016-01-10 17:12:24 +05:30
Atul Pratap Singh
5f22b1ed03 Merge commit '3b5ca40' 2016-01-10 17:12:13 +05:30
Weblate
658eedb405 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-10 12:37:33 +01:00
Martin Lacina
04cf33fcfe Translated using Weblate (Slovak) 
Currently translated at 83.8% (2693 of 3210 strings)

[CI skip]
 2016-01-10 12:37:32 +01:00
Kyeong Su Shin
ca9ef2025d Translated using Weblate (Korean) 
Currently translated at 79.2% (2545 of 3210 strings)

[CI skip]
 2016-01-10 12:37:31 +01:00
Atul Pratap Singh
36a63a2498 Revert onload changes due to side effects 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-01-10 17:05:29 +05:30
Achilles-96
66d7c50bee Fixes #11796 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2016-01-10 14:48:39 +05:30
Marc Delisle
c9b0a2ce4c Translated using Weblate (French) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-01-09 15:57:30 +01:00
Marc Delisle
6fd7fc443d Improve message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-09 07:50:24 -05:00
Marc Delisle
3aeebfa9b0 Merge branch 'QA_4_5' 2016-01-09 07:48:49 -05:00
Weblate
3b5ca40cc4 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-09 13:48:39 +01:00