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

102760 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugues Peccatte
829a52cfa4 Remove useless constructors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 23:16:51 +02:00
Hugues Peccatte
faba0fb75d Use 'static::' when needed. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 23:13:01 +02:00
Hugues Peccatte
0f80756fe6 Use pre-increment when possible. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 23:12:09 +02:00
Hugues Peccatte
6ccb7ff44f Use php5 syntax instead of php4 for properties declaration. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 22:40:10 +02:00
Hugues Peccatte
d0b3208109 Remove redeclare property. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 22:03:43 +02:00
Hugues Peccatte
b7e0287607 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 21:56:14 +02:00
Hugues Peccatte
c6c6314da1 Update composer to get higher version without incompatibility. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 21:11:29 +02:00
Hugues Peccatte
3281811f8d Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-09-26 19:02:59 +02:00
Marc Delisle
d5788dbc7c Add missing parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-26 07:40:29 -04:00
Marc Delisle
c5ddfc072d Merge branch 'QA_4_5' 2015-09-26 07:39:38 -04:00
Marc Delisle
9ebad6b129 Add missing parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-26 07:39:03 -04:00
Marc Delisle
62859dffbc Merge branch 'QA_4_5' 2015-09-25 13:49:36 -04:00
Marc Delisle
c8cc036ce3 Merge commit '5fc08f9' 2015-09-25 13:49:23 -04:00
Marc Delisle
62a4e61a65 Optimize function call 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-25 13:48:55 -04:00
Marc Delisle
a8e66a5853 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-25 13:44:50 -04:00
Marc Delisle
9bf88cbd32 Merge pull request #11501 from devenbansod/fix_11500 
Fix issue #11500
 2015-09-25 13:43:41 -04:00
Deven Bansod
b13550af11 Fix issue #11500 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-09-26 02:54:50 +05:30
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