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

18909 Commits

Author SHA1 Message Date
William Desportes
c6d8fb4573
Merge branch 'QA_4_8' 
[ci skip]
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-28 20:26:59 +02:00
William Desportes
5a08e12bb6
Fix #15205 - Useless backquotes, sql preview, delete index 
Fixes: #15205
Pull-request: #15207
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-28 20:10:51 +02:00
Saurabh Srivastava
e03a7ed02f Fix not working for primary key 
Signed-off-by: Saurabh Srivastava <saurabhsrivastava312@gmail.com>
 2019-04-28 17:51:05 +05:30
William Desportes
1524ec51c8
Merge branch 'QA_4_8' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-28 01:00:28 +02:00
William Desportes
60564b5d92
Fix #14800 #14833 - Sort by Time and show full query on Processlist 
Fixes: #14800
Fixes: #14833
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-28 00:26:29 +02:00
William Desportes
e453ad1320
Merge branch 'QA_4_8' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-27 19:15:57 +02:00
William Desportes
91c758aae4
Fix #15229 - Notice - Undefined index: strPrivDescDelete versioning rowsTbl 
Fixes: #15229
Adds support for delete versioning rows privilege
See: https://mariadb.com/kb/en/library/grant/#table-privileges
The privilege is named 'Delete versioning rows' in SHOW GRANTS and 'Delete_history_priv' in mysql.user
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-27 18:42:02 +02:00
Maurício Meneghini Fauth
f29add97c4
Merge pull request #15198 from murex971/css-changes 
Span converted to button
 2019-04-26 22:41:57 -03:00
William Desportes
5566aa6976
Fix #15228 - Notice - Undefined index: foreign_keys_data 
Fixes: #15228
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-26 23:45:20 +02:00
William Desportes
836cc74413
Fix issue reported by scrutinizer 
See: fcb406937f
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-25 20:58:38 +02:00
William Desportes
52632ca08e
Merge branch 'QA_4_8' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-25 19:39:39 +02:00
William Desportes
fcb406937f
Fix #14732 - Can't rename primary key with auto increment 
Fixes: #14732
Pull-request: #15204
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-25 19:34:31 +02:00
William Desportes
f9209aeb05
Fix #15038 - Console height allowing negative values 
Fixes: #15038
Pull-request: #15086
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-25 19:01:25 +02:00
Maurício Meneghini Fauth
0811724040 Extract HTML from NavigationTree::renderPath() 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-24 15:10:26 -03:00
Maurício Meneghini Fauth
5254ec1b65 Refactor Navigation\NavigationTree 
- Extract HTML from renderState() and renderDbSelect()
- Use DI for $dbi instead of global
- Fix tests

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-24 02:25:48 -03:00
Maurício Meneghini Fauth
6ae9cdf249 Extract HTML from Navigation\NavigationHeader 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-23 22:20:06 -03:00
Maurício Meneghini Fauth
7d199a7bc2 Fetch dbi from DI instead of global in Navigation class 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-23 16:43:16 -03:00
Maurício Meneghini Fauth
1d0dad5cd6 Extract HTML from Navigation::getItemUnhideDialog() 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-23 16:24:55 -03:00
Maurício Meneghini Fauth
c642c29aa4 Extract HTML from Navigation::getDisplay() 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-22 15:57:16 -03:00
Maurício Meneghini Fauth
e979a784c8
Merge pull request #15214 from carusogabriel/master 
Use Null Coalesce Operator
 2019-04-20 20:25:42 -03:00
Gabriel Caruso
f28a60ea15 Use Null Coalesce Operator 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2019-04-19 21:58:21 -03:00
Maurício Meneghini Fauth
5abc69c280 Extract HTML from Scripts::getDisplay() 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-19 21:47:27 -03:00
Maurício Meneghini Fauth
b0e5a9ac59 Extract HTML from Footer::getDisplay() 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-19 16:39:24 -03:00
Maurício Meneghini Fauth
47fa0d8bdb Extract HTML from Header::getDisplay() 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-19 15:37:33 -03:00
Maurício Meneghini Fauth
2b79b8e50a Replace dbi global with $this in DatabaseInterface 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-18 01:51:26 -03:00
Maurício Meneghini Fauth
17195fbe72 Get $dbi from DIC instead of global in entry points 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-18 01:09:38 -03:00
Maurício Meneghini Fauth
7f793cdd59 Use DI for $dbi global in Export class 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-17 22:10:43 -03:00
Maurício Meneghini Fauth
3fc55855d6 Merge branch 'QA_4_8' 
Closes #15210

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-17 19:39:33 -03:00
Jan Demter
3882454ed9 fix typo in language name 
Signed-off-by: Jan Demter <jan@demter.de>
 2019-04-17 19:33:17 -03:00
