1
0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Commit Graph

17727 Commits

Author SHA1 Message Date
Michal Čihař
d1f98f85f8 Simplify authentication plugin handling
- rely on autoloader to figure out filename
- directly contruct full class name

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-10-20 15:41:56 +02:00
Michal Čihař
b6ab344e6f Move request check to helper method
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-10-20 15:41:16 +02:00
Michal Čihař
c2d5c993a2 Merge branch 'QA_4_7' 2017-10-20 11:05:55 +02:00
Michal Čihař
3a625bcd1f Fixed listing of bookmarks for a database
Fixes #13761

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-10-20 11:04:45 +02:00
Maurício Meneghini Fauth
09b3488fe4 Port database/structure/structure_table_row to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-18 21:19:52 -02:00
Maurício Meneghini Fauth
efacd3e2ba Port columns_definitions/column_default to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-18 17:58:59 -02:00
Maurício Meneghini Fauth
536caac21d Port navigation/logo template to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-18 12:34:02 -02:00
Maurício Meneghini Fauth
43bf9e5e78 Port table/structure/partition_definition_form to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-17 23:03:32 -02:00
Maurício Meneghini Fauth
fa5c45444e Port columns_definitions/partitions to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-17 22:55:24 -02:00
Maurício Meneghini Fauth
e270cbdc51 Port columns_definitions/column_virtuality to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-17 17:46:13 -02:00
Maurício Meneghini Fauth
f8f72324fd Port columns_definitions/column_attribute to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-17 16:17:47 -02:00
Maurício Meneghini Fauth
49caca9185 Refactor database/structure/sortable_header
Move templates/database/structure/sortable_header.phtml logic to
PhpMyAdmin\Util::sortableTableHeader method.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-17 16:17:47 -02:00
Maurício Meneghini Fauth
62197a88a6 Port database/structure/check_all_tables to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-17 16:17:47 -02:00
Maurício Meneghini Fauth
b35892e6d5 Port database/designer/database_tables to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-14 15:18:35 -03:00
Maurício Meneghini Fauth
e29665b5de Port database/designer/table_list to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-14 12:33:49 -03:00
Maurício Meneghini Fauth
07f1de003d Port database/designer/side_menu to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-14 09:59:35 -03:00
Maurício Meneghini Fauth
5995c4967c Port database/designer/page_save_as to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-14 09:59:35 -03:00
Maurício Meneghini Fauth
f54cfe5d42 Port database/designer/edit_delete_pages to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-14 09:59:35 -03:00
Maurício Meneghini Fauth
0b0833fbd6 Remove Database\Designer::getHtmlForPageSelector
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-12 11:27:41 -03:00
Maurício Meneghini Fauth
565014656f Port database/designer/page_selector to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-12 11:07:16 -03:00
Maurício Meneghini Fauth
973e30f6da Port database/designer/schema_export to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-12 10:26:25 -03:00
Maurício Meneghini Fauth
f7be7ceec1 Port database/designer/query_details to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-11 23:28:12 -03:00
Maurício Meneghini Fauth
47af251acc Port database/structure/favorite_anchor to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-11 23:18:57 -03:00
Maurício Meneghini Fauth
7f47703d3e Port database/structure/show_create to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-11 22:01:05 -03:00
Maurício Meneghini Fauth
98e825aecc Port database/structure/show_create_row to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-11 21:46:13 -03:00
Michal Čihař
9fd9e5d9b3 Remove not needed intermediate variable
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-10-10 14:17:53 +02:00
Michal Čihař
b97116cd5a Remove no longer needed conditions
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-10-10 14:17:20 +02:00
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ř
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
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
Madhura Jayaratne
f88a609f7b Merge branch 'QA_4_7' 2017-10-09 23:20:43 +11: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
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
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
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
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