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

99723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Marc Delisle
061483ac1f 4.4.6.1 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-13 11:37:55 -04:00
Madhura Jayaratne
e874e59b69 bug #4899 [security] CSRF vulnerability in setup 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 11:36:06 -04:00
Marc Delisle
53b55954bd Merge branch 'QA_4_4' 2015-05-13 11:33:58 -04:00
Madhura Jayaratne
787c6d6445 bug #4900 [security] Vulnerability allowing man-in-the-middle attack 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 11:29:15 -04:00
Madhura Jayaratne
d6afe6ccf6 bug #4899 [security] CSRF vulnerability in setup 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 11:28:19 -04:00
Madhura Jayaratne
8bacbf312a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-13 18:48:32 +05:30
Madhura Jayaratne
3a52629431 COALESCE does not require confirmation since it does not affect data 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 18:47:13 +05:30
Marc Delisle
94a226c092 Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-13 08:59:33 -04:00
Madhura Jayaratne
fd687aad4b Merge branch 'QA_4_4' 2015-05-13 14:03:19 +05:30
Madhura Jayaratne
50b2985a3e bug Escape database and table names for partition maintenance 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 14:01:48 +05:30
Madhura Jayaratne
0fc60cc05e Temporarily remove failing assertion 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 13:40:24 +05:30
Madhura Jayaratne
d180067eb3 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 13:31:10 +05:30
Madhura Jayaratne
c38965f830 TRUNCATE partition option 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 13:22:58 +05:30
Madhura Jayaratne
9ea37c4b65 Chose an option by default 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 13:14:48 +05:30
Madhura Jayaratne
6f1163f335 Do not refresh main unnecessarily 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 13:10:19 +05:30