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

112144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
93726af005 Fix broken link in toggle button 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-10 11:42:53 -02:00
Aleix Sanchis
8b2db0e784 Translated using Weblate (Spanish) 
Currently translated at 97.9% (3218 of 3287 strings)

[CI skip]
 2017-12-09 21:50:40 +01:00
Michal Čihař
6f2ffdfafd Translated using Weblate (Czech) 
Currently translated at 89.8% (2952 of 3287 strings)

[CI skip]
 2017-12-08 23:45:19 +01:00
Kristjan Räts
1032225fd9 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3287 of 3287 strings)

[CI skip]
 2017-12-06 21:13:48 +01:00
tmtisfree
d104c7fdd3 Translated using Weblate (French) 
Currently translated at 100.0% (3287 of 3287 strings)

[CI skip]
 2017-12-06 17:53:48 +01: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
Weblate
20c985ae8e Merge remote-tracking branch 'origin/master' 2017-12-02 22:25:38 +01:00
Matteo Regazzi
53211af45e Translated using Weblate (Italian) 
Currently translated at 99.3% (3266 of 3287 strings)

[CI skip]
 2017-12-02 22:25:31 +01:00
Maurício Meneghini Fauth
a318916579 Fix wrong variable 
Fix #13852

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-02 19:24:17 -02:00
Kozioł Marcin
ebdb489442 Translated using Weblate (Polish) 
Currently translated at 86.0% (2827 of 3287 strings)

[CI skip]
 2017-12-02 21:48:16 +01:00
Aleksej Jovanović
d3ad268f2c Translated using Weblate (Serbian (latin)) 
Currently translated at 42.8% (1409 of 3287 strings)

[CI skip]
 2017-12-02 17:49:42 +01:00
Michal Čihař
8dd8d43787 Merge branch 'QA_4_7' 2017-12-01 08:09:55 +01:00
Michal Čihař
fed1d1d567 Merge remote-tracking branch 'origin/QA_4_7' 2017-12-01 08:09:52 +01:00
Michal Čihař
6221f72738 Merge commit 'ead65616938f88c4150bec15017e04eb91e78dd1' 2017-12-01 08:09:45 +01:00
Michal Čihař
5edb56b2ee Merge commit '1737e8f036ff5ff1fb995814a2bec0524b8c2952' 2017-12-01 08:08:43 +01:00
Michal Čihař
0ddb3aab05 Document PHP 7.2 support 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-01 08:08:15 +01:00
Michal Čihař
10808a2497 Revert "Add PMD images to original theme" 
This reverts commit c7a33031b3.

The images should be used from the default theme if they are not
present.
 2017-12-01 07:59:40 +01:00
Weblate
f4631d1905 Merge remote-tracking branch 'origin/master' 2017-12-01 07:57:55 +01:00
Viktar Vauchkevich
1c7facd467 Translated using Weblate (Belarusian) 
Currently translated at 63.0% (2073 of 3287 strings)

[CI skip]
 2017-12-01 07:57:50 +01:00
Michal Čihař
df96bb0fb1 Document why there are two loops are needed 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-01 07:57:18 +01:00
Michal Čihař
b5029f8191 Declare i variable just once 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-01 07:57:18 +01:00
Weblate
bb0132f456 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-12-01 04:24:53 +01:00
RD WebDesign
a5731bdadd Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.9% (3204 of 3207 strings)

[CI skip]
 2017-12-01 04:24:52 +01:00
dingo thirteen
9f00d003cd Translated using Weblate (Dutch) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2017-12-01 04:24:46 +01:00
Isaac Bennetch
ead6561693 Prepare for 4.7.7-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-11-30 22:24:25 -05:00