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

110806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
f8b5c256e6 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-08-29 15:35:53 +02:00
Michal Čihař
ca68951b85 Merge branch 'QA_4_7' 2017-08-29 15:34:34 +02:00
Michal Čihař
1af478394d Merge remote-tracking branch 'origin/QA_4_7' 2017-08-29 15:34:31 +02:00
Weblate
b072b3b175 Merge remote-tracking branch 'origin/master' 2017-08-29 15:34:22 +02:00
Michal Čihař
e781cf0c76 Fixed javascript error in server monitor 
Fixes #13628

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-29 15:34:21 +02:00
Michal Čihař
f2cb155ed1 Use same OS name on client and server 
Issue #13444 and #13628

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-29 15:34:21 +02:00
Steven WdV
16bd7f1e14 Translated using Weblate (Dutch) 
Currently translated at 99.9% (3230 of 3231 strings)

[CI skip]
 2017-08-29 15:34:16 +02:00
Madhura Jayaratne
bf08e0ab6d Merge branch 'QA_4_7' 2017-08-29 23:33:43 +10:00
Weblate
9ea8fbe9c0 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-08-29 15:28:19 +02:00
Steven WdV
be697dea2c Translated using Weblate (Dutch) 
Currently translated at 99.9% (3204 of 3205 strings)

[CI skip]
 2017-08-29 15:28:16 +02:00
Madhura Jayaratne
047de9cdf4 Merge branch 'QA_4_7' of github.com:phpmyadmin/phpmyadmin into QA_4_7 2017-08-29 23:27:22 +10:00
Madhura Jayaratne
f4d77f905d Fix #13177 Grid editing repeats action after error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-08-29 23:25:14 +10:00
Weblate
d84ed95285 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-08-29 15:00:52 +02:00
Theodore Fabian Rudy
0ad3507b3b Translated using Weblate (Indonesian) 
Currently translated at 70.8% (2270 of 3205 strings)

[CI skip]
 2017-08-29 15:00:47 +02:00
Steven WdV
a4991b85a4 Translated using Weblate (Dutch) 
Currently translated at 99.9% (3204 of 3205 strings)

[CI skip]
 2017-08-29 15:00:39 +02:00
Weblate
970d667b3f Merge remote-tracking branch 'origin/master' 2017-08-29 15:00:34 +02:00
Steven WdV
eebc181644 Translated using Weblate (Dutch) 
Currently translated at 99.9% (3230 of 3231 strings)

[CI skip]
 2017-08-29 15:00:28 +02:00
Viktar Vauchkevich
91348fb855 Translated using Weblate (Belarusian) 
Currently translated at 63.3% (2031 of 3205 strings)

[CI skip]
 2017-08-29 15:00:26 +02:00
Michal Čihař
7d0f3d926d Merge branch 'QA_4_7' 2017-08-29 14:59:36 +02:00
Michal Čihař
2f04cdaa7a Properly escape javascript variables 
In case some variable name contains special chars, we should really
escape it.

Issue #13444

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-29 14:58:40 +02:00
Weblate
71a993c6c2 Merge remote-tracking branch 'origin/master' 2017-08-29 14:36:38 +02:00
Steven WdV
3e29ae88be Translated using Weblate (Dutch) 
Currently translated at 99.9% (3230 of 3231 strings)

[CI skip]
 2017-08-29 14:36:30 +02:00
Viktar Vauchkevich
8a61607191 Translated using Weblate (Belarusian) 
Currently translated at 63.3% (2048 of 3231 strings)

[CI skip]
 2017-08-29 14:36:22 +02:00
Madhura Jayaratne
ca736ac700 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-08-29 22:35:37 +10:00
Madhura Jayaratne
23024a6bfb issue #13614 Fix link name and url 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-08-29 22:33:36 +10:00
Weblate
d39720cf46 Merge remote-tracking branch 'origin/master' 2017-08-28 22:26:55 +02:00
Theodore Fabian Rudy
628237a72a Translated using Weblate (Indonesian) 
Currently translated at 70.7% (2286 of 3231 strings)

[CI skip]
 2017-08-28 22:26:51 +02:00
