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

116298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurício Meneghini Fauth
4a08dfc00f Extract HTML from FormDisplayTemplate::displayFormTop 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-08-23 20:02:01 -03:00
Maurício Meneghini Fauth
2e88ed0888 Fix issue when copying a table row 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-08-23 19:23:59 -03:00
Maurício Meneghini Fauth
88e0f2eeb8 Declare some globals in table change/replace 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-08-23 17:36:39 -03:00
Maurício Meneghini Fauth
2aa10f594e Declare some globals in import.php entry point 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-08-23 15:08:01 -03:00
Maurício Meneghini Fauth
333b68eb45 Fix PageSettingsTest failing test 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-08-23 14:50:56 -03:00
Maurício Meneghini Fauth
142232b247 Declare some globals in export.php entry point 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-08-23 14:16:24 -03:00
Maurício Meneghini Fauth
d9f702964f Fix double enconding in settings form 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-08-23 13:47:05 -03:00
Maurício Meneghini Fauth
d3c5bd8abb Fix a merge mistake 
803d07d868 (diff-fd50c2c04f569284f6a7743e43d543b0R1168)

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-08-23 12:04:36 -03:00
Maurício Meneghini Fauth
0ae18f87c5 Add missing define in show_config_errors.php 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-08-23 11:27:50 -03:00
William Desportes
77a285ad57
Update po files 
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-08-23 14:21:31 +02:00
William Desportes
803d07d868
Merge branch 'QA_5_0' into 'master' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-08-23 14:19:56 +02:00
William Desportes
b8527d90dd
Fix typo introduced by 1af61f88b3 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-08-23 13:49:25 +02:00
Michal Čihař
cbe06b54e0
Translated using Weblate (Bengali) 
Currently translated at 67.5% (2247 of 3330 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/bn/
Signed-off-by: Michal Čihař <michal@cihar.com>
 2019-08-23 13:23:10 +02:00
William Desportes
564894ce46
Update po files 
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-08-23 12:36:23 +02:00
William Desportes
1af61f88b3
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-08-23 12:34:24 +02:00
William Desportes
4f5a171826
Update po files 
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-08-23 12:28:00 +02:00
William Desportes
8590357612
Fix a bug introduced by a23f2ba51a 
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-08-23 12:25:02 +02:00
William Desportes
027f39057a
Merge branch 'QA_4_9' into QA_5_0 
- Fixed css img urls for designer

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-08-23 12:22:37 +02:00
William Desportes
6d0f3083ca
Fix display field can return a boolean 
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-08-23 12:15:21 +02:00
William Desportes
9c5195d438
Fix Unit tests broken by a23f2ba51a 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-08-23 01:07:24 +02:00
William Desportes
a23f2ba51a
Fix some bugs with strange table and database names 
- Fix export
- Fix split on . to have db and table
- Replace some $_REQUEST occurences
- Add translations to "add tables from another database" : "None" > strNone
- Refactor the ugly code that used globals to use an object "DesignerTable"
- Fix save a new added table
- Fix delete page items
- Fix more bugs

Fixes: #15446
Fixes: #13370
Fixes: #14945
Closes: #15438

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-08-23 00:55:41 +02:00
William Desportes
5940d11e72
Merge #15448 - Fix many bugs when adding new tables to designer 
Fixes: #15446
Pull-request: #15448
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-08-22 14:05:32 +02:00
William Desportes
9518e0d053
Merge #15452 - Display an error when trying to import in designer a table that's already imported 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-08-22 14:03:14 +02:00
Hugues Peccatte
58e3b71ae2 Update js/messages.php 
add context for translators

Co-Authored-By: William Desportes <williamdes@wdes.fr>
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-08-22 10:07:15 +02:00
Hugues Peccatte
5c7eb38a81 Fix url encoding of table names 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-08-22 10:06:32 +02:00
William Desportes
4f832662c5
Merge #15451 - Designer export fails when a table name contains special chars 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-08-22 09:43:53 +02:00
Maurício Meneghini Fauth
a2308ee965 Extract HTML from login form 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-08-21 21:10:47 -03:00
Hugues Peccatte
b37b479da0 Display an error when trying to import in designer a table that's already imported 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-08-21 23:05:15 +02:00
Hugues Peccatte
67c94b17fd Designer export fails when a table name contains special chars 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-08-21 21:32:32 +02:00
William Desportes
3aa7a35dae
#15363 - substr can return false on tbl_definition_form 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-08-21 19:10:37 +02:00
Maurício Meneghini Fauth
fc6b6c872c Merge branch 'QA_5_0' 2019-08-21 14:00:12 -03:00
Maurício Meneghini Fauth
601fbf9fef Fix type errors with stripcslashes function 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-08-21 13:57:47 -03:00
Maurício Meneghini Fauth
5267b38eb8 Set $plugin_param global for PHPStan 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
(cherry picked from commit 736a1be378)
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-08-21 13:50:38 -03:00
Maurício Meneghini Fauth
7a27daa00a Extract the route definition from index.php 
Moves the route definition from index.php to libraries/route.php.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-08-21 13:31:09 -03:00
Hugues Peccatte
fce235c7bc Remove variable that is unused anymore 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-08-21 08:27:32 +02:00
Maurício Meneghini Fauth
632a774de2 Use the router for transformation_wrapper.php 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-08-21 00:11:04 -03:00
Maurício Meneghini Fauth
2ca7148f6a Use the router for transformation_overview.php 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-08-21 00:11:04 -03:00
Maurício Meneghini Fauth
60f4c5651a Use the router for view_operations.php 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-08-21 00:11:04 -03:00
Maurício Meneghini Fauth
ba6bad9533 Use the router for view_create.php 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-08-21 00:11:04 -03:00
Hugues Peccatte
b13c05edfa Toggling global collapse of tables now relies on tables items instead of j_tabs 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-08-21 00:47:06 +02:00
Hugues Peccatte
ac340e29b6 Add missing overlay on added tables 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-08-21 00:20:13 +02:00
Hugues Peccatte
de57539fb7 Build "tables list" in JS 
This will allow to have the list generation in only one place, as the tables can now be added on the fly. So JS also needs to add items to this list.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-08-21 00:01:17 +02:00
Hugues Peccatte
c23bec2dee Be sure to use local variable 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-08-20 22:34:06 +02:00
Hugues Peccatte
14ba5a1b24 Retrieve DB instead of relying on current one 
When adding a table to the designer, it is useful to know the DB of this table to be able to jump to its structure.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-08-20 22:23:35 +02:00
Hugues Peccatte
49dae2de12 Fix wrong id on table 
When a table is added on the fly, the id was always built based on the first table of the targetted DB, not based on the selected table.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-08-20 20:57:20 +02:00
Hugues Peccatte
da9d907ad1 Fix #15446 Tables added from other databases are not collapsing in the designer section 
The events to link all buttons to collapse tables were initialized at page loading. But when a new table was added, the event wasn't declared for this one.
With this commit, the event is now also declared on table addition.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-08-20 20:46:20 +02:00
William Desportes
10745bb392
#15363 - substr can return false 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-08-20 16:43:31 +02:00
William Desportes
f8688c2774
Merge branch 'QA_4_9' into 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-08-20 14:47:24 +02:00
William Desportes
3b116de260
Fix tests for "NULL wrongly checked on field change" 
Pull-request: #15445
Introduced-by: bef259c510

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-08-20 14:42:43 +02:00
William Desportes
40ed155775
Merge branch 'QA_5_0' into 'master' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-08-20 11:09:55 +02:00