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

99738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
d40dbefe23 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 11:19:43 +05:30
Madhura Jayaratne
23341a3458 ChangeLog entry for bug #4906 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 11:17:21 +05:30
Madhura Jayaratne
fdfd9ea89c #4906 Designer: pages from all databases 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 11:16:09 +05:30
Madhura Jayaratne
d9ac59f8d1 #4906 Designer: pages from all databases 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 11:13:45 +05:30
Madhura Jayaratne
d5c1df3cd5 Hide selflink in designer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 10:41:04 +05:30
Madhura Jayaratne
a66261bbd7 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-15 10:32:25 +05:30
Madhura Jayaratne
cc9bd408bc Fix test failures 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 10:31:25 +05:30
Atul Pratap Singh
2cc67d10b1 Merge pull request #1642 from gzzhanghao/oop-refactor 
Refactoring tbl_view.lib and add PMA\Template
 2015-05-15 10:22:36 +05:30
Madhura Jayaratne
d0f6784cb5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-15 07:46:12 +05:30
Madhura Jayaratne
0f76d59e1e Quit using filter_input since they bypass token check 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 07:45:09 +05:30
Weblate
37cefd7a85 Merge remote-tracking branch 'origin/master' 2015-05-15 03:56:00 +02:00
LNDDYL
b137ccfd19 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 93.4% (2882 of 3085 strings)

[CI skip]
 2015-05-15 03:55:56 +02:00
Sevdimali İsa
d503d50231 Translated using Weblate (Azerbaijani) 
Currently translated at 57.2% (1766 of 3085 strings)

[CI skip]
 2015-05-15 03:55:54 +02:00
Madhura Jayaratne
31c21b070a Adding token would not harm 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 07:25:36 +05:30
Madhura Jayaratne
b2a3d6cfb2 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 07:19:13 +05:30
Weblate
8fd62789cf Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-05-15 03:46:53 +02:00
edson garcia
f78b75130a Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.7% (3028 of 3035 strings)

[CI skip]
 2015-05-15 03:46:49 +02:00
Michal Čihař
f035d48b5d Translated using Weblate (Czech) 
Currently translated at 96.8% (2940 of 3035 strings)

[CI skip]
 2015-05-15 03:46:45 +02:00
Sevdimali İsa
a92bea7afe Translated using Weblate (Azerbaijani) 
Currently translated at 58.1% (1764 of 3035 strings)

[CI skip]
 2015-05-15 03:46:44 +02:00
Madhura Jayaratne
1257f2c714 bug #4904 Setup: Overview > Display does not work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 07:16:16 +05:30
Weblate
f6a00c4eb3 Merge remote-tracking branch 'origin/master' 2015-05-14 22:00:10 +02:00
Alex Rohleder
5d6fac0f61 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.4% (3038 of 3085 strings)

[CI skip]
 2015-05-14 22:00:07 +02:00
Marc Delisle
00f9899dd3 Merge pull request #1674 from nisargjhaveri/form_dis 
Return HTML instead of echo-ing directly in FormDisplay
 2015-05-14 16:00:03 -04:00
Jason
ce3c8b0c66 Refactoring tbl_view.lib and add PMA\Template 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-05-15 03:48:25 +08:00
Nisarg Jhaveri
431847b39e Return HTML instead of echo-ing directly in FormDisplay 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-15 00:56:26 +05:30
Weblate
f525c01b9f Merge remote-tracking branch 'origin/master' 2015-05-14 17:20:52 +02:00
Michal Čihař
7ab9debd97 Translated using Weblate (Czech) 
Currently translated at 95.4% (2944 of 3085 strings)

[CI skip]
 2015-05-14 17:20:47 +02:00
Marc Delisle
9832372a41 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-14 11:20:37 -04:00
Stefano Martinelli
6438a1fabf Translated using Weblate (Italian) 
Currently translated at 100.0% (3082 of 3082 strings)

[CI skip]
 2015-05-14 16:38:38 +02:00
Stefano Martinelli
eef817da3c Translated using Weblate (Italian) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-05-14 16:31:46 +02:00
Madhura Jayaratne
f30648779c rfe #1669 Designer: "Sticky" menu option 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 18:17:45 +05:30
Madhura Jayaratne
479f62f551 Merge branch 'QA_4_4' 2015-05-14 14:18:24 +05:30
Madhura Jayaratne
35c7c6019e bug #4902 Designer: Loading does not work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 14:16:41 +05:30
Madhura Jayaratne
9207b67264 Missing ChangeLog entry in master 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 12:47:17 +05:30
Madhura Jayaratne
c2eefac419 Merge branch 'QA_4_4' 2015-05-14 11:30:17 +05:30
Madhura Jayaratne
ef806b39e5 ChangeLog entry for bug #4367 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 11:27:17 +05:30
Madhura Jayaratne
b5c51cf040 bug #4903 & bug #4367 Import status infinite loop 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 11:25:34 +05:30
Madhura Jayaratne
1c2e824697 bug #4903 & bug #4367 Import status infinite loop 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 11:23:35 +05:30
Madhura Jayaratne
5ba5024b4c Fix bad string break 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 08:38:09 +05:30
Madhura Jayaratne
337a7900d5 Match query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 08:34:48 +05:30
Madhura Jayaratne
903509a168 Merge branch 'QA_4_4' 2015-05-14 08:31:10 +05:30
Madhura Jayaratne
4844b3bfa6 Indicate partition support 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 08:14:49 +05:30
Madhura Jayaratne
3addba490c Do not break the urls in the middle. Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 08:09:43 +05:30
Madhura Jayaratne
bdf66cd772 Merge branch 'QA_4_4' 2015-05-14 07:10:10 +05:30
Madhura Jayaratne
85f62badea Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-05-14 06:53:36 +05:30
Madhura Jayaratne
5ca7f19d05 Invalid value for CURLOPT_SSL_VERIFYPEER 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 06:52:26 +05:30
Hauke Henningsen
e6f868441a Translated using Weblate (German) 
Currently translated at 100.0% (3082 of 3082 strings)

[CI skip]
 2015-05-14 03:21:08 +02:00
Hugues Peccatte
ca419e70e8 Minor coding style modification. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-14 00:12:43 +02:00
Hugues Peccatte
831a34ba37 Minor coding style modification. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-14 00:11:50 +02:00
Marc Delisle
57eec4e32a Merge branch 'QA_4_4' 2015-05-13 11:38:22 -04:00