gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,183 Commits 12 Branches 481 Tags 2.4 GiB
64476aada9
Commit Graph

505 Commits

Author SHA1 Message Date
Michal Čihař
64476aada9 Merge branch 'QA_4_7' 2017-12-15 13:46:34 +01:00
Michal Čihař
6b5d535da5 Adjust table operations to use POST 
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 12:37:02 +01:00
Michal Čihař
2bc87216f0 Adjust RTE oprations to use POST 
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 12:35:00 +01:00
Michal Čihař
a450d01546 Remove not needed variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 12:28:50 +01:00
Michal Čihař
4f14bccbfe Remove ajax_class global from RTE 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 12:28:20 +01:00
Michal Čihař
0b5b287049 Merge branch 'QA_4_7' 2017-12-15 11:10:00 +01:00
Michal Čihař
7a83d83309
Merge pull request #13868 from carusogabriel/clean-elses 
Clean elses
 2017-12-15 08:41:50 +01:00
Michal Čihař
c162a75b9b Improve javascript loading 
- jquery-ui-timepicker-addon.js is loaded in Header, no need to load it
  elsewhere
- jquery.validate.js is needed on way to many pages to benefit of
  loading only on some of them

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 08:36:23 +01:00
Gabriel Caruso
a8bd364e02 Clean elses 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2017-12-14 22:02:17 -02:00
Michal Čihař
72f109a99c Accept SQL query only from POST requests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-14 10:34:45 +01:00
Maurício Meneghini Fauth
1637796ca6 Use template for getHtmlForDataStatements method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-10 13:34:09 -02:00
Maurício Meneghini Fauth
2f84cecdb9 Use template for getHtmlForOneStatement method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-10 11:42:53 -02:00
Maurício Meneghini Fauth
220b94caa0 Use template for getHtmlForSelectableTables method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-10 11:42:53 -02:00
Maurício Meneghini Fauth
5128fd4c29 Use template for getHtmlForDataDefinitionAndManipulationStatements 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-10 11:42:53 -02:00
Maurício Meneghini Fauth
925c2e0863 Use template for getHtmlForColumns method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-10 11:42:53 -02:00
Maurício Meneghini Fauth
d5fedaf4c7 Use template for getHtmlForIndexes method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-10 11:42:53 -02:00
Maurício Meneghini Fauth
09f7fb12d7 Use template for getHtmlForIndex method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-10 11:42:53 -02:00
Maurício Meneghini Fauth
117d2950d8 Remove Tracking::getHtmlForField method 
Using template call istead.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-10 11:42:53 -02:00
Maurício Meneghini Fauth
4f47e9d6cf Use template for getHtmlForField method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-10 11:42:53 -02:00
Maurício Meneghini Fauth
64e36d8746 Use template for getHtmlForActivateDeactivateTracking 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-10 11:42:53 -02:00
Maurício Meneghini Fauth
5733c1302f Refactor Tracking::displayUntrackedTables method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-10 11:42:53 -02:00
Maurício Meneghini Fauth
5fc6631b8f Use template for displayUntrackedTables method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-10 11:42:53 -02:00
Maurício Meneghini Fauth
4a8bd1cf5c Fix toggle button not showing background image 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-05 15:53:14 -02:00
Maurício Meneghini Fauth
261c39c815 Refactor Tracking::displayTrackedTables 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-04 17:35:07 -02:00
Maurício Meneghini Fauth
c930c7a030 Fix coding standard errors 
Automatic fixes by phpcbf.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-04 13:40:36 -02:00
Maurício Meneghini Fauth
01fd301003 Use 'elseif' keyword istead of 'else if' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-04 13:31:25 -02:00
Maurício Meneghini Fauth
3d44419cbd Use lowercase for PHP booleans and null 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-04 13:14:40 -02:00
Maurício Meneghini Fauth
fe62e84062 Use PSR-4 for Twig classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-30 16:33:26 -02:00
Michal Čihař
5346416625 Simplify Scripts::addFile API 
Removed unused parameter to define ordering of scripts.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 15:09:43 +01:00
Michal Čihař
77f0d50bea Add missing dependency on jquery.validate.js 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 15:09:43 +01:00
Michal Čihař
8ef504da91 Remove line counts logic from the error reporting component 
We no longer need this as we download js files directly, so the client
has correct filename and line immediatelly.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 15:09:43 +01:00
Michal Čihař
8fbe46f3e8 Remove usage of get_scripts.js.php wrapper 
- this adds significant overhead in sending static files from the server
- the benefit of joining requests is minimal since introduction of HTTP/2
- the onload handlers are now fired directly by individual scripts, what
  makes them really execute when the script is loaded (it could be
  previously executed earlier in case of chunked loading)

Fixes #13840

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 15:09:43 +01:00
Michal Čihař
3b6a994dcd Move collation connection setting to user preferences 
It is now handled same way as other user settings.

Issue #11688
Issue #13466

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 14:16:31 +01:00
Michal Čihař
14e78f79bb Avoid error when event is not really added 
This can easily happen when it was scheduled in past, MySQL then just ignores it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 12:44:41 +01:00
Michal Čihař
8b511acd95 Use PMA_Config to get configuration value 2017-11-29 11:32:11 +01:00
Michal Čihař
6aeae463d1 Merge branch 'QA_4_7' 2017-11-29 09:44:46 +01:00
Michal Čihař
a8f358e2c6 Merge branch 'QA_4_7' 2017-11-29 09:21:53 +01:00
Michal Čihař
48c0a1081d Remember state of navigation panel 
The NavigationPanel width is now 0 when panel should be collapsed.

Issue #13466
Fixes #13397

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 16:07:08 +01:00
Michal Čihař
8dc0f4b819 Use session to indicate switching to new database 
There is no reason to store this in cookies.

Issue #11688

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 15:51:33 +01:00
Michal Čihař
216f403c28 Store navigation width in user preferences 
There is no need to have this separetely.

Issue #13466
Issue #11688

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 15:36:08 +01:00
Michal Čihař
263722fef8 Move theme selection to index.php 
- It really makes no sense to do this on every request.
- We want to redirect after changing to make sure page is loaded with new theme.
- Use value only from POST request (it used to be set by GET in past as well).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 15:20:55 +01:00
Michal Čihař
f9c73c7b10 Remove special casing for font size 
It is now stored in configuration in same way as any other setting.

Issue #13466
Issue #11688

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 15:16:01 +01:00
Michal Čihař
cbbf0d5ccf Integrate debug console settings into user preferences 
Issue #13466
Issue #11688

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 13:52:07 +01:00
Michal Čihař
b30ab4af58 Generalize code for console preferences 
We can reuse and better cache locally the operations to avoid additional
roundtrip to server when changing settings.

Issue #13466
Issue #11688

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 13:45:14 +01:00
Michal Čihař
a2fd98d9f1 Add console preferences 
This will allow to use console preferences using normal userconfig
framework.

Issue #13466

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 13:08:49 +01:00
Michal Čihař
529e8c774f Merge branch 'QA_4_7' 2017-11-28 10:57:45 +01:00
Michal Čihař
bdb17ddcd2 Merge branch 'QA_4_7' 2017-11-28 10:29:40 +01:00
Michal Čihař
8f27080d72 Fix php5 compatibility 
Issue #13832

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 07:53:22 +01:00
Michal Čihař
b8fb7f254b Fix referenceding twofactor attribute 
Fixes #13832

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 22:24:06 +01:00
Michal Čihař
c26375a066 Merge branch 'QA_4_7' 2017-11-27 18:26:06 +01:00