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

112228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Antoni Buj Gelonch
4be9460b5f Translated using Weblate (Catalan) 
Currently translated at 97.2% (3197 of 3287 strings)

[CI skip]
 2017-12-18 15:34:18 +01:00
Weblate
dc27cbcc67 Merge remote-tracking branch 'origin/master' 2017-12-18 14:53:25 +01:00
Robert Antoni Buj Gelonch
b66b0c0b66 Translated using Weblate (Catalan) 
Currently translated at 97.2% (3197 of 3287 strings)

[CI skip]
 2017-12-18 14:53:17 +01:00
Michal Čihař
a5ebbd9e55 Fix exception handling in selenium tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-18 14:52:18 +01:00
Weblate
212e8d8beb Merge remote-tracking branch 'origin/master' 2017-12-18 13:44:06 +01:00
Robert Antoni Buj Gelonch
d8e681b884 Translated using Weblate (Catalan) 
Currently translated at 97.1% (3194 of 3287 strings)

[CI skip]
 2017-12-18 13:43:56 +01:00
Michal Čihař
decc5075ef Merge branch 'QA_4_7' 2017-12-18 13:43:31 +01:00
Michal Čihař
7a6f85949a Fix mysqli class name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-18 13:42:52 +01:00
Weblate
d43c704fe1 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-12-18 13:12:06 +01:00
Weblate
06e2265a41 Merge remote-tracking branch 'origin/master' 2017-12-18 13:12:01 +01:00
Robert Antoni Buj Gelonch
0d521c8910 Translated using Weblate (Catalan) 
Currently translated at 99.9% (3205 of 3207 strings)

[CI skip]
 2017-12-18 13:12:00 +01:00
Robert Antoni Buj Gelonch
89434fb7e1 Translated using Weblate (Catalan) 
Currently translated at 97.1% (3194 of 3287 strings)

[CI skip]
 2017-12-18 13:11:53 +01:00
Michal Čihař
1957af5663 Remove PmaSelenium prefix from Selenium tests 
It is good enough to have Selenium in the namespace.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-18 13:10:38 +01:00
Michal Čihař
8b8e68c6bf Use PSR-4 for loading selenium tests and adjust their names 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-18 13:09:01 +01:00
Michal Čihař
9b820d84d1 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-12-18 12:11:32 +01:00
Michal Čihař
32ed68f309 Merge branch 'QA_4_7' 2017-12-18 11:49:17 +01:00
Michal Čihař
44df4a3094 Force using POST for SQL query in Util::linkOrButton 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-18 11:46:57 +01:00
Weblate
1bc1e3c2c7 Merge remote-tracking branch 'origin/master' 2017-12-18 11:37:53 +01:00
Robert Antoni Buj Gelonch
843f89b557 Translated using Weblate (Catalan) 
Currently translated at 97.1% (3194 of 3287 strings)

[CI skip]
 2017-12-18 11:37:43 +01:00
Michal Čihař
0a1634a12b Warn user in case the failed login is result of failed setting of cookie 
This can easily happen when switching between HTTPS and HTTP - once you
login using HTTPS, the secure cookie is created and it can not be
overwritten by non secure one created on HTTP connection making the
browser stuck on wrong session ID.

Issue #13872

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-18 11:35:44 +01:00
Maurício Meneghini Fauth
92f71ba0bc Remove table from database search form 
Fix #13730

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-17 22:06:31 -02:00
Weblate
e93d8c9c11 Merge remote-tracking branch 'origin/master' 2017-12-17 16:12:14 +01:00
subo
10981338ca Translated using Weblate (Russian) 
Currently translated at 98.3% (3232 of 3287 strings)

[CI skip]

?
 2017-12-17 16:12:12 +01:00
Claudio Maradonna
e7e55e3bc2 Translated using Weblate (Italian) 
Currently translated at 99.9% (3284 of 3287 strings)

[CI skip]
 2017-12-17 16:12:09 +01:00
Maurício Meneghini Fauth
142c8caf5f
Merge pull request #13870 from mauriciofauth/db-search 
Refactor PhpMyAdmin\Database\Search class
 2017-12-17 13:11:53 -02:00
Maurício Meneghini Fauth
f9e4a1c6af Use template for getSearchResults method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-17 03:49:55 -02:00
Maurício Meneghini Fauth
aa48445e9a Use template for getSelectionForm method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-17 03:49:55 -02:00
Maurício Meneghini Fauth
fe91ba10f8 Remove underscores from methods and properties names 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-17 03:49:55 -02:00
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
Maurício Meneghini Fauth
0e82a5e83e Use template for getResultDivs method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-15 15:44:36 -02:00
Maurício Meneghini Fauth
3010b27bab Use template for _getResultsRow method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-15 11:43:35 -02: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