gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,600 Commits 12 Branches 481 Tags 2.4 GiB
8e2f307279
Commit Graph

93600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
8e2f307279 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-30 11:10:00 -04:00
Marc Delisle
d6d6e31d7a Merge pull request #1259 from D-storm/bug-4479 
bug-4479 Missing permission in export dir not detected
 2014-06-29 13:50:13 -04:00
Ann + J.M
0676121253 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-29 18:44:09 +02:00
Chirayu Chiripal
6dc1178eae bug-4479 Missing permission in export dir not detected 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-29 20:22:49 +05:30
Weblate
8d9060dcf2 Merge remote-tracking branch 'origin/master' 2014-06-29 13:28:17 +02:00
Yungu Kim
595abf9ffa Translated using Weblate (Korean) 
Currently translated at 82.2% (2332 of 2834)
 2014-06-29 13:28:14 +02:00
Marc Delisle
8453488a26 Merge commit '5b1fe4e' 2014-06-29 07:26:54 -04:00
Marc Delisle
76d6aac6c0 Merge commit 'a292893' 2014-06-29 07:26:38 -04:00
Marc Delisle
5b1fe4e55f Add comments and todo for the justBrowsing logic 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-29 07:22:53 -04:00
Marc Delisle
50cf592e9d ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-29 07:16:43 -04:00
Shivam Dixit
3f21378e4c Fix for bug 4027 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-29 07:14:39 -04:00
Hugues Peccatte
929dccb9a3 Cherry-pick dd5ba23: Fix #4471: Undefined index warning with referenced column. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-28 19:09:20 +02:00
Weblate
3cde140c58 Merge remote-tracking branch 'origin/master' 2014-06-28 13:25:23 +02:00
Burak Yavuz
a2a25424ac Translated using Weblate (Turkish) 
Currently translated at 99.9% (2833 of 2834)
 2014-06-28 13:25:20 +02:00
Sevdimali İsa
906ae1bd17 Translated using Weblate (Azerbaijani) 
Currently translated at 41.0% (1162 of 2834)
 2014-06-28 13:25:17 +02:00
Marc Delisle
eb0664292b Remove debugger statement 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-28 07:25:05 -04:00
Hugues Peccatte
c81403ec9f Merge remote-tracking branch 'origin/QA_4_2' 2014-06-27 22:04:18 +02:00
Weblate
a2928939f1 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-06-27 22:04:01 +02:00
Dhananjay Nakrani
e80a278113 Translated using Weblate (Hindi) 
Currently translated at 46.2% (1282 of 2770)
 2014-06-27 22:03:58 +02:00
Sevdimali İsa
f434f7cada Translated using Weblate (Azerbaijani) 
Currently translated at 40.4% (1121 of 2770)
 2014-06-27 22:03:56 +02:00
Hugues Peccatte
9187498efb Merge pull request #1254 from Tithugues/QA_4_2_b4471 
Fix #4471: Undefined index warning with referenced column.
 2014-06-27 22:03:46 +02:00
Weblate
530e776a9d Merge remote-tracking branch 'origin/master' 2014-06-27 14:23:32 +02:00
Chien Wei Lin
c279259a07 Translated using Weblate (Traditional Chinese) 
Currently translated at 99.2% (2813 of 2834)
 2014-06-27 14:23:29 +02:00
Dhananjay Nakrani
466d87fe9d Translated using Weblate (Hindi) 
Currently translated at 45.0% (1276 of 2834)
 2014-06-27 14:23:26 +02:00
Sevdimali İsa
679b32aea4 Translated using Weblate (Azerbaijani) 
Currently translated at 40.7% (1156 of 2834)
 2014-06-27 14:23:24 +02:00
Marc Delisle
232a03a4bd Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-27 08:23:12 -04:00
Hugues Peccatte
920f83da2d Fix #4471: Undefined index warning with referenced column. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-26 21:03:17 +02:00
Weblate
af1a674d25 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-06-26 20:38:48 +02:00
Chien Wei Lin
960407f74c Translated using Weblate (Traditional Chinese) 
Currently translated at 99.9% (2768 of 2770)
 2014-06-26 20:38:44 +02:00
Dhananjay Nakrani
072191e678 Translated using Weblate (Hindi) 
Currently translated at 46.2% (1282 of 2770)
 2014-06-26 20:38:41 +02:00
Weblate
efd49d0867 Merge remote-tracking branch 'origin/master' 2014-06-26 18:36:11 +02:00
Chien Wei Lin
406c9fe29d Translated using Weblate (Traditional Chinese) 
Currently translated at 98.5% (2793 of 2834)
 2014-06-26 18:36:08 +02:00
Dieter Adriaenssens
1e76155087 Translated using Weblate (Dutch) 
Currently translated at 99.4% (2817 of 2834)
 2014-06-26 18:36:05 +02:00
Marc Delisle
beb5803870 Merge branch 'QA_4_2' 2014-06-26 12:35:49 -04:00
Marc Delisle
719527d0e7 4.2.5 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-26 12:35:15 -04:00
Marc Delisle
39552e232a 4.2.6-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-26 10:02:49 -04:00
Marc Delisle
f03b931461 Merge branch 'QA_4_2' 2014-06-26 10:02:18 -04:00
Marc Delisle
d8b3f9a766 4.2.6-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-26 10:01:48 -04:00
Marc Delisle
8ce1e316a6 Merge branch 'QA_4_2' 2014-06-26 09:58:01 -04:00
Marc Delisle
18e6cfd5c5 mcrypt: remove the requirement (64-bit) and the related warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-26 09:56:24 -04:00
Marc Delisle
210292e463 Merge branch 'QA_4_2' 2014-06-26 08:10:44 -04:00
Marc Delisle
b42eb72b8c Add index: increase the chance that the dialog's footer will be visible 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-26 08:10:00 -04:00
Ann + J.M
0d3aed0a09 Add padding to #pma_footer 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-26 12:59:50 +02:00
Isaac Bennetch
a61a2b0e87 Merge pull request #1256 from D-storm/l10n 
make alias export dialog button names translatable
 2014-06-25 16:43:50 -04:00
Chirayu Chiripal
b3b6176f16 make alias export dialog button names translatable 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-26 01:57:21 +05:30
Marc Delisle
e1b598ff1e Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-25 13:05:57 -04:00
Marc Delisle
e0933c8cba Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-25 13:03:44 -04:00
Michal Čihař
6be21dcb47 Merge pull request #1251 from WhaleWatching/console 
PMA console, history and bookmarks.
 2014-06-25 15:37:29 +02:00
Edward Cheng
fb14e92d62 PMA console, history and bookmarks. 
Modified: resizer of navigation bar: whole-time-bind events removed.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-06-25 21:22:33 +08:00
Michal Čihař
34fec13115 Merge pull request #1252 from nijel/remove-observer 
Remove plugin manager and observer classes
 2014-06-25 14:27:45 +02:00