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

110485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
4f1ff6df85 Merge remote-tracking branch 'origin/QA_4_7' 2017-07-31 16:36:07 +02:00
Michal Čihař
33a545d4b4 Use case insentive comparison 
See #13531 and #13425

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-31 16:16:26 +02:00
Victor Gomez
601ed5db6e Alphabetic sorting of Export dropdown (#13531) 
Made the Export dropdown menu alphabetically sorted, related to this issue https://github.com/phpmyadmin/phpmyadmin/issues/13425

Signed-off-by: Victor Gomez <victor.gomez.spain@gmail.com>
 2017-07-31 15:28:22 +02:00
Michal Čihař
be2d9b7952 Merge pull request #13526 from devenbansod/fix_import_selenium 
Fix Import-related selenium tests
 2017-07-31 15:26:58 +02:00
Weblate
743adb8839 Merge remote-tracking branch 'origin/master' 2017-07-31 15:22:37 +02:00
Lalu-Ahirwar
7d2a8ab84d Translated using Weblate (Hindi) 
Currently translated at 37.1% (1194 of 3213 strings)

[CI skip]
 2017-07-31 15:22:33 +02:00
Michal Čihař
d36dd8a354 Merge pull request #13532 from CommanderRoot/patch-1 
Fix unnecessary escaping of html content
 2017-07-31 15:22:18 +02:00
Spider Linux
e3da40937c Translated using Weblate (Kurdish Sorani) 
Currently translated at 31.0% (995 of 3205 strings)

[CI skip]
 2017-07-30 03:46:08 +02:00
Spider Linux
0bab45855a Translated using Weblate (Kurdish Sorani) 
Currently translated at 30.8% (992 of 3213 strings)

[CI skip]
 2017-07-30 03:46:01 +02:00
Володимир Бриняк
1b71c5ba4b Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-07-29 12:47:36 +02:00
Володимир Бриняк
c919cb9236 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3213 of 3213 strings)

[CI skip]
 2017-07-29 12:47:28 +02:00
Spider Linux
d341e8fa74 Translated using Weblate (Kurdish Sorani) 
Currently translated at 30.8% (991 of 3213 strings)

[CI skip]

Ahmed Wolf
 2017-07-29 01:04:46 +02:00
ssantos
7fb297a292 Translated using Weblate (German) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-07-29 00:45:38 +02:00
ssantos
40b093ac91 Translated using Weblate (German) 
Currently translated at 100.0% (3213 of 3213 strings)

[CI skip]
 2017-07-29 00:45:20 +02:00
CommanderRoot
732c0c6cf2 Fix unnecessary escaping of html content 
Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
 2017-07-28 09:03:45 +02:00
ssantos
e57cc96029 Translated using Weblate (German) 
Currently translated at 100.0% (3213 of 3213 strings)

[CI skip]
 2017-07-28 00:21:06 +02:00
anonymous
88e28bbf3c Translated using Weblate (German) 
Currently translated at 99.9% (3212 of 3213 strings)

[CI skip]
 2017-07-28 00:17:58 +02:00
Tobias Groza
36bc01dbf1 Translated using Weblate (German) 
Currently translated at 99.9% (3212 of 3213 strings)

[CI skip]
 2017-07-28 00:16:58 +02:00
anonymous
c7433140f6 Translated using Weblate (German) 
Currently translated at 99.9% (3212 of 3213 strings)

[CI skip]
 2017-07-28 00:15:21 +02:00
ssantos
cec3a184ab Translated using Weblate (German) 
Currently translated at 99.9% (3212 of 3213 strings)

[CI skip]
 2017-07-28 00:14:12 +02:00
ssantos
0a9fa8b605 Translated using Weblate (German) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-07-27 23:56:34 +02:00
dingo thirteen
0ff5228e76 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-07-27 18:44:39 +02:00
Daniel Grønlund Johansen
3a5b4aab00 Translated using Weblate (Danish) 
Currently translated at 93.6% (3000 of 3205 strings)

[CI skip]
 2017-07-27 15:44:36 +02:00
Deven Bansod
8c247a17f8 Don't mark incomplete tests and skipped tests as Failed on browerstack 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-07-27 18:08:07 +05:30
Deven Bansod
65a4b3ca32 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2017-07-27 17:08:04 +05:30
Deven Bansod
88149373bb Mark failed selenium tests on Browerstack as failed 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-07-27 17:07:31 +05:30
Deven Bansod
7f830b1094 Prevent possible stale element error in tracking 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-07-27 17:07:22 +05:30
Maurício Meneghini Fauth
2afb9ab574 Merge pull request #13527 from mauriciofauth/templates 
Port some templates to Twig
 2017-07-26 17:48:05 -03:00
Maurício Meneghini Fauth
cc48840350 Port some templates to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-07-26 16:47:11 -03:00
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
dingo thirteen
bacf662985 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3213 of 3213 strings)

[CI skip]
 2017-07-26 16:16:29 +02:00
Weblate
b7d5910946 Merge remote-tracking branch 'origin/master' 2017-07-26 15:50:51 +02:00
Jørgen Thomsen
fa202cb566 Translated using Weblate (Danish) 
Currently translated at 93.0% (2990 of 3213 strings)

[CI skip]
 2017-07-26 15:50:47 +02:00
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
Володимир Бриняк
12e3a791d6 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-07-24 18:47:07 +02:00
worldwideskier
2c194f0b4b Translated using Weblate (Japanese) 
Currently translated at 69.9% (2242 of 3205 strings)

[CI skip]
 2017-07-24 09:45:42 +02:00
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