gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,243 Commits 12 Branches 481 Tags 2.4 GiB
7f7fa8465a
Commit Graph

3386 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
c482cd47ef
Remove gridEditingConfig JS global 
- Uses data attribute instead.
- Uses Bootstrap's tooltip instead of the jQuery plugin.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-02-14 23:19:29 -03:00
Maurício Meneghini Fauth
a0337bf220
Refactor JavaScriptMessagesController controller 
- Removes the dependency of the cfg and theme PHP globals.
- Handles the errors when encoding the messages to JSON.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-02-14 18:09:57 -03:00
Maurício Meneghini Fauth
3443891886
Merge branch 'QA_5_2' 2022-02-12 11:54:12 -03:00
Maurício Meneghini Fauth
de0244b3e6
Mark test as incomplete if it doesn't has all select dbs 
Related to #17300.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-02-12 11:51:53 -03:00
Maurício Meneghini Fauth
7b1dd0ea6c
Merge branch 'QA_5_1' into QA_5_2 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-02-12 11:42:17 -03:00
Maurício Meneghini Fauth
d621eca13d
Merge pull request #17351 from kamil-tekiela/Remove-stripslashes 
Drop stripslashes
 2022-02-12 10:33:02 -03:00
William Desportes
c26c153a11
Improve DbiDummy::addResult phpdoc 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-02-11 22:31:03 +01:00
William Desportes
895b089e96
Ref #17287 - Add a test for getDatabasesFull and data sorting 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-02-11 22:26:03 +01:00
Maurício Meneghini Fauth
65f13ed209
Merge branch 'QA_5_2' 2022-02-09 15:08:51 -03:00
Maurício Meneghini Fauth
1faab7119d
Fix bug when renaming tables with config storage enabled 
Fixes https://github.com/phpmyadmin/phpmyadmin/issues/17359

