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

113595 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lakshay arora
a747de1add Fixes issue with recent table list, #14229 
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>

(cherry picked from commit 727b40e00c)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 20:50:04 -03:00
Maurício Meneghini Fauth
5e2e27dfeb
Merge pull request #14233 from nulll-pointer/recent_table_issue 
Fixes issue with recent table list, #14229
 2018-07-03 20:46:44 -03:00
Maurício Meneghini Fauth
1f291fc709 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 20:18:23 -03:00
Weblate
e6e9b57f1c Merge branch 'origin/QA_4_8' into Weblate 2018-07-04 01:16:28 +02:00
Aswani Prakash
93d3bae766 Translated using Weblate (Malayalam) 
Currently translated at 1.7% (57 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ml/
Signed-off-by: Aswani Prakash <aswani15prakash@gmail.com>
 2018-07-04 01:16:26 +02:00
Marino
22cdd16649 Translated using Weblate (Croatian) 
Currently translated at 26.8% (883 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/hr/
Signed-off-by: Marino <mrabach@gmail.com>
 2018-07-04 01:16:22 +02:00
Maurício Meneghini Fauth
4ac8139540 Add ChangeLog entry for #14333 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 20:15:09 -03:00
Lakshay arora
303cc9c1a0 Fix NULL as default not shown, #14333 
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
(cherry picked from commit 39f19fd20f)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 20:13:08 -03:00
Maurício Meneghini Fauth
4001f6592b
Merge pull request #14409 from nulll-pointer/null_default_error 
Fix NULL as default not shown, #14333
 2018-07-03 19:35:55 -03:00
Isaac Bennetch
7967591f4e Fix failing linter test 
See https://travis-ci.org/phpmyadmin/phpmyadmin/jobs/398682628#L732

Line change was introduced with 9d08a1dcaf

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-07-02 09:49:56 -04:00
Maurício Meneghini Fauth
2334119d8a
Merge pull request #14442 from laps15/refactor_server 
Refactor server templates
 2018-06-30 17:21:28 -03:00
Leonardo Strozzi
7dc44b2ea9 Fix tests for server_engine 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-06-29 22:27:37 -03:00
Maurício Meneghini Fauth
81524bcfe0
Merge pull request #14439 from lem9/master 
Improve message
 2018-06-29 20:24:44 -03:00
Leonardo Strozzi
36ceaee55a Refactor server_engines templates 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-06-29 20:23:26 -03:00
Leonardo Strozzi
28d890f7f7 Refactor server_plugins templates 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-06-29 18:05:29 -03:00
Leonardo Strozzi
217a0db2f8 Refactor server_variables templates 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-06-29 16:36:36 -03:00
Leonardo Strozzi
15ae8d7fe5 Refactor server_databases templates 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-06-29 16:36:36 -03:00
William Desportes
49fae81505
Fix for #14171 - 2FA QR PHPGD 
Closes: #14171
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-06-29 21:21:59 +02:00
Isaac Bennetch
2833c89220 Documentation for $cfg['enable_drag_drop_import'] 
Related to commit f9b55de9f4

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-29 11:57:02 -04:00
Isaac Bennetch
f9b55de9f4
Merge pull request #14421 from nulll-pointer/enh_5 
Add configuration setting to toggle drag drop file Import
 2018-06-29 11:23:31 -04:00
Isaac Bennetch
e4a76a1d12 Merge branch 'QA_4_8' 2018-06-29 10:58:50 -04:00
Isaac Bennetch
660c9f0c8e Merge commit '1f079fa7b0' 2018-06-29 10:58:42 -04:00
Isaac Bennetch
fc5586fb6a ChangeLog entry for pull request #14398, fixing bug #14314 
This change was cherry-picked to commit
b0ec6b69e9

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-29 10:55:47 -04:00
Lakshay arora
b0ec6b69e9 Fix for #14314, error while naming a database '0' 
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
 2018-06-29 10:40:54 -04:00
Marc Delisle
97dd156575
Improve message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2018-06-29 09:55:13 -04:00
William Desportes
b3379d7700
Fix - #14382 "Visualize GIS data" icon missing 
Closes: #14382
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-06-29 00:17:15 +02:00
William Desportes
ff4785cbf2
Patch - missed instance of 'Avoid passing extension to Util::getImage' 
Patch for commit bed6fb4ebd

Fixes: #14390
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-06-29 00:17:08 +02:00
Pedro Silva
1f079fa7b0 Translated using Weblate (Portuguese) 
Currently translated at 57.0% (1876 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/pt/
Signed-off-by: Pedro Silva <sparta14gaming@gmail.com>
 2018-06-26 23:41:09 +02:00
Maurício Meneghini Fauth
a5c14e42d1
Merge pull request #14428 from laps15/db_tracking_refactor 
Refactor db_tracking templates
 2018-06-26 01:07:51 -03:00
Leonardo Strozzi
491ce9a669 Refactor db_tracking templates 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-06-25 23:42:22 -03:00
Leonardo Strozzi
f0eab56fc3 Fix code sniffer ServerDatabasesController error 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-06-25 23:07:05 -03:00
Maurício Meneghini Fauth
3ea6feccb1
Merge pull request #14429 from laps15/bugfix 
Fix server databases statistics
 2018-06-25 21:19:50 -03:00
Maurício Meneghini Fauth
a2c4827e0b
Merge pull request #14408 from ibennetch/14407 
Fix Uncaught TypeError in privilege editor
 2018-06-25 20:41:55 -03:00
William Desportes
e816e45c18 phpstan level 0 (#14405) 
* Fix phpdoc @return

- Fixed @return typehint

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Fix incorrect case on function calls

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Type hint + typo fix

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Fixes

- @return fix
- @var fix
- Class names
- Throws fix
- test/classes/Plugins/Export/ExportSqlTest.php any() invoked with 1 parameter, 0 required
-  libraries/classes/Controllers/Table/TableStructureController.php Array has 2 duplicate keys with value 'columns_list'
- Call parent constructor  libraries/classes/Error.php

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Update config

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Access to an undefined property

- Access to an undefined property PhpMyAdmin\Plugins\Schema\Pdf\PdfRelationSchema::$diagram_row
- Access to an undefined property PhpMyAdmin\Plugins\Schema\Pdf\Pdf::$cMargin
- Undefined properties

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Update config

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Fix bootstrap-phpstan

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Fix typos and phpstan config

Fixes: #14399
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-06-25 20:34:46 -03:00
Leonardo Strozzi
05cff7ed58 Fix server databases statistics 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-06-25 18:06:20 -03:00
Maurício Meneghini Fauth
4d8310432f Fix coc comment for parameter "$include" 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-25 16:09:57 -03:00
Maurício Meneghini Fauth
2cea709661 Fix EnvironmentTest namespace issue 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-25 15:08:20 -03:00
Lakshay arora
9d08a1dcaf Puts PMA import handler in a separate javascript file. 
Makes 'enable_drag_drop_import' as a separate configuration directive, removes it from group of $cfg['IMPORT'] directives.
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
 2018-06-25 12:37:43 +05:30
Lakshay arora
61163cd14b Add configuration setting to toggle drag drop file Import 
This commit-
Adds a configuration directive to toggle drag drop Import feature as requested in #13155
TODO:
1. Test it on multiple servers.
2. Disable javascript handlers for drag drop
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
 2018-06-24 14:21:24 +05:30
Maurício Meneghini Fauth
ec4911d20c
Merge pull request #14415 from laps15/refactor 
Refactor database templates
 2018-06-21 18:45:37 -03:00
Isaac Bennetch
dcf434b635 Fixup from merge 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 14:00:03 -04:00
Isaac Bennetch
d1360f46ce Merge branch 'QA_4_8' 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 13:54:08 -04:00
Isaac Bennetch
42f36cce39 Prepare for version 4.8.3-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 13:41:45 -04:00
Isaac Bennetch
064f6cc0ec Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 13:17:18 -04:00
Isaac Bennetch
3115f340b9 Adding composer lock for 4.8.2 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 13:07:34 -04:00
Isaac Bennetch
d363fa02c6 Prepare for version 4.8.2 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 11:50:09 -04:00
Isaac Bennetch
2867a95523 Update Changelog for RCE/file inclusion security issue 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 11:44:16 -04:00
Isaac Bennetch
26c6e87682 Merge remote-tracking branch 'security/QA_4_8-security' into QA_4_8 2018-06-21 11:31:18 -04:00
Isaac Bennetch
536b214757
Merge pull request #14418 from nijel/page_validity 
Avoid looking for ? when checking for file to be included
 2018-06-21 11:26:15 -04:00
Michal Čihař
7662d02939 Avoid looking for ? when checking for file to be included 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-06-21 13:31:00 +02:00