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

90586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
d73b9ef35d Merge pull request #1055 from jeffchan/up-test-time-limit 
Move slow tests in HHVM to group medium
 2014-03-13 09:18:33 +01:00
Michal Čihař
472d5df554 Revert "testing automated file uploading to remote server" 
This reverts commit d5dc579421.

Not yet supported in php selenium.
 2014-03-13 09:13:33 +01:00
Michal Čihař
d5f7ca0215 Use http for translation widget as GitHub does not trust CAcert 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-13 09:04:51 +01:00
Jeff Chan
0216a5a4a1 Move slow tests in HHVM to group medium 
These tests were failing on HHVM because of the default 3 second timeout.
Yes, HHVM is supposed to be faster, but there's a "warmup" time for scripts
in JIT mode (which is on by default). I suspect that's why they're failing.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-13 05:20:31 +00:00
Viduranga Wijesooriya
b5edca0b4c bug #4321 - updated the jquery datepicker addon library to 1.4 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-12 17:37:42 -04:00
Michal Čihař
7447bbab1a Merge pull request #1052 from mebjas/master 
testing automated file uploading to remote server
 2014-03-12 19:49:25 +01:00
minhaz
d5dc579421 testing automated file uploading to remote server 
Signed-off-by: A V Minhaz <minhazav@gmail.com>
 2014-03-13 00:11:08 +05:30
Michal Čihař
85597f7e13 Workaround another timing issue 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-12 15:04:21 +01:00
Atul Pratap Singh
e18450b128 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-03-13 00:49:23 +05:30
Atul Pratap Singh
c6e8c3bbb3 Merge branch 'QA_4_1' 2014-03-13 00:48:26 +05:30
Atul Pratap Singh
128cd96512 Merge commit '056b40b' 2014-03-13 00:48:11 +05:30
Atul Pratap Singh
8ca233d511 Fix bug#4324: Insert page datepicker not showing up 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-03-13 00:44:21 +05:30
Atul Pratap Singh
9b0e021c44 Fix bug#4316 Grid edit: can't change month on date fields 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-03-12 23:30:03 +05:30
Michal Čihař
bd2067fe08 Merge remote-tracking branch 'origin/QA_4_1' 2014-03-12 14:23:35 +01:00
Marc Delisle
427c4ef18c Merge pull request #1039 from WhaleWatching/fix_shadow 
Fix a little bug at main_pane_right box-shadow.
 2014-03-12 08:08:29 -04:00
Michal Čihař
25b58235b3 Merge pull request #1046 from jeffchan/fix-tests 
Import config to make unit tests friendlier to running independently
 2014-03-12 12:24:42 +01:00
Jeff Chan
3f0f634c38 Import config to make unit tests friendlier to running independently 
The HHVM test runner runs the unit tests in parallel. Currently some tests
fail because not all the dependencies are properly included.

This is similar to 607cb3b0b3

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-12 03:30:36 +00:00
Yungu Kim
056b40b0ae Translated using Weblate (Korean) 
Currently translated at 75.9% (2088 of 2749)
 2014-03-11 18:44:06 +01:00
Marc Delisle
5cc63d7b35 Credits for Hugues Peccatte 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-11 08:29:36 -04:00
Marc Delisle
8f2036cec3 Merge pull request #1041 from Tithugues/improveBookmarkedSearches 
Improve bookmarked searches
 2014-03-11 08:24:42 -04:00
Hugues Peccatte
34af4c4695 Remove hint about bookmarked searches. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-10 21:09:47 +01:00
Hugues Peccatte
ef8a1f6a05 Add new button to update a bookmarked search. 
Hide buttons when not needed.
Reset form when selecting 'New bookmark'.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-10 21:07:00 +01:00
Marc Delisle
b1c31dc4e3 Merge pull request #1037 from jeffchan/fix-tests 
Import dependencies to make unit tests friendlier to running independently
 2014-03-10 10:38:06 -04:00
Edward Cheng
c99581ed21 Signed-off-by: Edward Cheng <c4150221@gmail.com> 2014-03-10 20:06:39 +08:00
Edward Cheng
8439b1daa3 Fix little bug at main_pane_right box-shadow. 
Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-03-10 20:01:53 +08:00
Jeff Chan
607cb3b0b3 Import dependencies to make unit tests friendlier to running independently 
The HHVM test runner runs the unit tests in parallel. Currently some tests
fail because not all the dependencies are properly included.

