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

112198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
bed0448405 Merge branch 'QA_4_7' 2017-12-16 13:09:16 +01:00
Michal Čihař
1c9674db2c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-12-16 13:09:06 +01:00
Michal Čihař
970e0f3848 Merge branch 'QA_4_7' of github.com:phpmyadmin/phpmyadmin into QA_4_7 2017-12-16 13:08:57 +01:00
Michal Čihař
e0ca7790f5 Merge branch 'QA_4_7' 2017-12-16 13:07:37 +01:00
Michal Čihař
f1fd227932 Released 4.7.0-rc1 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJYwDGGAAoJEM51LxeCWb2Shn8QAIw5L8ThwIMIN+WE0gBrK3ha
 0U5KFaUJ034OGYPpJtJ07WIXFu+/nAPzB8SVA1n7lULsOm5TEs5Z8iEmu+jDGW7n
 FmWQCo3/U5KQ8MZ2CSv51OsOX8FnxKdiKr21Cbo4cGhGpoLrUH9wPn+Tlj2yCeT4
 0opRv5jrsawV+pJE4jqj5COEO4bnDzu+pDXMPPT+rjpSh4FjbJDMLcXSwGluVeBz
 yKjpdL6tQ/2F863dZ0Zmc1d2Zgr4A7Rgg4Q6Ao8q+b6i+3ack2ARptsBm1Ap+9AX
 McKN/KbE2Z0cCBhcocO6KHX89ymVfD/x5kL0aL4cvZorAVhSdUBrTJOUSJ8cvhDV
 31Kv8LYiqFQU6DHtZJAcAg8Wgr3Il3rgnAUNNhxVCPojpSaixvmrNKAR8IcdWpL+
 IQ4OLzaUL5VkHHJ4INknC9zrZmXBCC7BjBGHVOKqzuebg3+Xl0ZXvOrAsxyBg3uo
 cau59GmzQPVic06L2hPVQsz5KdKnSPZdmwV8MDOUopLQWNaEBGjCOCPc1vbKzWG7
 37jmJk3XpJq+dF7qb98c9F51+NQ+pju7hd3byKkoUnzfc880ZkPVMil7lXOhRA9Q
 aW3zTHrYCLpwWn/LTWkMtrrOXVbKSa5yrX+5BElRCVIvWxuH5f2MslqJrM7zFSgs
 DlGcoihkQ4njBL6DCcBu
 =fQRu
 -----END PGP SIGNATURE-----

Merge tag 'RELEASE_4_7_0RC1' into QA_4_7

Released 4.7.0-rc1
 2017-12-16 13:07:27 +01:00
Weblate
95070ca526 Merge remote-tracking branch 'origin/master' 2017-12-16 13:04:55 +01:00
Claudio Maradonna
ee0ba83086 Translated using Weblate (Italian) 
Currently translated at 99.8% (3281 of 3287 strings)

[CI skip]
 2017-12-16 13:04:50 +01:00
Weblate
0e038134be Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-12-16 13:04:45 +01:00
Waleed Abdeen
93897918e9 Translated using Weblate (Arabic) 
Currently translated at 48.5% (1595 of 3287 strings)

[CI skip]
 2017-12-16 13:04:37 +01:00
Waleed Abdeen
2e36c2a3b1 Translated using Weblate (Arabic) 
Currently translated at 49.9% (1601 of 3207 strings)

[CI skip]
 2017-12-16 13:04:37 +01:00
Michal Čihař
d39852b302 Merge branch 'QA_4_7' 2017-12-16 13:03:58 +01:00
Michal Čihař
79a95b616a Released 4.7.6 
-----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCAAxFiEEPQalns5zDrcbURwXznUvF4JZvZIFAlofUEkTHGJlbm5ldGNo
 QGdtYWlsLmNvbQAKCRDOdS8Xglm9koGBEACetzvuvl+yDcjfoQt62wlC8VT4fR0I
 N4OjaY3hX40C5nRqrLYRNyUhsslmm240Q9V74sLW+RmpHV4o6lyFT4gUhNax1oFE
 ib3k8sVzdS58NRrRZhwtV496RG7SUr2MdGGSRFAyc5wEz5jRE0Mz3up67oFA6Izh
 FfEwfWnxKtmQUaLowLTuRpxgJqWPhS/JhcZsKu4eEQv813vVgiPPOcqHpU01ah6E
 WrmIEigVqbjTMLrC775FjixXKuJk8qrWGJSVNYMQ93Azh6T4hF/ViAn4fQs+JXsj
 ToohpzNuGS/z62j6rvNfAf016evIMbF+GeHMDvqgoz5mGshLuo1DFQXLhTw+tPwd
 GktvdIoH5JsjLbyl1z2UBIrdCf4ZZ63uvtv0RwdFBx91gZ0hDO+r5YeC1cs9IL1L
 SF+N+aS9hW0M9wUxr/CMQmzZLKK/s7e+9G1hSSZPkp4wM7gu9GN4OgVKVm8TFktJ
 MoJYrBMuvetF0YlhjeWwOejVp6LHKGzjpFFtKQavCsCCUm7DEjNv8gCU0ACCpR43
 /ua4JPApvGr5NCKRAr3k1zDWDFrRnhBfPQLApj9eeO6ceUfIH9MZNgjoBezE7ndw
 g6g0TLP2RCto6j7mO5IJDv1YUAIKK1vowiq4Mpq++2V9018DmKNkC7qiIymuPEiJ
 lIcSFcekxuOI0Q==
 =Zebd
 -----END PGP SIGNATURE-----

Merge tag 'RELEASE_4_7_6' into QA_4_7

Released 4.7.6
 2017-12-16 13:03:50 +01:00
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