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

108512 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Critiano Lancelotti
f683adfd5a Merge branch 'issue_12262' of https://github.com/clancelotti/phpmyadmin into issue_12262 2017-01-08 08:34:58 -02:00
Critiano Lancelotti
2c11b650ec Exchange jQuery.parseJSON() for JSON.parse() 2017-01-08 08:30:59 -02:00
Cristiano Lancelotti
d3d973f782 Merge branch 'master' into issue_12262 2017-01-08 05:44:15 -02:00
Critiano Lancelotti
0972666fb2 Fix the problem of chart is not rendered 
Signed-off-by: Critiano Lancelotti <lancelot.info@gmail.com>
 2017-01-08 05:30:12 -02:00
Lee Joon Haeng
0a8d384556 Translated using Weblate (Korean) 
Currently translated at 80.7% (2615 of 3239 strings)

[CI skip]
 2017-01-07 16:53:56 +01:00
Yungu Kim
9521e399c0 Translated using Weblate (Korean) 
Currently translated at 80.7% (2615 of 3239 strings)

[CI skip]
 2017-01-07 16:50:56 +01:00
Michal Čihař
055e393955 Implement loading of settings using FileReader API 
Fixes #12398

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-07 16:07:31 +01:00
Michal Čihař
f2c5ecf311 Implement monitor configuration download using Blob API 
This way we no longer need round trip to the server.

Issue #12398

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-07 16:07:26 +01:00
Michal Čihař
4ba0eb88d7 Do not try to add profiling to reponses not handled by Response 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-07 15:08:26 +01:00
Michal Čihař
f9a27d5008 Simplify zeroconf code 
Check if phpmyadmin database exists rather than looping over all
databases.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-07 14:59:59 +01:00
Michal Čihař
a4d616fbac Merge branch 'QA_4_6' 2017-01-06 12:43:45 +01:00
Michal Čihař
fee3923f48 Update SQL parser to 3.4.16 
* Coding style fixes.
* Properly handle operators AND, NOT, OR, XOR, DIV, MOD

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-06 12:43:14 +01:00
Michal Čihař
6dbd4233c8 Merge branch 'QA_4_6' 2017-01-06 09:56:42 +01:00
Michal Čihař
681e908991 Fix check for user groups freatures being enabled 
Fixes #12868

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-06 09:56:15 +01:00
Michal Čihař
811c73bbab Merge branch 'QA_4_6' 2017-01-06 09:47:26 +01:00
Michal Čihař
f14511b09c Merge remote-tracking branch 'origin/QA_4_6' 2017-01-06 09:46:50 +01:00
Flavius Nopcea
8769a646ed Translated using Weblate (Romanian) 
Currently translated at 53.3% (1727 of 3239 strings)

[CI skip]
 2017-01-06 09:46:24 +01:00
Mateusz Wasik
39c9c4fb88 Translated using Weblate (Polish) 
Currently translated at 82.1% (2661 of 3239 strings)

[CI skip]
 2017-01-06 09:46:23 +01:00
Michal Čihař
8efea217ff Use same query for display and execution when dropping index 
Fixes #12872

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-06 09:45:42 +01:00
Flavius Nopcea
03cc225303 Translated using Weblate (Romanian) 
Currently translated at 53.7% (1732 of 3222 strings)

[CI skip]
 2017-01-06 09:43:38 +01:00
Mateusz Wasik
737cfafb92 Translated using Weblate (Polish) 
Currently translated at 82.8% (2669 of 3222 strings)

[CI skip]
 2017-01-06 09:43:38 +01:00
Weblate
5c7f0cc7ac Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2017-01-04 16:19:23 +01:00
Flavius Nopcea
ae34ebc929 Translated using Weblate (Romanian) 
Currently translated at 53.6% (1729 of 3222 strings)

[CI skip]
 2017-01-04 16:19:22 +01:00
Daniel Palmeira Huanca
48d584794d Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 94.5% (3048 of 3222 strings)

[CI skip]
 2017-01-04 16:19:22 +01:00
Dadan Setia
3a4ed9ac45 Translated using Weblate (Indonesian) 
Currently translated at 69.6% (2245 of 3222 strings)