Introduced by https://github.com/phpmyadmin/phpmyadmin/pull/17256

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-02-09 13:58:35 -03:00
Kamil Tekiela
6e1221ce62 Drop stripslashes 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-02-07 18:07:27 +00:00
William Desportes
a7b222db8a
Merge branch 'origin/QA_5_2' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-02-06 15:47:17 +01:00
William Desportes
65c9f49c1e
Merge branch 'QA_5_1' into QA_5_2 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-02-06 15:45:57 +01:00
William Desportes
4e68f548f9
Ref #17298, #17344 - fix ODS import tests 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-02-06 14:20:59 +01:00
Maurício Meneghini Fauth
dca5b1b893
Create the DisplayParts class 
Replaces the displayParts array with the DisplayParts object.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-02-03 14:42:09 -03:00
Maurício Meneghini Fauth
5a34a3bb04
Remove db and table properties from controllers 
Replaces them with their respective globals.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-02-02 14:48:43 -03:00
Shucon Tech
ee57160671
Replace Page settings dialog with modal (#17127) 
* Replace Page settings dialog with modal

Signed-off-by: Saksham Gupta <shucontech@gmail.com>

Fix max-width class

Signed-off-by: Saksham Gupta <shucontech@gmail.com>

* Fix failing tests

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-02-01 10:49:48 -03:00
Shucon Tech
4a606ee594
Replace Add Index dialog with modal (#17125) 
* Replace Add Index dialog with modal

Signed-off-by: Saksham Gupta <shucontech@gmail.com>

Index type selection box

Signed-off-by: Saksham Gupta <shucontech@gmail.com>

Fix open bugs

Signed-off-by: Saksham Gupta <shucontech@gmail.com>

* Fix failing tests

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-31 19:51:56 -03:00
Maurício Meneghini Fauth
5e7410a930
Improve Error message stacktrace style 
Fixes #17326

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-29 16:55:44 -03:00
Shucon Tech
745c39bf9c
Replace function Confirm dialog with modal (#17115) 
* Replace function Confirm dialog with modal

Signed-off-by: Saksham Gupta <shucontech@gmail.com>

* Fix failing tests

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-28 21:54:14 -03:00
Kamil Tekiela
6f8d5fcec3 Fix tests after d4d146ff4f 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-28 22:26:29 +00:00
Kamil Tekiela
285ebd78ef Fix tests after 47e81a5161 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-28 22:16:15 +00:00
Maurício Meneghini Fauth
8529de4d88
Merge pull request #17303 from kamil-tekiela/Remove-globals 
Remove globals
 2022-01-28 16:47:16 -03:00
Maurício Meneghini Fauth
b3104dfa6d
Add basic test for Server\PrivilegesController class 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-28 14:23:54 -03:00
Kamil Tekiela
47e81a5161 Remove $route global 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-27 11:47:40 +00:00
Maurício Meneghini Fauth
c62dcebdaa
Fix ThemeTest failing test 
Related to 60cdd5013d.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-26 15:17:46 -03:00
Maurício Meneghini Fauth
76bb42957e
Fix failing tests 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-26 15:02:39 -03:00
Maurício Meneghini Fauth
a57102412c
Merge branch 'QA_5_1' into QA_5_2 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-26 10:42:45 -03:00
Maurício Meneghini Fauth
feda222da9
Fix failing tests 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-26 10:02:26 -03:00
Isaac Bennetch
985912f58f Fix merge conflicts from security branch 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-20 12:28:17 -05:00
Maurício Meneghini Fauth
6177f83b03
Merge pull request #17279 from kamil-tekiela/Dbal-pt.4 
Major Dbal refactoring pt.4
 2022-01-19 12:16:14 -03:00
Maurício Meneghini Fauth
04176cd9db
Mark test as incomplete for not supported queries 
Instead of printing the query, it marks the test as incomplete, this way
we have a stack trace that help finding why it happened.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-19 11:39:27 -03:00
Maurício Meneghini Fauth
411bacf613
Use Sodium for auth cookies encryption 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-13 18:46:04 -03:00
Maurício Meneghini Fauth
7aaab24463
Remove the phpseclib dependency 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-13 17:43:50 -03:00
Maurício Meneghini Fauth
9b3a1f7734
Merge branch 'QA_5_1-security' into master-security 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-13 17:41:16 -03:00
Maurício Meneghini Fauth
5118acce1d
Escape config-form's action attribute 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-13 10:34:47 -03:00
Maurício Meneghini Fauth
0bee94b27e
Merge branch 'QA_5_1-security' into master-security 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-11 14:31:56 -03:00
Maurício Meneghini Fauth
7dde0d019f
Fix Generator::linkOrButton issue after merge 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-10 20:11:54 -03:00
Maurício Meneghini Fauth
02e8588404
Merge branch 'QA_4_9-security' into QA_5_1-security 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-10 18:39:23 -03:00
Maurício Meneghini Fauth
0b575ff2e9
Fix URL encryption for Util::linkOrButton method 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-10 12:19:44 -03:00
Maurício Meneghini Fauth
6f0d19f394
Do not encrypt params if used in data-post attribute 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-10 12:19:43 -03:00
Maurício Meneghini Fauth
d057b68aa1
Add unit tests 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-10 12:19:43 -03:00
Maurício Meneghini Fauth
28ad63c969
Create PhpMyAdmin\Crypto\Crypto class to handle encryptions 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-10 12:19:42 -03:00
Kamil Tekiela
86031d2bf6 Deimplement fetchAssoc() helper 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-09 22:44:53 +00:00
Kamil Tekiela
a4b2d7e524 Deimplement fetchRow() helper 
This helper isn't needed anymore.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-09 22:44:53 +00:00
Kamil Tekiela
2edc9da063 Deimplement dataSeek() helper 
There were only two usages remaining. This helper isn't needed anymore.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-07 23:22:49 +00:00
Kamil Tekiela
a74c5aed44 Add few more usages of queryAsControlUser 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-06 19:31:27 +00:00
Kamil Tekiela
f5bb90ebb9 Move queryAsControlUser - Dbal refactoring pt.3 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-06 19:31:27 +00:00
Maurício Meneghini Fauth
3acaca5f24
Merge pull request #17268 from kamil-tekiela/QUERY_STORE 
Major refactoring of Dbal pt.2
 2022-01-06 13:49:19 -03:00
William Desportes
666f0d6a27
Merge branch 'QA_5_1' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-01-03 13:06:27 +01:00