Maurício Meneghini Fauth
4dc40d4100 Merge pull request #13622 from mauriciofauth/central-columns 
Refactor central_columns functions to static methods
 2017-08-28 17:26:34 -03:00
Maurício Meneghini Fauth
5b0ba627d3 Refactor central_columns functions to static methods 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-08-28 13:31:47 -03:00
Michal Čihař
78e2efccd9 Avoid PHP error when accessing setup with existing configuration 
Fixes #13556

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-28 15:58:35 +02:00
Michal Čihař
d652d31a5d Add privileges export to per database listing 
Fixes #13576

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-28 15:46:44 +02:00
Michal Čihař
ce1b3fca2f Merge branch 'QA_4_7' 2017-08-28 15:21:07 +02:00
Michal Čihař
3da6501c89 Remove Selenium tests from the maintenance branch 
They are broken anyway, so there is no point in wasting resources on
them.

See #13603

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-28 15:20:34 +02:00
Michal Čihař
16c7456661 Enable Selenium tests for pull requests 
This is done by encoding BrowserStack credentians in .travis.yml.

This was recommended approach by BrowserStack guys, see:

https://github.com/travis-ci/travis-scheduler/pull/81#issuecomment-324457038

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-28 15:14:36 +02:00
Michal Čihař
85c335d13a Merge branch 'QA_4_7' 2017-08-28 15:06:24 +02:00
Michal Čihař
fa2dc971f6 Integrate tooltip into datetime pickers 
The tooltip is now disabled when picker is shown and it's content is
rendered wihtin the picker.

Fixes #13612

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-28 15:05:50 +02:00
Michal Čihař
282818bc8f Merge branch 'QA_4_7' 2017-08-28 13:49:55 +02:00
Michal Čihař
0b7a4d9022 Merge remote-tracking branch 'origin/QA_4_7' 2017-08-28 13:49:51 +02:00
Michal Čihař
7dc3dac382 Avoid problems with browsing unknown query types 
Avoid trying to construct sort links when the parser has failed on the
query. This currently happens in WITH clause, but this is generic
problem.

Fixes #13615

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-28 13:48:12 +02:00
Theodore Fabian Rudy
373569cfb8 Translated using Weblate (Indonesian) 
Currently translated at 70.7% (2285 of 3231 strings)

[CI skip]
 2017-08-28 13:48:04 +02:00
Theodore Fabian Rudy
b54c043a24 Translated using Weblate (Indonesian) 
Currently translated at 70.7% (2269 of 3205 strings)

[CI skip]
 2017-08-28 13:48:01 +02:00
ZoroarkDarkrai
00a640d4d4 Translated using Weblate (Indonesian) 
Currently translated at 70.7% (2269 of 3205 strings)

[CI skip]
 2017-08-28 13:15:00 +02:00
ZoroarkDarkrai
53cfbd06d6 Translated using Weblate (Indonesian) 
Currently translated at 70.7% (2285 of 3231 strings)

[CI skip]
 2017-08-28 13:14:49 +02:00
Steven WdV
384fd785da Translated using Weblate (Dutch) 
Currently translated at 99.9% (3204 of 3205 strings)

[CI skip]
 2017-08-27 00:45:17 +02:00
Weblate
21d55a4553 Merge remote-tracking branch 'origin/master' 2017-08-26 15:32:12 +02:00
Mochammad Nur Afandi
00c43a89c4 Translated using Weblate (Indonesian) 
Currently translated at 69.8% (2258 of 3231 strings)

[CI skip]
 2017-08-26 15:32:08 +02:00
Steven WdV
ff967ef850 Translated using Weblate (Dutch) 
Currently translated at 99.9% (3230 of 3231 strings)

[CI skip]
 2017-08-26 15:32:05 +02:00
Isaac Bennetch
54bd2b46f7 ChangeLog entry for issue #13268 (pull request #13342) 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-08-26 09:30:07 -04:00
Steven WdV
d4c3529b8e Translated using Weblate (Dutch) 
Currently translated at 100.0% (3231 of 3231 strings)

[CI skip]
 2017-08-25 22:45:55 +02:00
Steven WdV
03a8b25bce Translated using Weblate (Dutch) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-08-25 22:45:47 +02:00