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

105393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
f79d7238b8 Merge branch 'QA_4_6' 2016-02-24 14:41:09 +01:00
Michal Čihař
a6e3c6e020 Merge commit '4450a44d54d2be5b4bf082c19223ddd4f788ed2b' 2016-02-24 14:40:35 +01:00
Michal Čihař
d96bc13f76 Strip motranslator tests from release tarball 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-24 14:39:52 +01:00
Michal Čihař
7ca6299093 Merge branch 'QA_4_5' into QA_4_6 2016-02-24 14:39:39 +01:00
Weblate
a0845e92fc Merge remote-tracking branch 'origin/master' 2016-02-24 14:36:01 +01:00
Yury Vidal
c82baa09a7 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.8% (2951 of 3214 strings)

[CI skip]
 2016-02-24 14:36:00 +01:00
Michal Čihař
09d3286895 Merge pull request #12023 from nijel/motranslator 
Replace embedded php-gettext library with motranslator
 2016-02-24 14:35:52 +01:00
Michal Čihař
676514a7e8 Remove code not needed with motranslator 
- the charset is always UTF-8
- the gettext constants do not have to be defined

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-24 13:02:55 +01:00
Michal Čihař
912bf964c7 Replace embedded php-gettext library with motranslator 
Fixes #12018

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-24 11:49:43 +01:00
Madhura Jayaratne
bdfbddf771 collation_connection is also not centrally set up in bootstrap 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 23:09:31 +11:00
Madhura Jayaratne
891d724772 $GLOBALS['server'] is not centrally set in bootstrap 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 23:06:56 +11:00
Madhura Jayaratne
ada984c84d You should reset the GLOBALS you are unsetting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 23:03:52 +11:00
Madhura Jayaratne
5a8db3e65f Fix duplicate method name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:57:27 +11:00
Madhura Jayaratne
47b5b07b13 Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:46:32 +11:00
Madhura Jayaratne
81821574b1 Merge test files since they both test the same class 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:45:28 +11:00
Madhura Jayaratne
6c2ade29d9 This doc block is for the method and not for the use 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:41:10 +11:00
Madhura Jayaratne
abfce82447 Fix test file names and test class names 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:39:15 +11:00
Madhura Jayaratne
b2e990a067 Fix class doc comments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:35:02 +11:00
Madhura Jayaratne
2a5f6acbee Class curly braces should be on the next line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:34:32 +11:00
Madhura Jayaratne
340861150a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-02-23 22:33:31 +11:00
Madhura Jayaratne
c7063d2517 Add class doc blocks 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:32:05 +11:00
Weblate
91fa913fdc Merge remote-tracking branch 'origin/master' 2016-02-23 10:00:37 +01:00
Domen
e2998b742f Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2016-02-23 10:00:36 +01:00
Madhura Jayaratne
f0bbe702ba Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-02-23 20:00:24 +11:00
Madhura Jayaratne
d1ac2a64a5 Fix #12017 Cannot easily select multiple tables when exporting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 19:58:18 +11:00
Kristjan Räts
fb7bea73f0 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2016-02-23 09:36:30 +01:00
Stefano Martinelli
b61c787e8f Translated using Weblate (Italian) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2016-02-22 22:10:38 +01:00
Stefano Martinelli
4450a44d54 Translated using Weblate (Italian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-02-22 22:09:10 +01:00
dingo thirteen
23b1337bdf Translated using Weblate (Dutch) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-22 20:18:21 +01:00
Burak Yavuz
ef34c811ad Translated using Weblate (Turkish) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-22 19:54:17 +01:00
Weblate
8fa667e7e3 Merge remote-tracking branch 'origin/master' 2016-02-22 16:10:53 +01:00
Giovanni Sora
4c2ff88de6 Translated using Weblate (Interlingua) 
Currently translated at 73.4% (2357 of 3208 strings)

[CI skip]
 2016-02-22 16:10:52 +01:00
Michal Čihař
8b518460fb Merge pull request #11996 from 007durgesh219/Issue#11989 
Issue#11989, #11988, #11990
 2016-02-22 16:10:46 +01:00
Isaac Bennetch
4b3c91b0f5 Version 4.5.5 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-22 09:56:51 -05:00
Isaac Bennetch
2e26e33671 Archive old changelog entries 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-22 09:53:25 -05:00
Isaac Bennetch
386c4bef20 Document Isaac as the new release manager 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-22 09:50:14 -05:00
Παναγιώτης Παπάζογλου
c0e1c5bb52 Translated using Weblate (Greek) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2016-02-22 14:45:48 +01:00
Weblate
33807fdf1d Merge remote-tracking branch 'origin/master' 2016-02-22 14:44:20 +01:00
Παναγιώτης Παπάζογλου
da65ea02c8 Translated using Weblate (Greek) 
Currently translated at 99.9% (3205 of 3208 strings)

[CI skip]
 2016-02-22 14:44:17 +01:00
Michal Čihař
889a291927 Merge pull request #11978 from zixtor/master 
Resolve #11643 : Maintain filter states for db/table navigation filters
 2016-02-22 14:44:12 +01:00
Michal Čihař
943f404b36 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 14:23:19 +01:00
Michal Čihař
55fec136f7 Add back SQL parser messages to phpMyAdmin 
Temporary solution until we decide for something better.

See issue #12013

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 14:21:57 +01:00
Michal Čihař
c81561bac4 Avoid extracting translations from third party libraries 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 14:19:46 +01:00
Michal Čihař
aa077eee78 Merge pull request #11963 from Achilles-96/Issue-11865 
Fixes #11865 partially
 2016-02-22 13:00:55 +01:00
Achilles-96
4073e4676f Fixes #11865 partially-Added support for shortcuts 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2016-02-22 17:06:23 +05:30
Michal Čihař
6a46ea5684 Include tests in test coverage 
It helps to identify not executed test files.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 11:41:56 +01:00
Durgesh
6650f7b07d Refactor text sanitization and javascript escaping, Issue #11989, #11988 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-22 14:45:19 +05:30
Durgesh
0b64827930 Refactored url parmeters generating, Issue #11990 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-22 14:36:41 +05:30
Michal Čihař
b8c39d413d Do not try to run selenium tests if not told so 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 09:26:28 +01:00
Michal Čihař
d7bd3a8158 Fix typo in variable description 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 09:20:25 +01:00