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

110448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deven Bansod
c28e2d4235 Fix Import-related selenium tests 
* Use $cfg['uploadDir'] = "./test/test_data" while importing
* Prevents use of FileDetectors in remote file detectors etc.

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-07-26 20:24:22 +05:30
Deven Bansod
6246c84021 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2017-07-26 20:20:05 +05:30
Deven Bansod
b1504ad3f5 Use shorter strings hoping to avoid error in DbEvents addEvent 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-07-26 20:18:26 +05:30
Deven Bansod
db79d9f63c Let the SQL query box load completely 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-07-26 18:58:55 +05:30
Deven Bansod
7467d28198 Use alternate way to enter long text field values in AddEvent 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-07-26 18:58:47 +05:30
Deven Bansod
467c6405e5 Fix possible errors with DropTracking test 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-07-26 18:58:38 +05:30
Weblate
53ff019d73 Merge remote-tracking branch 'origin/master' 2017-07-26 14:29:47 +02:00
Daniel Grønlund Johansen
b9f8ccb188 Translated using Weblate (Danish) 
Currently translated at 93.0% (2990 of 3213 strings)

[CI skip]
 2017-07-26 14:29:42 +02:00
Deven Bansod
e0d89fa22a Use different approach to handle typing long values 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-07-26 14:39:29 +05:30
Deven Bansod
8ec61c66cd Fix possible infinite loop in TableInsert-addData 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-07-25 22:04:33 +05:30
Deven Bansod
e6fdb15dc9 Fix failing test in CopyRecords-TableBrowse 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-07-25 22:04:24 +05:30
Michal Čihař
068b531821 Merge pull request #13520 from devenbansod/fix_selenium_tests_2 
Fix more selenium tests
 2017-07-25 13:57:01 +02:00
Deven Bansod
4083e03267 Fix tests 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-07-25 14:43:32 +05:30
Isaac Bennetch
c9a10b4cfb Changelog entry for inline JavaScript, issue #12261 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-07-23 15:59:25 -04:00
Weblate
26d1cd2f72 Merge remote-tracking branch 'origin/master' 2017-07-23 20:01:53 +02:00
Володимир Бриняк
74d6b773a3 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3213 of 3213 strings)

[CI skip]
 2017-07-23 20:01:52 +02:00
Isaac Bennetch
9f592ad968 Merge pull request #13446 from manishbisht/remove-inline-javascript 
Removed inline onclick javascript; fixes #12261
 2017-07-23 14:01:40 -04:00
Manish Bisht
238d0c278b removed inline onclick javascript 
Signed-off-by: Manish Bisht <manish.bisht490@gmail.com>
 2017-07-23 21:54:02 +05:30
Isaac Bennetch
eb01ac190d ChangeLog entry for issue 5666, transformation options 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-07-23 11:09:17 -04:00
Weblate
d015d6c3bb Merge remote-tracking branch 'origin/master' 2017-07-23 17:05:12 +02:00
worldwideskier
5533715d47 Translated using Weblate (Japanese) 
Currently translated at 69.5% (2234 of 3213 strings)

[CI skip]
 2017-07-23 17:05:09 +02:00
Isaac Bennetch
1e33a00792 Merge pull request #13395 from Achilles-96/Issue-#5666 
Default options for transformations - Fixes #5666
 2017-07-23 11:04:57 -04:00
Василий
56930b865e Translated using Weblate (Russian) 
Currently translated at 94.0% (3022 of 3213 strings)

[CI skip]
 2017-07-23 15:48:06 +02:00
Raghuram
44028973ee Fixes #5666 - Default options for transformations 
Signed-off-by: Raghuram <raghuram.vadapalli@research.iiit.ac.in>
 2017-07-23 13:21:48 +05:30
Володимир Бриняк
6d1de68634 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3213 of 3213 strings)

[CI skip]
 2017-07-23 08:26:11 +02:00
Michal Čihař
8270a1c1e1 Indicate SSL status on main page 
- indicate status on main page
- indicate possible configuration issues
- show in red if remote connection is not using SSL
- add overview documentation for server SSL setup

Fixes #12354

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-21 15:04:59 +02:00
Michal Čihař
95269dd3d9 Fix rendering of items on main page 
Fixes #13505

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-21 14:39:33 +02:00
Michal Čihař
ff7309079a Remove unused ThemeManager::makeBc 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-21 14:33:12 +02:00
Michal Čihař
39c5b79627 Remove global variable theme 
It contained theme name and does not seem to be used.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-21 14:32:46 +02:00
Michal Čihař
5b906a781a Remove todo which no longer makes sense 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-21 14:30:18 +02:00
Michal Čihař
f9d14ced73 Move ThemeManager init code to the constructor 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-21 14:26:45 +02:00
Michal Čihař
b1fac665e7 Remove unused ThemeManager::checkConfig 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-21 14:26:02 +02:00
Michal Čihař
bccb3ff27a Merge branch 'QA_4_7' 2017-07-21 14:23:01 +02:00
Michal Čihař
c06d613051 Fixed per server theme feature 
We need to know server even when loading minimal common for the CSS.

Fixes #13507

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-21 14:22:07 +02:00
Michal Čihař
753712d29e Remove not needed code for handling per server theme 
Issue #13507

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-21 14:21:26 +02:00
Michal Čihař
3dfa8d751f Pass server parameter to the CSS backend 
Issue #13507

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-21 14:15:52 +02:00
Michal Čihař
65767f1abe Move theme initialization behind server 
We really need to validate server first before using it.

Issue #13507

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-21 14:08:25 +02:00
Michal Čihař
04038e27dd Avoid calling function multiple times 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-21 14:07:28 +02:00
Michal Čihař
a84b0ba648 Merge branch 'QA_4_7' 2017-07-21 13:53:53 +02:00
Michal Čihař
603836153c Add example for direct login 
Issue #13510

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-21 13:52:42 +02:00
Maurício Meneghini Fauth
f650331a28 Merge pull request #13511 from mauriciofauth/classes 
Remove PMA namespace
 2017-07-21 08:31:51 -03:00
Maurício Meneghini Fauth
f0b1a7db18 Remove PMA namespace 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-07-21 08:15:34 -03:00
Maurício Meneghini Fauth
74b292a0d7 Add PhpMyAdmin\Tests namespace 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-07-21 08:10:34 -03:00
Maurício Meneghini Fauth
452bf6b2d0 Add PhpMyAdmin\Setup namespace 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-07-21 08:04:58 -03:00
Maurício Meneghini Fauth
570e826155 Move util.lib function into Util class 
Move PMA\Util\get function to PhpMyAdmin\Util::getValueByKey

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-07-21 08:04:58 -03:00
Weblate
f66a4d5ab7 Merge remote-tracking branch 'origin/master' 2017-07-21 11:46:35 +02:00
Guilherme Libardi
1228a4d338 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.9% (3211 of 3213 strings)

[CI skip]
 2017-07-21 11:46:33 +02:00
Michal Čihař
2ad6bf4824 Merge branch 'QA_4_7' 2017-07-21 11:46:17 +02:00
Michal Čihař
568381a96e Merge branch 'QA_4_7' 2017-07-21 11:45:56 +02:00
Michal Čihař
0231646e1f Merge commit '6e5e9264ece010e6e497d257d403e0c8df6cddf6' 2017-07-21 11:45:53 +02:00