webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Code Activity
106,400 Commits 12 Branches 481 Tags
d53db00a615000e94227ccded87f2f237daa4250
Commit Graph

1318 Commits

Author SHA1 Message Date
Michal Čihař
9c8f537a23 Merge branch 'master' into master-security 2016-06-22 13:11:08 +02:00
Michal Čihař
d338a61d32 Merge branch 'QA_4_6' 2016-06-22 11:35:42 +02:00
Michal Čihař
e50e37b51d Properly escape database name when listing privileges 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 11:35:04 +02:00
Michal Čihař
637d4eb4de Merge branch 'QA_4_6-security' into master-security 2016-06-20 17:35:46 +02:00
Michal Čihař
1cc7466db3 Quote delimiter before using preg_replace 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 12:16:03 +02:00
Michal Čihař
791bdafcdd Merge branch 'QA_4_6-security' into master-security 2016-06-17 16:24:39 +02:00
Michal Čihař
be3ecbb4cc Simplify and cleanup transformation plugins 
Remove PMA_transformation_global_html_replace which makes the code only
more confusing.

Also add escaping to browse transformations.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 16:18:13 +02:00
Michal Čihař
dbd848d595 Fix wrong redirection tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 13:36:58 +02:00
Michal Čihař
c6a6bbfb2f Fix test expectations to match current code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 14:30:29 +02:00
Michal Čihař
27caf5b46b Improve detection of script name 
In case PHP_SELF was not set by server, we used REQUEST_URI, which might
embed PATH_INFO as well. However we really need to know the path without
it, so let's strip it as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 09:35:56 +02:00
Michal Čihař
8af7b7e48a Merge branch 'QA_4_6' 2016-06-15 13:03:09 +02:00
Michal Čihař
73d067a540 Fix test for new redirect code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-15 13:02:59 +02:00
Michal Čihař
62d417db9b Merge branch 'QA_4_6' 2016-06-09 09:20:26 +02:00
Michal Čihař
b261ecae25 Add test for possible rounding issues 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-09 09:19:55 +02:00
Michal Čihař
506fd28cbd Add support to link directly to some page 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 11:54:28 +02:00
Michal Čihař
0e233c89ce Test more doc links generating 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 11:51:34 +02:00
Michal Čihař
3074d94525 Merge branch 'QA_4_6' 2016-05-17 10:44:59 +02:00
Michal Čihař
574fee04f7 Fix test failures after changing links 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:44:54 +02:00
Michal Čihař
a8f15e4133 Adjust test to new code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-13 13:15:49 +02:00
Michal Čihař
62b7c2e8f7 Merge branch 'QA_4_6' 2016-05-13 13:08:48 +02:00
Michal Čihař
3686263f1d Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-13 13:08:38 +02:00
Michal Čihař
cb41491f44 Adjust test to no stripping 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-13 11:55:52 +02:00
Michal Čihař
8deed657a2 Merge branch 'QA_4_6' 2016-05-12 15:43:24 +02:00
Michal Čihař
57a1d3a7ca Adjust tests to template doing no stripping 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-12 15:42:57 +02:00
Michal Čihař
0fac07105e Remove unused method 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-12 15:13:48 +02:00
Michal Čihař
efa1845e23 Merge branch 'QA_4_6' 2016-05-10 15:05:32 +02:00
Michal Čihař
bbe8efaf7c Use https for documentation links 
Fixes #12225

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-10 15:04:29 +02:00
Michal Čihař
8dbb4544fa Remove $cfg['ThemePath'] 
Fixes #12196

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-20 11:46:35 +02:00
Michal Čihař
9a59032379 Improve collation descriptions 
- detect new languages
- detect new Unicode variants
- better describe collation method

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 15:33:33 +02:00
Michal Čihař
3e2029e750 Move MySQL charsets handling to the Charsets class 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 12:55:42 +02:00
Michal Čihař
72099ff05a Ensure this is always defined in the global scope 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 12:46:29 +02:00
Michal Čihař
0758b601e7 Move charset query generation to to the Util class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 12:07:27 +02:00
Michal Čihař
e2deac4b22 Move getting collation to the DBI layer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 11:42:29 +02:00
Madhura Jayaratne
ccc17ae112 Merge branch 'bookmark' 2016-03-10 00:58:49 +11:00
Madhura Jayaratne
40dc10ec18 Update doc comments of the test class 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-09 23:42:57 +11:00
Madhura Jayaratne
43cfba9f24 Refactor bookmarking 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-09 23:39:29 +11:00
Michal Čihař
b995e59953 Do not try to use not configured bookmarks 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 15:10:21 +01:00
Michal Čihař
b4cac4827e Set japanese language if we want Kanji encoding 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 15:08:33 +01:00
Michal Čihař
3bda9a03b9 Move Kanji encoding handling to Encoding class 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 14:55:41 +01:00
Michal Čihař
4ed47fc4b4 Move charset conversion to a class 
Also removes ancient support for AIX iconv.

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 14:05:59 +01:00
Atul Pratap Singh
4d09f855bb Rename some templates, formatting changes 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-02-29 12:03:47 +05:30
Atul Pratap Singh
386cbc8f6c Merge pull request #12009 from poush/fix_#12005 
Templating toggleButton() and getDivForSliderEffect() (Fix #12005)
 2016-02-29 10:21:45 +05:30
Piyush Agrawal
2e64aec16e Templating toggleButton() and getDivForSliderEffect() 
Signed-off-by: Piyush Agrawal <poush12@gmail.com>
 2016-02-25 10:42:33 +05:30
Atul Pratap Singh
0370f382c2 Merge pull request #12008 from 007durgesh219/Issue#12004 
Templating getWithSelected() and getCheckbox(), Issue #12004
 2016-02-25 04:21:24 +05:30
Michal Čihař
912bf964c7 Replace embedded php-gettext library with motranslator 
Fixes #12018

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-24 11:49:43 +01:00
Durgesh
307f7069e5 Templating getWithSelected() and getCheckbox(), Issue #12004 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-23 18:10:24 +05:30
Madhura Jayaratne
81821574b1 Merge test files since they both test the same class 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:45:28 +11:00
Durgesh
6650f7b07d Refactor text sanitization and javascript escaping, Issue #11989, #11988 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-22 14:45:19 +05:30
Durgesh
0b64827930 Refactored url parmeters generating, Issue #11990 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-22 14:36:41 +05:30
Madhura Jayaratne
3364cd3f27 Improve method names 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-19 23:04:21 +11:00