[CI skip]
 2017-01-04 16:19:21 +01:00
Michal Čihař
13390a9eb1 Merge branch 'QA_4_6' 2017-01-04 16:19:05 +01:00
Michal Čihař
1b6da439fb Merge commit '9b7f4f74e9c70ff95a44a2e54dcc00b574a2fa56' 2017-01-04 16:19:01 +01:00
Isaac Bennetch
16fba839bb Changed the SQL window suggestion tool to have DELETE...WHERE 0 instead of 1. 
This should help avoid accidental data loss.

Issue #12859

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-04 16:18:16 +01:00
Michal Čihař
1fda01d02b Merge pull request #12867 from ibennetch/12859 
Changed the SQL window suggestion tool to have DELETE...WHERE 0 inste…
 2017-01-04 16:16:43 +01:00
Weblate
7d17e04dab Merge remote-tracking branch 'origin/master' 2017-01-04 08:42:56 +01:00
Deven Bansod
ad8676b4ff ChangeLog entry for #12863 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-01-04 13:13:07 +05:30
Flavius Nopcea
3161ad159d Translated using Weblate (Romanian) 
Currently translated at 53.2% (1724 of 3239 strings)

[CI skip]
 2017-01-04 08:42:55 +01:00
Daniel Palmeira Huanca
2bb0e2a623 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 94.1% (3050 of 3239 strings)

[CI skip]
 2017-01-04 08:42:55 +01:00
Dadan Setia
93a6f6cd87 Translated using Weblate (Indonesian) 
Currently translated at 69.1% (2241 of 3239 strings)

[CI skip]
 2017-01-04 08:42:53 +01:00
Deven Bansod
7e1def0c40 ChangeLog entry for #12854 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-01-04 13:12:43 +05:30
Deven Bansod
08362b9de5 Fix event-scheduler toggle button's behaviour 
Token parameter is required for all ajax post requests

Fix #12863

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-01-04 13:10:53 +05:30
Deven Bansod
e732f583d2 Fix drop database - token parameter is required as POST param 
Fix #12854

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-01-04 13:10:06 +05:30
Παναγιώτης Παπάζογλου
31938cf1b8 Translated using Weblate (Greek) 
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
 2017-01-03 22:06:32 +01:00
Vinicius Veroneze
fe51a5e813 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.8% (3008 of 3239 strings)

[CI skip]
 2017-01-03 16:54:21 +01:00
Vinicius Veroneze
9b7f4f74e9 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.3% (3008 of 3222 strings)

[CI skip]
 2017-01-03 16:54:10 +01:00
Isaac Bennetch
676257187e Changed the SQL window suggestion tool to have DELETE...WHERE 0 instead of 1. 
This should help avoid accidental data loss.

Issue #12859

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-02 16:00:14 -05:00
Michal Čihař
945fba130f Check if query succeeded before processing results 
Issue #12865

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-02 17:31:20 +01:00
Michal Čihař
8edc20b023 Merge branch 'QA_4_6' 2017-01-02 17:06:36 +01:00
Michal Čihař
0376e599f0 Merge pull request #12853 from ibennetch/commatypo 
Fix incorrect comma in message string
 2017-01-02 17:05:58 +01:00
Michal Čihař
a1e7922c62 Merge pull request #12855 from devenbansod/fix_selenium 
Fix some Selenium tests
 2017-01-02 17:05:15 +01:00
Michal Čihař
607833c4df Clarify Docker link configuration 
Fixes https://github.com/phpmyadmin/docker/issues/103

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-02 16:46:56 +01:00
Michal Čihař
f54f2d3acf Ignore new theme 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-02 16:25:00 +01:00
Michal Čihař
599b09bdd1 Revert "Add PHP 7.2 to test matrix" 
This reverts commit eeac5850db.
 2017-01-02 16:24:45 +01:00
Michal Čihař
eeac5850db Add PHP 7.2 to test matrix 
And expect it to fail for now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-02 16:22:41 +01:00
Michal Čihař
9a9955a410 Document changes for #12799 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-02 16:17:09 +01:00