gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,044 Commits 12 Branches 481 Tags 2.4 GiB
1960ab70b0
Commit Graph

310 Commits

Author SHA1 Message Date
Michal Čihař
830dfe1b3e Migrate setup language selection to LanguageManager 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-28 10:07:39 +01:00
Michal Čihař
ed96969ff9 Merge branch 'QA_4_5' 2016-01-28 09:23:27 +01:00
Michal Čihař
447c88f488 Can not use PMA_fatalError when including fails 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 14:30:57 +01:00
Madhura Jayaratne
8aa28962f1 Merge pull request #6 from phpmyadmin/json-header 
Set correct content type for JSON responses
 2016-01-26 10:57:12 +11:00
Michal Čihař
0a24f92d08 Set correct content type for JSON responses 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 08:32:34 +01:00
Madhura Jayaratne
5aee503564 Fix path disclosure, items 1.4.x, 1.5 and 1.6 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-19 10:22:30 +11:00
Michal Čihař
c6939e9e50 Update jQuery UI to 1.11.4 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-08 13:06:11 +01:00
Michal Čihař
5f3875f0c1 Upgrade jQuery to 2.1.4 
Issue #11833

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-08 12:33:22 +01:00
Michal Čihař
55b317c699 Remove /*overload*/ prefix from mb_* calls 
I believe this was temporary flagging to see which code is migrated and
can be safely removed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-04 16:35:28 +01:00
Hugues Peccatte
da525ae928 Remove useless variable. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 22:32:53 +01:00
Marc Delisle
06d22e636e Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-07 09:41:46 -05:00
Marc Delisle
66c15daba0 Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-06 08:01:07 -05:00
Marc Delisle
e16bc39f85 Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-05 07:27:29 -05:00
Deven Bansod
a1c48add28 Fix build error. Need concatenation here 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-05 19:29:18 +05:30
Marc Delisle
357b1b4757 Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-04 09:05:42 -05:00
Marc Delisle
9ee3931c09 Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-03 10:43:10 -05:00
Hugues Peccatte
09f87f4770 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-07 22:09:55 +02:00
Hugues Peccatte
2ef92adc1b Fix setup. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-02 08:58:06 +02:00
Hugues Peccatte
cef71b8136 Set VersionInformation in a namespace. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 21:50:23 +02:00
Hugues Peccatte
71b62bcef9 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-09-26 13:50:49 +02:00
Madhura Jayaratne
2da36e93b2 Fix #11464 phpMyAdmin suggests upgrading to newer version not usable on that system 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-22 21:35:05 +10:00
Madhura Jayaratne
75d7927604 Do not suggest upgrading when there is no compatible versions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-21 21:37:55 +10:00
Madhura Jayaratne
c3fefc2e4a Fix #11464 phpMyAdmin suggests upgrading to newer version not usable on that system 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-14 20:14:51 +10:00
Hugues Peccatte
e5e447e937 Set namespace on config classes. 
Update config classes.
Add @noinspection tag.
Update documentation and script.
Set ConfigGenerator in a namespace.
Rename ConfigGenerator filename.
Remove ConfigGenerator requires.
Fix namespaces of mock objects.
Remove useless require.
Add missing 'use'.
Add missing require.
Update PHPDoc.
Fix class test typo.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:23 +02:00
Hugues Peccatte
7f8f34e89d Remove classes require_once. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:22 +02:00
Hugues Peccatte
f0ba28fc1d Set namespace on Advisor, Config, Console and Util classes. 
Set namespace on DbQbe.
Set namespace to 'DbSearch'.
Split Advisor.class.php file.
Change Advisor namespace.
Rename DbQbe class and file.
Set namespace on DisplayResults.
Set namespace on Error.
Use namespace for ErrorHandler.
Add class autoloader.
Change ErrorHandler filename.
Remove some require.
Update Config namespace path.
Update PMA_Util to PMA\libraries\Util.
Rename Font and File classes files.
Use namespace for Footer.
Set namespace in all libraries classes.
Namespace OutputBuffering.
Export SubPartition.
Rename Partition file.
Namespace PDF.
Namespace RecentFavoriteTable.
Replace PMA_Response by Response and PMA_Message by Message.
Update uses and calls.
Fix unit tests.
Fix SqlParser autoload.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:22:52 +02:00
Hugues Peccatte
bd707b871d Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 23:34:50 +02:00
Hugues Peccatte
e1696fe7d6 Optimize CSS properties. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-20 23:32:32 +02:00
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 00:18:38 +03:00
Madhura Jayaratne
3e9b97ef6c These are local variables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 22:27:46 +05:30
Michal Čihař
b39cb1cb81 Merge remote-tracking branch 'origin/QA_4_4' 2015-07-02 13:40:23 +02:00
Michal Čihař
4404f28d4b Replace some links to sourceforge.net with our website 
- donations are no longer processed by sf.net
- support forums are disabled for years, point users to support page

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-02 13:39:15 +02:00
Michal Čihař
a6fd4c2ed4 Cleanup URLs to our website 
- use https everywhere
- follow redirects on renamed pages

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-02 13:39:10 +02:00
Madhura Jayaratne
6df6be6520 Remove duplicate styles 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 10:41:17 +05:30
Marc Delisle
ff78437820 Merge branch 'QA_4_4' 2015-05-24 08:39:55 -04:00
Marc Delisle
a723e049eb In /setup, PMA_messages is not defined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-24 08:39:05 -04:00
Madhura Jayaratne
1f9d621a8c Fix notices when no servers are defined 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 15:30:00 +05:30
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
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
Madhura Jayaratne
903509a168 Merge branch 'QA_4_4' 2015-05-14 08:31:10 +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
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
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
152574fa2b No leading underscores for non-private method names 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 07:29:34 +05:30
Hugues Peccatte
c8b6f6950d Minor code refactor. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-04-26 20:16:35 +02:00
Madhura Jayaratne
982a5bce73 Update jquery-ui to version 1.11.2 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 13:12:54 +05:30
Madhura Jayaratne
80f4bb9782 Update jquery to version 1.11.1 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 08:09:02 +05:30
Madhura Jayaratne
410d1c32df .live() and .die() methods are deprecated. Use .on() and .off() methods instead 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-02 17:07:46 +05:30