Maurício Meneghini Fauth
71208bab74 Require PHP 7.1.3 
Related to c32e22d3bf

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-16 17:20:13 -03:00
Saurabh Srivastava
5d6f761e08 Fix - #15205 - Useless backquotes, sql preview, delete index 
Signed-off-by: Saurabh Srivastava <saurabhsrivastava312@gmail.com>
 2019-04-16 13:58:41 +05:30
Saurabh Srivastava
4d725f9bd1 Fix - #14732 - Can't rename primary key with auto increment 
Signed-off-by: Saurabh Srivastava <saurabhsrivastava312@gmail.com>

Fix - #14732 - taking care for #13235

Signed-off-by: Saurabh Srivastava <saurabhsrivastava312@gmail.com>
 2019-04-16 08:41:56 +05:30
Nupur Agrawal
03ba08768e Span converted to button 
Signed-off-by: Nupur Agrawal <nupur202000@gmail.com>
 2019-04-15 00:03:29 +05:30
Maurício Meneghini Fauth
f3822d5a87 Extract HTML from Setup\FormProcessing 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-09 22:44:06 -03:00
Maurício Meneghini Fauth
d06291a7d6 Move prefs_* templates to the preferences directory 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-07 16:05:48 -03:00
William Desportes
caa2035cc8
Merge branch 'QA_4_8' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-07 15:55:46 +02:00
Maurício Meneghini Fauth
57c8f11a07 Extract HTML from ReplicationGui::getHtmlForReplicationStatusTable 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-06 20:26:06 -03:00
Maurício Meneghini Fauth
5e828ec810 Create Server\ReplicationController 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-06 20:26:06 -03:00
William Desportes
9c6e2b812d
Fix #15119 - Uninterpreted HTML on Settings->Export page 
Fixes: #15119
Pull-request: #15132
Closes: #15134
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-05 10:06:34 +02:00
William Desportes
bccfdb1407
Merge branch 'QA_4_8' 
- Fixed code style issues
- Merged QA_4_8 branch

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-04 22:52:49 +02:00
William Desportes
cfc75fd8ce
Fix #15036 - Input fields missing checks for MaxSizeForInputField 
Fixes: #15036
Pull-request: #15056
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-04 22:45:55 +02:00
apoorv
1356b1b434 Fixes #15036 Input fields missing checks 
Signed-off-by: Apoorv Khare <apoorvkhare007@gmail.com>
 2019-04-05 01:38:33 +05:30
William Desportes
a7084c2035
Fix #15152 - [UI] Export/Import tabs placement inconsistency 
Fixes: #15152
Pull-request: #15153
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-04 21:54:42 +02:00
William Desportes
2609bff627
Merge branch 'QA_4_8' 2019-04-04 21:49:27 +02:00
William Desportes
2e0821ea5c
Fix import XML data with leading zeros 
Pull-request: #14944
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-04 21:46:17 +02:00
William Desportes
f911595f02
Fixed php notice undefined index pma on ImportXml 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-04 21:40:21 +02:00
William Desportes
1024e420e1
Fixed php warning count(): Parameter ... on export table to XML 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-04 21:40:21 +02:00
Agha Saad Fraz
5bc29b86d0
Fix placement inconsistency of Export/Import tabs 
Signed-off-by: Agha Saad Fraz <agha.saad04@gmail.com>
I have moved the array element Import and placed it after the Export element.
 2019-04-05 00:32:53 +05:00
Maurício Meneghini Fauth
dcb2014cf9 Merge branch 'extract_html_in_prefs_manage_to_twig' of https://github.com/aektos/phpmyadmin into aektos-extract_html_in_prefs_manage_to_twig 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-02 16:32:15 -03:00
William Desportes
1e403f76d9
Merge branch 'QA_4_8' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-01 23:28:40 +02:00