gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
97,887 Commits 12 Branches 481 Tags 2.4 GiB
563fef9fd8
Commit Graph

97887 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
563fef9fd8 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-16 08:05:51 -05:00
Marc Delisle
bb83c78b0d Merge pull request #1502 from rakeshkaundilya/master 
Feature Request #1604:Show PHP version
 2015-02-16 08:05:08 -05:00
RAKESH KUMAR
f4ff38afca Feature Request #1604:Show PHP version 
Signed-off-by: RAKESH KUMAR <rakeshkumar4294@gmail.com>
 2015-02-16 16:07:18 +05:30
Madhura Jayaratne
b15d9c5136 Properly align jQuery dialog 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-16 12:13:02 +05:30
Madhura Jayaratne
048c54db49 Merge branch 'QA_4_3' 2015-02-16 10:09:02 +05:30
Madhura Jayaratne
f2d807e374 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-02-16 10:08:37 +05:30
Madhura Jayaratne
d1e4c2b3c7 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-16 10:07:11 +05:30
Madhura Jayaratne
9ccc5322dc Merge branch 'QA_4_3' 2015-02-16 09:58:22 +05:30
Madhura Jayaratne
40a82f6011 bug #4769 Previously set column aliases are destroyed if returned to the same table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-16 09:57:35 +05:30
Madhura Jayaratne
7bc50e5f56 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-16 09:34:07 +05:30
Weblate
968ae5bb11 Merge remote-tracking branch 'origin/master' 2015-02-16 05:03:54 +01:00
Martin Lacina
92d9931cc1 Translated using Weblate (Slovak) 
Currently translated at 83.6% (2521 of 3012 strings)

[CI skip]
 2015-02-16 05:03:50 +01:00
Vytautas Motuzas
9fcb329d63 Translated using Weblate (Lithuanian) 
Currently translated at 48.7% (1468 of 3012 strings)

[CI skip]
 2015-02-16 05:03:47 +01:00
Madhura Jayaratne
76c1ddaddf Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2015-02-16 09:28:50 +05:30
Madhura Jayaratne
0aac18fcda Missed file from commit 1d73964695 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-16 09:28:24 +05:30
Madhura Jayaratne
1d73964695 bug #4763 Database export with more than 512 tables fails 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-16 09:20:29 +05:30
Weblate
c52cf9ee23 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-02-16 04:50:15 +01:00
Martin Lacina
c599893330 Translated using Weblate (Slovak) 
Currently translated at 83.9% (2501 of 2979 strings)

[CI skip]
 2015-02-16 04:50:12 +01:00
Vytautas Motuzas
373f532e12 Translated using Weblate (Lithuanian) 
Currently translated at 49.6% (1482 of 2982 strings)

[CI skip]
 2015-02-16 04:50:09 +01:00
Balรกzs รšr
54c2f39507 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3012 of 3012 strings)

[CI skip]
 2015-02-15 22:18:33 +01:00
Marc Delisle
154d723659 Fix inspection issues 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-15 06:45:26 -05:00
Weblate
c5e05f318d Merge remote-tracking branch 'origin/master' 2015-02-15 12:15:16 +01:00
Martin Lacina
1d42a5723f Translated using Weblate (Slovak) 
Currently translated at 83.5% (2517 of 3012 strings)

[CI skip]
 2015-02-15 12:15:13 +01:00
Marc Delisle
1fe0d1ad44 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-15 06:14:57 -05:00
Pranav Sharma
c0bad9103e rfe #1605 After database creation, go to database structure page 
Signed-off-by: Pranav Sharma <vanarpsharma@gmail.com>
 2015-02-15 06:12:09 -05:00
Weblate
64b896585a Merge remote-tracking branch 'origin/master' 2015-02-14 15:15:22 +01:00
Dรกniel Tรณth
d9a532339f Translated using Weblate (Hungarian) 
Currently translated at 99.8% (3007 of 3012 strings)

[CI skip]
 2015-02-14 15:15:19 +01:00
D-storm
2c67d0506e fix typo 
Signed-off-by: D-storm <chirayu.chiripal@gmail.com>
 2015-02-14 19:44:22 +05:30
Marc Delisle
2a7f1ed42e Remove code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-14 06:12:53 -05:00
Atul Pratap Singh
6866e39ac0 Simply if else logic 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-02-14 00:15:05 +05:30
Atul Pratap Singh
4d63dacb59 Fast animation was getting hidden 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-02-14 00:12:02 +05:30
Atul Pratap Singh
e3b4beb70c Merge branch 'QA_4_3' 2015-02-13 23:33:09 +05:30
Atul Pratap Singh
79ebf59d0c Merge commit 'f032c5d' 2015-02-13 23:32:28 +05:30
Weblate
a09bba13a4 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-02-13 18:11:03 +01:00
Giovanni Sora
2809c4fb5b Translated using Weblate (Interlingua) 
Currently translated at 64.5% (1922 of 2979 strings)

[CI skip]
 2015-02-13 18:11:00 +01:00
Atul Pratap Singh
b78ada45e6 Revert 9e18a57 and fix the original issue causing bug#4744 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-02-13 22:40:32 +05:30
Marc Delisle
bb7c805de9 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-13 10:48:20 -05:00
Marc Delisle
762d7572cb Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-13 10:38:40 -05:00
Marc Delisle
f263e0a05e ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-13 09:28:14 -05:00
Marc Delisle
9ef49d83bd Merge remote-tracking branch 'gzzhanghao/master' 2015-02-13 09:27:08 -05:00
Marc Delisle
9af4514126 Translated using Weblate (French) 
Currently translated at 100.0% (3012 of 3012 strings)

[CI skip]
 2015-02-13 13:57:00 +01:00
Madhura Jayaratne
78e2f60d45 Use local variable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 17:42:43 +05:30
Madhura Jayaratne
7a41a35b78 Update parameter type 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 17:37:20 +05:30
Zhang Hao
3007c6a6ef Save unfinished work 
Signed-off-by: Zhang Hao <jason.daurus@gmail.com>
 2015-02-13 18:46:09 +08:00
Madhura Jayaratne
9585fd614d Disable grid-edit for all other cases 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 15:48:47 +05:30
Madhura Jayaratne
07c8211f73 Update return types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 15:43:55 +05:30
Madhura Jayaratne
dbf53d7dba This is global variable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 15:41:00 +05:30
Madhura Jayaratne
91b2b32e59 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-02-13 15:17:15 +05:30
Madhura Jayaratne
2e0167b079 Update return types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 15:16:13 +05:30
Weblate
08dacafce5 Merge remote-tracking branch 'origin/master' 2015-02-13 10:44:16 +01:00