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

93575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Weblate
217dbde132 Merge remote-tracking branch 'origin/master' 2014-06-25 14:11:15 +02:00
Giovanni Sora
90982b2cc2 Translated using Weblate (Interlingua) 
Currently translated at 55.1% (1563 of 2834)
 2014-06-25 14:11:12 +02:00
Michal Čihař
6620d0c193 Merge remote-tracking branch 'origin/QA_4_2' 2014-06-25 14:11:04 +02:00
Michal Čihař
06b1ffc8da Fix comments 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-25 14:11:01 +02:00
Weblate
90a8a74afa Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-06-25 14:08:49 +02:00
Giovanni Sora
18370fc63e Translated using Weblate (Interlingua) 
Currently translated at 54.5% (1512 of 2770)
 2014-06-25 14:08:46 +02:00
Michal Čihař
e6f6dab3b0 Fixed cookie based login for installations without mcrypt 
bug #4469

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-25 14:08:03 +02:00
Marc Delisle
f9c6a3b0c8 Translated using Weblate (French) 
Currently translated at 100.0% (2834 of 2834)
 2014-06-25 13:50:39 +02:00
Chirayu Chiripal
026c8184dd bug-4473: incorrect result count when having clause is used w/o group by 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-25 14:24:57 +05:30
Michal Čihař
f0d794613d Merge remote-tracking branch 'origin/QA_4_2' 2014-06-25 09:28:39 +02:00
Michal Čihař
dca981481d Remove plugin manager and observer classes 
We don't really need the observer pattern, so let's simplify the code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-25 09:25:59 +02:00
Weblate
9ad6ce3d0a Merge remote-tracking branch 'origin/master' 2014-06-25 09:25:27 +02:00
Marc Delisle
c862cdb1ef Translated using Weblate (French) 
Currently translated at 99.7% (2828 of 2834)
 2014-06-25 09:25:24 +02:00
Sevdimali İsa
e34cd6c50a Translated using Weblate (Azerbaijani) 
Currently translated at 40.3% (1143 of 2834)
 2014-06-25 09:25:22 +02:00
Michal Čihař
74e499a3d2 Merge remote-tracking branch 'origin/QA_4_2' 2014-06-25 09:25:02 +02:00
Weblate
c81e1acd48 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-06-25 09:24:42 +02:00
Sevdimali İsa
212195a253 Translated using Weblate (Azerbaijani) 
Currently translated at 40.0% (1108 of 2770)
 2014-06-25 09:24:38 +02:00
Chirayu Chiripal
48b0bfd259 no need to disable contructor of SplObjectStorage 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-25 09:24:19 +02:00
Kristjan Räts
b022ab6b22 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2834 of 2834)
 2014-06-25 07:41:33 +02:00
Marc Delisle
870c2d433a Translated using Weblate (French) 
Currently translated at 99.7% (2826 of 2834)
 2014-06-24 19:09:59 +02:00
Weblate
13f9f86d92 Merge remote-tracking branch 'origin/master' 2014-06-24 16:29:21 +02:00
Sevdimali İsa
f426ba23d5 Translated using Weblate (Azerbaijani) 
Currently translated at 40.0% (1135 of 2834)
 2014-06-24 16:29:18 +02:00
Isaac Bennetch
0644cace9f Merge pull request #1246 from D-storm/FR-1490 
RFE-1490 Dynamic process list
 2014-06-24 10:29:18 -04:00
Chirayu Chiripal
32511719b1 RFE-1490 Dynamic process list 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-24 19:13:21 +05:30
Weblate
98dec51672 Merge remote-tracking branch 'origin/master' 2014-06-24 14:45:10 +02:00