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

102743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
c8cc036ce3 Merge commit '5fc08f9' 2015-09-25 13:49:23 -04:00
Weblate
bab058802b Merge remote-tracking branch 'origin/master' 2015-09-25 15:59:05 +02:00
Andrzej
7aa504ea3a Translated using Weblate (Polish) 
Currently translated at 78.8% (2530 of 3209 strings)

[CI skip]
 2015-09-25 15:59:00 +02:00
Marc Delisle
299d2e8f40 Merge branch 'QA_4_5' 2015-09-25 09:57:57 -04:00
Marc Delisle
00cd09710e Merge commit 'e5286fa' 2015-09-25 09:57:51 -04:00
Weblate
5fc08f92f0 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-25 15:57:35 +02:00
Andrzej
bb0f7e2766 Translated using Weblate (Polish) 
Currently translated at 78.8% (2530 of 3209 strings)

[CI skip]
 2015-09-25 15:57:32 +02:00
Marc Delisle
1ed1d638f8 Fix failing tests 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-25 09:57:23 -04:00
Weblate
78e44d7d3e Merge remote-tracking branch 'origin/master' 2015-09-25 13:23:43 +02:00
Zheng Dan
3a6e44f421 Translated using Weblate (Chinese (China)) 
Currently translated at 77.0% (2473 of 3209 strings)

[CI skip]
 2015-09-25 13:23:37 +02:00
Xavier Navarro
43d10023e7 Translated using Weblate (Catalan) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2015-09-25 13:23:35 +02:00
Marc Delisle
429e39e6e6 Merge branch 'QA_4_5' 2015-09-25 07:22:43 -04:00
Marc Delisle
0c361f5ca5 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-25 07:22:31 -04:00
Marc Delisle
2f41ca05f7 Merge commit '8d202a3' 2015-09-25 07:21:32 -04:00
Marc Delisle
36cacef722 Merge commit '9e08133' 2015-09-25 07:21:18 -04:00
Marc Delisle
1bf72d6bcb Merge commit 'a2fc766' 2015-09-25 07:21:02 -04:00
Weblate
e5286fa537 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-25 13:18:14 +02:00
Zheng Dan
07640ba5c7 Translated using Weblate (Chinese (China)) 
Currently translated at 77.0% (2473 of 3209 strings)

[CI skip]
 2015-09-25 13:18:10 +02:00
Marc Delisle
ac33a96ba8 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-25 07:17:04 -04:00
Marc Delisle
8afe5940da Merge commit '9e08133' into QA_4_5 2015-09-25 07:16:18 -04:00
Marc Delisle
440aaaacae ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-25 07:15:22 -04:00
Dan Ungureanu
8d202a3dc1 Fixes #11497. 
Cherry-picked udan11/sql-parser@1415469.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-25 07:07:27 -04:00
Xavier Navarro
a2fc766269 Translated using Weblate (Catalan) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2015-09-24 18:03:45 +02:00
Marc Delisle
a9b022701b Merge branch 'QA_4_5' 2015-09-24 09:47:43 -04:00
Marc Delisle
9b84a1008e Merge commit 'b0ceecd' 2015-09-24 09:47:34 -04:00
Marc Delisle
5300986de7 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-09-24 09:47:07 -04:00
Marc Delisle
a7836067db Fixes #11496 Incorrect definition for getTablesWhenOpen() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-24 09:46:54 -04:00
Weblate
e0a0699d4a Merge remote-tracking branch 'origin/master' 2015-09-24 15:28:33 +02:00
Yizhou Qiang
857ef10d40 Translated using Weblate (Chinese (China)) 
Currently translated at 77.0% (2472 of 3209 strings)

[CI skip]
 2015-09-24 15:28:27 +02:00
Marc Delisle
a815444712 Merge branch 'QA_4_5' 2015-09-24 09:28:13 -04:00
Marc Delisle
c342d40814 Merge commit 'fb32ce9' 2015-09-24 09:28:06 -04:00
Weblate
b0ceecd117 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-24 15:27:49 +02:00
Yizhou Qiang
db889f0658 Translated using Weblate (Chinese (China)) 
Currently translated at 77.0% (2472 of 3209 strings)

[CI skip]
 2015-09-24 15:27:46 +02:00
Marc Delisle
5bad4dab82 Fixes #11495 'PMA_Microhistory' is undefined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-24 09:27:17 -04:00
Marc Delisle
9e08133f49 4.5.0.1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-24 04:14:57 -04:00
Weblate
6a8c4913e5 Merge remote-tracking branch 'origin/master' 2015-09-24 10:10:39 +02:00
Yizhou Qiang
f3aa17153e Translated using Weblate (Chinese (China)) 
Currently translated at 76.9% (2470 of 3209 strings)

[CI skip]
 2015-09-24 10:10:34 +02:00
Marc Delisle
ac5d97f0ca Merge branch 'QA_4_5' 2015-09-24 04:10:17 -04:00
Weblate
fb32ce9a5c Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-24 10:10:00 +02:00
Yizhou Qiang
50153dec8b Translated using Weblate (Chinese (China)) 
Currently translated at 76.9% (2470 of 3209 strings)

[CI skip]
 2015-09-24 10:09:58 +02:00
Marc Delisle
f322635e19 Fix for #11492 moved to 4.5.0.1 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-24 04:09:31 -04:00
Nisarg Jhaveri
b5c731ab62 Backport 053edda33f 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-24 04:05:26 -04:00
Weblate
8813154557 Merge remote-tracking branch 'origin/master' 2015-09-23 21:58:35 +02:00
Victor Laureano
82dc704ff7 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.4% (2966 of 3209 strings)

[CI skip]
 2015-09-23 21:58:30 +02:00
Marc Delisle
91337a7237 Merge branch 'QA_4_5' 2015-09-23 15:56:37 -04:00
Marc Delisle
b468d57409 Merge commit 'bd84bb8' 2015-09-23 15:56:27 -04:00
Weblate
e45efdb3e2 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-23 21:55:31 +02:00
Victor Laureano
2b089a019a Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.4% (2966 of 3209 strings)

[CI skip]
 2015-09-23 21:55:28 +02:00
Marc Delisle
bd84bb8c2d Merge pull request #11494 from nisargjhaveri/bug_11492 
Fix #11492, AUTO_INCREMENT statements are partly missing from exports
 2015-09-23 15:55:24 -04:00
Nisarg Jhaveri
053edda33f Fix #11492, AUTO_INCREMENT statements are partly missing from exports 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-09-24 00:34:07 +05:30