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

111979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
64f4b2cb08 Avoid using PMA_BYPASS_GET_INSTANCE 
We can use Response::disable instead.

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-10 14:14:39 +02:00
Michal Čihař
35ccd9fe4c Merge branch 'QA_4_7' 2017-10-10 14:06:38 +02:00
Michal Čihař
d36e8585be Merge remote-tracking branch 'origin/QA_4_7' 2017-10-10 14:06:34 +02:00
Michal Čihař
b97fa543f4 Use newer ruby 
Based on https://github.com/PowerShell/PowerShell/pull/5065

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-10 14:06:20 +02:00
Michal Čihař
f4cd241f2c Fix MultiTableQuery loading 
The Util class was not accessible.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-10 13:17:05 +02:00
Michal Čihař
56eee83f39 Remove cell_align_right superglobal 
It can be replaced by proper CSS.

Issue #11731
Issue #12262

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-10 13:15:41 +02:00
Michal Čihař
088bdec7f5 Avoid trying to get warnings for non saved queries 
This leads to command out of sync error.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-10 13:12:12 +02:00
Michal Čihař
e4ca1ae98f Remove cell_align_left superglobal 
It can be replaced by proper CSS.

Issue #11731
Issue #12262

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-10 13:04:45 +02:00
Michal Čihař
98964e2f59 Remove is_superuser superglobal 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-10 12:28:00 +02:00
Michal Čihař
9c9c22e516 Load SQL parser context in DatabaseInterface::postConnect 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-10 12:10:40 +02:00
Michal Čihař
d574aede08 Bind Types to DatabaseInterface 
This wayt it's automatically passed with DBI.

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-10 12:05:02 +02:00
Michal Čihař
735db02112 Support JSON datatype on MariaDB 10.2.7 and newer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-10 11:37:01 +02:00
Michal Čihař
b5e391f006 Merge Types and TypesMySQL classes 
These were separate from time we've supported Drizzle, but this no
longer makes sense.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-10 11:33:45 +02:00
Maurício Meneghini Fauth
bd7ff2fe68 Port columns_definitions/mime_type to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-09 18:58:09 -03:00
Maurício Meneghini Fauth
082927af8d Port columns_definitions/column_comment to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-09 16:56:41 -03:00
Maurício Meneghini Fauth
004701c1f6 Port columns_definitions/move_column to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-09 16:36:19 -03:00
Maurício Meneghini Fauth
1cd0a8027d Port columns_definitions/column_name to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-09 16:18:05 -03:00
Maurício Meneghini Fauth
d463ae0044 Fix escaping bug in enum dropdown 
Fix #13724

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-09 10:37:49 -03:00
Weblate
2e89f8bc53 Merge remote-tracking branch 'origin/master' 2017-10-09 14:21:15 +02:00
Allan Nordhøy
177ba27944 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 55.2% (1786 of 3231 strings)

[CI skip]
 2017-10-09 14:21:13 +02:00
Marc
b682508be8 Translated using Weblate (German) 
Currently translated at 99.2% (3208 of 3231 strings)

[CI skip]
 2017-10-09 14:21:10 +02:00
Madhura Jayaratne
f88a609f7b Merge branch 'QA_4_7' 2017-10-09 23:20:43 +11:00
Weblate
d0e263c4d9 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-10-09 14:17:30 +02:00
Allan Nordhøy
37e00c9de8 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 56.0% (1797 of 3205 strings)

[CI skip]
 2017-10-09 14:17:28 +02:00
Madhura Jayaratne
b000c394f7 Fix #13686 Clicking on column name to trigger sort with an active search leads to logout 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-10-09 23:16:57 +11:00
Suad Pacariz
605c14453f Translated using Weblate (Serbian (latin)) 
Currently translated at 43.1% (1383 of 3205 strings)

[CI skip]
 2017-10-09 10:47:30 +02:00
Suad Pacariz
bfb569989e Translated using Weblate (Serbian (latin)) 
Currently translated at 42.5% (1375 of 3231 strings)

[CI skip]
 2017-10-09 10:47:21 +02:00
dingo thirteen
8d7779baad Translated using Weblate (Dutch) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-10-08 23:45:02 +02:00
Maurício Meneghini Fauth
ab365820ff Port server/plugins/section template to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-07 22:51:10 -03:00
Maurício Meneghini Fauth
8225cb36e0 Port server/plugins/section_links template to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-07 22:34:05 -03:00
Maurício Meneghini Fauth
3eabc98b59 Fix PHP warning in preg_replace 
Escape backslash

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-07 21:55:56 -03:00
Maurício Meneghini Fauth
582b1484ac Port server/databases/create template to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-07 21:34:05 -03:00
Weblate
e850a01093 Merge remote-tracking branch 'origin/master' 2017-10-07 23:33:55 +02:00
dingo thirteen
2a4bd07b97 Translated using Weblate (Dutch) 
Currently translated at 99.7% (3222 of 3231 strings)

[CI skip]
 2017-10-07 23:33:50 +02:00
Maurício Meneghini Fauth
d8906b8236 Port server/binlog/log_selector template to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-07 18:32:40 -03:00
Maurício Meneghini Fauth
cab11ee447 Port table/search/selection_form template to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-07 16:27:15 -03:00
Madhura Jayaratne
d53f394fc4 Fix charset description 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-10-07 22:26:55 +11:00
Madhura Jayaratne
fff3eabedf Update dummy dbi queries and results 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-10-07 20:53:39 +11:00
Madhura Jayaratne
c0cabf95b8 Fix #13722 DisableIS is not fully honored 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-10-07 20:18:39 +11:00
Maurício Meneghini Fauth
1621e1ab8a Port database/designer/js_fields template to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-07 00:04:06 -03:00
Maurício Meneghini Fauth
fe4f6148c2 Port table/search/search_and_replace to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-06 20:49:22 -03:00
Maurício Meneghini Fauth
9b38ea8ca3 Port table/search/fields_table template to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-06 16:06:16 -03:00
Maurício Meneghini Fauth
0e4bb8b6ce Port table/search/rows_zoom template to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-06 15:45:15 -03:00
Maurício Meneghini Fauth
326c0781d5 Port table/search/options_zoom to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-06 12:03:20 -03:00
Maurício Meneghini Fauth
ec9404a276 Fix table search wrong escaping 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-06 11:26:10 -03:00
Maurício Meneghini Fauth
51462d7699 Merge pull request #13720 from grrnikos/master 
Fix typo in Greek translation
 2017-10-05 23:10:38 -03:00
Maurício Meneghini Fauth
ae55217e08 Port table/search/options template to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-05 13:04:46 -03:00
Maurício Meneghini Fauth
1a33f062de Port zoom_result_form template to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-05 12:08:27 -03:00
Maurício Meneghini Fauth
1ffa2e1b77 Port table/search/input_box template to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-05 12:08:27 -03:00
Maurício Meneghini Fauth
5a7645a302 Port table/search/rows_normal template to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-05 12:08:27 -03:00