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

112183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
64476aada9 Merge branch 'QA_4_7' 2017-12-15 13:46:34 +01:00
Michal Čihař
59d960c6bc Correctly invoke removeUiProp on Table class 
Fixes #13848

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 13:44:12 +01:00
Michal Čihař
d1ac2f84a0
Merge pull request #13867 from nijel/selenium 
Try to use more recent phpunit-selenium
 2017-12-15 13:25:38 +01:00
Michal Čihař
d934364bac Merge branch 'QA_4_7' 2017-12-15 13:20:30 +01:00
Michal Čihař
c08c3aa688 Ensure datetimepicker is always loaded for datetime fields 
We do not need to check the type here as caller is supposed to do this
anyway.

Fixes #13856

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 13:19:38 +01:00
Michal Čihař
c98fd48071 Fix test failure with using Util::linkOrButton 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 12:38:11 +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ř
613a146e97 Adjust field drop to use POST 
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 12:20:57 +01:00
Michal Čihař
7508205191 Adjust optimize table to use POST 
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 12:17:49 +01:00
Michal Čihař
599a981b50 Adjust partition manipulations to use POST 
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 12:16:07 +01:00
Michal Čihař
e7eaea8c86 Adjust browsing distinct values to use POST 
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 12:15:10 +01:00
Michal Čihař
6ee2f12841 Adjust adding table key operations to use POST 
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 12:14:31 +01:00
Michal Čihař
8332861d62 Adjust table drop operation to use POST 
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 11:52:38 +01:00
Michal Čihař
ff20564ef0 Adjust table truncate operation to use POST 
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 11:51:18 +01:00
Michal Čihař
f059baa2ec Handle data-post with leading ? 
This makes it easier to convert existing code.

Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 11:43:17 +01:00
Michal Čihař
0b5b287049 Merge branch 'QA_4_7' 2017-12-15 11:10:00 +01:00
Michal Čihař
39b8020857 Fixed displaying of formatted numeric values for some locales 
The code was wrongly assuming that . is always decimal separator, what
it is not and can be even thousands separator.

Fixes #13865

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 11:05:54 +01:00
Michal Čihař
4c2c38f341 Remove type hinting from onNotSuccessfulTest 
Upstream has removed that as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 10:24:24 +01:00
Michal Čihař
f0da46277c Use more recent phpunit-selenium 
We can't yet use 4.0 due to it's dependency on current phpunit, but at
least upgrade to 3.0.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 10:24:24 +01:00
Michal Čihař
11d236b2ea Merge branch 'QA_4_7' 2017-12-15 09:49:25 +01:00
Michal Čihař
26b928904f Merge remote-tracking branch 'origin/QA_4_7' 2017-12-15 09:49:21 +01:00
Michal Čihař
dc0e9a5c45 Restore worktree for composer.lock removal on release 
The worktree is previously cleaned up, so it can't be reused.

Fixes #13613

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 09:48:21 +01:00
Michal Čihař
ff18aa1f25 Do not activate virtualenv on OSX builds 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 09:42:35 +01:00
Michal Čihař
379811702e Fix test expectations to match current code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 08:50:26 +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
Michal Čihař
4845ee68c8 Remove compatibility AJAX code 
We now submit all forms by POST, there should be no reason for something
else.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 08:30:49 +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ř
dfbbff0e69 Always activate virtualenv 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-14 13:47:18 +01:00
Michal Čihař
7d51982072 Install packages in virtualenv 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-14 13:13:15 +01:00
Michal Čihař
75bd706565 Use python image to build docs 
It is using python anyway, so make it simple

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-14 12:55:31 +01:00
Michal Čihař
cfc79ded73 Try to use python 3 for building docs 
It has SNI support out of the box without need to handle some deps.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-14 12:49:29 +01:00
Michal Čihař
68c30db684 The SSL setup seems to be fixed here 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-14 11:36:44 +01:00
Michal Čihař
bd476715a9 Install newer requests to add SNI support 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-14 11:32:03 +01:00
Michal Čihař
c0b6ee1e2a Add example for custom servers setup in Docker container 
See https://github.com/phpmyadmin/docker/issues/143

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-14 10:56:26 +01: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
72925985e0
Merge pull request #13862 from carusogabriel/phpunit-5 
Support PHPUnit 5
 2017-12-12 12:06:28 -02:00
Maurício Meneghini Fauth
8be5072fd6
Merge pull request #13863 from carusogabriel/refactoring-tests 
Refactoring tests
 2017-12-12 10:47:03 -02:00
Gabriel Caruso
d0b3ca5d48 Refactoring tests 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2017-12-12 06:46:53 -02:00
Gabriel Caruso
930af7ec27 Support PHPUnit 5 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2017-12-12 06:34:20 -02:00
Maurício Meneghini Fauth
533f3ff6f4
Merge pull request #13859 from mauriciofauth/tracking 
Use template for some PhpMyAdmin\Tracking methods
 2017-12-10 14:11:51 -02: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