This is similar to 659efe1a88

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-10 03:26:24 +00:00
Weblate
6748bb9a14 Merge remote-tracking branch 'origin/master' 2014-03-09 22:32:48 +01:00
Yungu Kim
67b5cada36 Translated using Weblate (Korean) 
Currently translated at 69.4% (1912 of 2752)
 2014-03-09 22:32:45 +01:00
Isaac Bennetch
46a7e90a36 Merge pull request #1026 from Dennis1993/patch-1 
Remove 1px border of server info
 2014-03-09 17:32:42 -04:00
Gyeongsu Han
598e88b826 Translated using Weblate (Korean) 
Currently translated at 69.1% (1903 of 2752)
 2014-03-09 15:40:45 +01:00
Tae-rok Hwang
c645004352 Translated using Weblate (Korean) 
Currently translated at 69.1% (1903 of 2752)
 2014-03-09 15:38:03 +01:00
Yungu Kim
16eda044f3 Translated using Weblate (Korean) 
Currently translated at 69.1% (1902 of 2752)
 2014-03-09 15:37:02 +01:00
Marc Delisle
af749a3409 Merge pull request #1035 from jeffchan/fix-database-interface-tests 
Import DatabaseInterface to make unit tests friendlier to running independently
 2014-03-09 07:47:56 -04:00
Marc Delisle
8e066c5105 Merge branch 'QA_4_1' 2014-03-09 07:41:14 -04:00
Marc Delisle
5fdb93de0a Fix comment 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-09 07:40:33 -04:00
Madhura Jayaratne
22ab13a1dc Merge branch 'QA_4_1' 2014-03-09 14:53:25 +05:30
Madhura Jayaratne
45606abccb bug #4278 reCaptcha re-login requires double effort 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-03-09 14:51:29 +05:30
Jeff Chan
659efe1a88 Import dependencies to make unit tests friendlier to running independently 
The HHVM test runner runs the unit tests in parallel. Currently some tests
fail because not all the dependencies are properly included.

This is similar to 840f7b1215

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-09 08:16:24 +00:00
Madhura Jayaratne
2512ffe513 Merge pull request #1034 from jeffchan/fix-export-tests 
Import export.lib.php to make unit tests friendlier to running independently
 2014-03-09 11:41:56 +05:30
Madhura Jayaratne
821fe48794 Merge pull request #1033 from jeffchan/remove-duplicate-include 
Remove duplicate include_once
 2014-03-09 11:41:45 +05:30
Madhura Jayaratne
44b1e8b8c0 Merge pull request #1032 from jeffchan/fix-tests 
Import gettext include to make unit tests friendlier to running independently
 2014-03-09 11:41:30 +05:30
Jeff Chan
4f241de077 Import export.lib.php to make unit tests friendlier to running independently 
The HHVM test runner runs the unit tests in parallel. Currently some tests
fail because not all the dependencies are properly included.

This is similar to 1d58392622

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-09 05:03:05 +00:00
Jeff Chan
6b0e7d6807 Remove duplicate include_once 
Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-09 04:55:55 +00:00
Jeff Chan
1d58392622 Import gettext include to make unit tests friendlier to running independently 
The HHVM test runner runs the unit tests parallelly. Currently some tests
fail because not all the dependencies are properly included.

This is similar to this commit 840f7b1215

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-09 04:24:51 +00:00
Marc Delisle
3253e4ee4b Merge branch 'QA_4_1' 2014-03-08 17:32:30 -05:00
Marc Delisle
8724d0e9bc Merge commit 'e8be063' 2014-03-08 17:32:24 -05:00
Marc Delisle
b0dfbb9256 Merge commit '32edccc' 2014-03-08 17:32:09 -05:00
Marc Delisle
e8be0639c0 Merge pull request #1020 from krtin/Bug_FIX#4301 
Bugfix4301
 2014-03-08 17:29:58 -05:00
Marc Delisle
eb7cb82b4a ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-08 17:29:37 -05:00
Marc Delisle
49d367b1cd Merge pull request #1027 from D-storm/changelog 
ChangeLog Entry
 2014-03-08 06:16:24 -05:00