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

102777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Navarro
c8894e41da Translated using Weblate (Catalan) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2015-09-28 16:49:54 +02:00
Marc Delisle
3e43f613fd Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-28 09:51:19 -04:00
Marc Delisle
54c08f8de8 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-28 09:46:18 -04:00
Weblate
5191ec0250 Merge remote-tracking branch 'origin/master' 2015-09-28 15:36:20 +02:00
whh
96220ba12b Translated using Weblate (Chinese (China)) 
Currently translated at 78.9% (2534 of 3209 strings)

[CI skip]
 2015-09-28 15:36:14 +02:00
Marc Delisle
a37cc4b6db Merge branch 'QA_4_5' 2015-09-28 09:35:57 -04:00
Marc Delisle
e39695963d Fix punctuation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-28 09:35:36 -04:00
Madhura Jayaratne
06ab276ce9 Merge branch 'QA_4_5' 2015-09-28 16:53:06 +10:00
Madhura Jayaratne
b6c6695f9b fix bug Notice in Structure page of views 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-28 16:52:32 +10:00
Madhura Jayaratne
2e402b8e35 Hide Insert tab for non-updatable views 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-28 16:49:43 +10:00
Madhura Jayaratne
f0d678a673 fix bug Notice in Structure page of views 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-28 16:24:01 +10:00
Madhura Jayaratne
257487df03 Add comments. Improved handling of partition restrictions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-28 09:51:56 +10:00
Marc Delisle
50d1c4f950 Merge branch 'QA_4_5' 2015-09-27 08:52:34 -04:00
Marc Delisle
3bc822d626 Fixes #11505 Notice on htmlspecialchars() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-27 08:52:07 -04:00
Madhura Jayaratne
611222d414 Only RANGE and LIST type partitions allow having subpartitions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-27 20:44:22 +10:00
Hugues Peccatte
fb48bff1b4 Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 23:21:27 +02:00
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