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

99695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Madhura Jayaratne
629987938c Force user to select at least one partition 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 13:03:52 +05:30
Madhura Jayaratne
58e61e923e Confirm before COALESCE as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 13:01:58 +05:30
Madhura Jayaratne
cbedcdc3f6 Remove duplication 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 12:51:04 +05:30
Madhura Jayaratne
bab7b6fa03 Improve coding style 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 12:43:44 +05:30
Madhura Jayaratne
c24e47c74e Indent properly, Inline control structures are discouraged 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 12:35:39 +05:30
Madhura Jayaratne
5fef115c2e Select first partition by default 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 12:31:46 +05:30
Madhura Jayaratne
99c126873c Move the partition method extraction logic to Partition class 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 12:10:16 +05:30
Madhura Jayaratne
ad32e09ed0 Indicate that these have been truncated 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 10:44:12 +05:30
Madhura Jayaratne
6fc418eb02 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-13 08:24:04 +05:30
Madhura Jayaratne
b4007f12da Revert 86c740bc57. This is being referred 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 08:23:07 +05:30
Madhura Jayaratne
b9ab876cdc Avoid fetching these data on file inclusion, rather fetch them when required 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 08:19:24 +05:30
Madhura Jayaratne
86c740bc57 Fetch this only when it is required 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 08:14:15 +05:30
Marc Delisle
49880f0d5d Fix param type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 15:44:02 -04:00
Marc Delisle
5027f6a4e2 Fix execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 15:39:10 -04:00
Marc Delisle
268c71deac Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 15:32:01 -04:00
Marc Delisle
8a3f61c074 Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 15:05:44 -04:00
Marc Delisle
72cb48c89e Fix coding style and doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 13:14:59 -04:00
Marc Delisle
75d9fd93a1 Merge branch 'QA_4_4' 2015-05-12 11:56:34 -04:00
Marc Delisle
2b41e09a48 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 11:55:53 -04:00
Tom Sommer
50616659e1 Don't throw errors in case reports.phpmyadmin.net is down 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 11:54:21 -04:00
Marc Delisle
4426af36b1 Merge branch 'QA_4_4' 2015-05-12 11:47:21 -04:00
Marc Delisle
969b46cca5 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 11:46:51 -04:00
Tom Sommer
1684a1a56e Fix undefined index 'collation_connection' 
Make sure $GLOBALS[$collation] is set

Signed-off-by: Tom Sommer <mail@tomsommer.dk>

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 11:45:50 -04:00
Marc Delisle
8d03fe316a Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 09:56:04 -04:00
Madhura Jayaratne
4fd6ac5983 Remove more 'noclick' classes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-12 12:05:27 +05:30
Madhura Jayaratne
3cd8408971 Shift+click for tracking version table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-12 11:59:42 +05:30
Madhura Jayaratne
fc5d0688b3 Shift+click selection for db tracking page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-12 11:54:03 +05:30
Madhura Jayaratne
cf981cf3d0 Work properly when there are multiple tables in a page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-12 11:53:24 +05:30