gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,712 Commits 12 Branches 481 Tags 2.4 GiB
22e006fd0d
Commit Graph

100712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
22e006fd0d Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 12:04:39 +05:30
Madhura Jayaratne
d9afffb089 Remove configuration storage data related to a user upon deleting the user 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 11:52:13 +05:30
Madhura Jayaratne
9d4850c974 Syntax highlight settings_data 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 08:33:58 +05:30
Madhura Jayaratne
29e29757c6 Remove more character set specifications 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 08:26:04 +05:30
Madhura Jayaratne
eb6607bbd7 Merge branch 'QA_4_4' 2015-07-02 08:24:50 +05:30
Madhura Jayaratne
626487f865 Remove character set from create_tables_drizzle.sql 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 08:19:24 +05:30
Marc Delisle
b18bda2e51 Fix loose comparison 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-01 07:57:12 -04:00
Isaac Bennetch
d9d25db53d Merge pull request #1769 from devenbansod/342_correction 
'As Separate files' export works with ZIP compression only
 2015-07-01 00:10:36 -04:00
Deven Bansod
2ff6d53b12 Fixed typos 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-07-01 13:46:23 +05:30
Marc Delisle
e093a33422 Merge branch 'QA_4_4' 2015-06-30 17:13:08 -04:00
Marc Delisle
d9043cac8c Merge commit 'b956fe7' 2015-06-30 17:13:00 -04:00
Weblate
498d5fc697 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-06-30 23:12:50 +02:00
Marc Delisle
777a8a00e1 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-06-30 23:12:47 +02:00
Stefano Martinelli
70eca3b6a7 Translated using Weblate (Italian) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-06-30 23:12:44 +02:00
Yaron Shahrabani
593280fee5 Translated using Weblate (Hebrew) 
Currently translated at 19.0% (577 of 3035 strings)

[CI skip]
 2015-06-30 23:12:42 +02:00
Valter Georgiev
781f917faf Translated using Weblate (Bulgarian) 
Currently translated at 63.4% (1925 of 3035 strings)

[CI skip]
 2015-06-30 23:12:40 +02:00
Arben Çokaj
64698e7505 Translated using Weblate (Albanian) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-06-30 23:12:38 +02:00
Marc Delisle
66b4be9b74 bug #4972 Incorrect length computed for binary data 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-30 17:12:23 -04:00
Deven Bansod
863c29bbe7 Separate file export works with ZIP only 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-07-01 02:10:12 +05:30
Weblate
fc855b37e2 Merge remote-tracking branch 'origin/master' 2015-06-30 20:21:24 +02:00
Yaron Shahrabani
1a1f6779c3 Translated using Weblate (Hebrew) 
Currently translated at 18.2% (572 of 3142 strings)

[CI skip]
 2015-06-30 20:21:20 +02:00
Marc Delisle
8d0d02bb35 Merge pull request #1770 from nisargjhaveri/fix_style 
Make Scrutinizer Happy
 2015-06-30 14:21:16 -04:00
Nisarg Jhaveri
befe89ad4e Make Scrutinizer Happy 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-30 21:58:21 +05:30
Eyal Visoker
337e89e711 Translated using Weblate (Hebrew) 
Currently translated at 18.1% (571 of 3142 strings)

[CI skip]
 2015-06-30 15:45:54 +02:00
Madhura Jayaratne
69e1c473de Config option for Export\as_separate_files 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-30 15:37:30 +05:30
Madhura Jayaratne
7a6e1bf6e4 Match with config names, more instances 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-30 15:23:19 +05:30
Madhura Jayaratne
9b6561e2e3 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-30 15:21:36 +05:30
Madhura Jayaratne
dadecaf393 Match the name of corresponding config value. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-30 15:16:42 +05:30
Marc Delisle
438fb14713 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-30 05:17:56 -04:00
Marc Delisle
a4adbe712a Merge pull request #1767 from nisargjhaveri/tests 
Add missing docblock in Util_test
 2015-06-30 05:16:20 -04:00
Nisarg Jhaveri
f969a76cb2 Add missing docblock in Util_test 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-30 03:00:17 +05:30
Marc Delisle
16c833a816 Merge pull request #1766 from nisargjhaveri/tests 
Add some unit tests
 2015-06-29 17:26:52 -04:00
Isaac Bennetch
b3a8759ebe Merge pull request #1764 from devenbansod/rfe946_correction 
Few fixes related RFE#946 & RFE#657 - PR #1686 &  PR #1664
 2015-06-29 16:01:51 -04:00
Deven Bansod
c0df9a0a6e Changing a column's structure was not behaving properly 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-30 02:28:32 +05:30
Deven Bansod
bbd1dc8dab Flush privileges only when they are adjusted for atleast one column 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-30 02:27:33 +05:30
Deven Bansod
011b71d631 Make Scrutinizer Happy 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-30 02:18:05 +05:30
Nisarg Jhaveri
5733dd09e3 Add some unit tests 
- for Footer class
- for navigation/PMA_Node_Database class
- In Util class for foreign key check

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-30 01:29:36 +05:30
Isaac Bennetch
56ea56a513 Merge pull request #1765 from devenbansod/1060C 
Modified structure for pma__designer_settings table
 2015-06-29 10:49:40 -04:00
Παναγιώτης Παπάζογλου
14aeebe584 Translated using Weblate (Greek) 
Currently translated at 100.0% (3142 of 3142 strings)

[CI skip]
 2015-06-29 14:47:02 +02:00
Marc Delisle
3a3f7f7c5b Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-29 07:03:17 -04:00
Madhura Jayaratne
653acc8444 Group changing collation of all column and collation changing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-29 15:14:04 +05:30
Deven Bansod
2e6abf3cb2 Modified structure for pma__designer_settings table 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-29 13:33:42 +05:30
Madhura Jayaratne
dd3cd6bb24 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-29 13:33:30 +05:30
Madhura Jayaratne
ab17ab5ab9 ChangeLog entry for bug #4916 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-29 13:32:20 +05:30
Weblate
36c10e96f2 Merge remote-tracking branch 'origin/master' 2015-06-29 10:01:12 +02:00
Giovanni Sora
5cd289d42c Translated using Weblate (Interlingua) 
Currently translated at 69.6% (2188 of 3142 strings)

[CI skip]
 2015-06-29 10:01:08 +02:00
Valter Georgiev
1637382787 Translated using Weblate (Bulgarian) 
Currently translated at 62.0% (1950 of 3142 strings)

[CI skip]
 2015-06-29 10:01:06 +02:00
Arben Çokaj
fc4c62d6b6 Translated using Weblate (Albanian) 
Currently translated at 100.0% (3142 of 3142 strings)

[CI skip]
 2015-06-29 10:01:05 +02:00
Madhura Jayaratne
047b962d6e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-29 13:26:55 +05:30
Madhura Jayaratne
0a0879ea1e Upgrade CodeMirror to version 5.4.0 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-29 13:19:42 +05:30