gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,926 Commits 12 Branches 481 Tags 2.4 GiB
85138a81df
Commit Graph

89926 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
85138a81df Merge remote-tracking branch 'origin/master' 2014-02-17 18:23:31 +01:00
Rodrigo Souza
7e40f35d55 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.3% (2559 of 2741)
 2014-02-17 18:23:28 +01:00
Michal Čihař
7f229a2813 Enable XSS Selenium test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 18:23:21 +01:00
Michal Čihař
dfcfca5188 Change browser name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 15:46:54 +01:00
Michal Čihař
072c56ab3d Set phpunit timeouts as well for Selenium tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 15:46:33 +01:00
Michal Čihař
038c42651c Try moving setup method 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 15:43:30 +01:00
Michal Čihař
310f861d5e Do not set browser version, let bs choose latest one 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 15:42:07 +01:00
Michal Čihař
2b4fc6942f Try different names for a browser 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 15:40:37 +01:00
Marc Delisle
90407afecd ChangeLog entry for new feature 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-17 09:25:05 -05:00
Marc Delisle
c80e3beda2 Merge pull request #945 from WhaleWatching/nav_hover_show_full 
New feature, Navigation hover show full name
 2014-02-17 09:22:59 -05:00
Michal Čihař
e86fb12375 Add BrowserStack freedom to choose platform for a browser 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 15:13:29 +01:00
Michal Čihař
69c4b7da8a Adjust set of browsers to test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 15:07:13 +01:00
Edward Cheng
bd863f6a62 Fix bug 
Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-02-17 22:04:11 +08:00
Michal Čihař
71950d72af Revert dev dependencies in composer.json 
We don't use Selenium on travis right now, so let's not install it
there.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 14:58:11 +01:00
Michal Čihař
e1f87486f2 Increase timeout for Selenium tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 14:57:06 +01:00
Michal Čihař
d119f60c52 Make base class abstract 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 14:54:26 +01:00
Michal Čihař
fa71aedd29 Drop not needed attribute 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 14:50:07 +01:00
Michal Čihař
3ff5993e11 This can be public; 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 14:46:52 +01:00
Michal Čihař
d4474b30a1 Correctly set base URL 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 14:43:57 +01:00
Michal Čihař
1e90554c00 This should be public 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 14:40:46 +01:00
Michal Čihař
5f70eb9319 Set browse url at the beginning 2014-02-17 14:37:33 +01:00
Michal Čihař
486be69e29 Hardcode settings for now 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 14:26:59 +01:00
Michal Čihař
f668722a11 Add webdriver dependencies 2014-02-17 14:20:07 +01:00
Michal Čihař
d8dbae9663 Use variables as constant can not contain array 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 14:09:51 +01:00
Michal Čihař
64c83aad7a Properly pass Browserstack keys 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 14:08:44 +01:00
Michal Čihař
19f012b175 Define variable elsewhere 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 14:06:50 +01:00
Michal Čihař
474802b947 Need to use define here 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 14:04:49 +01:00
Michal Čihař
bde484de57 Do not use two levels of helper objects for Selenium tests 
Just define base class for Selenium testing which includes all the magic
and others will inherit from it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 14:01:48 +01:00
Michal Čihař
5b93ccf150 Specify port for browserstack connection 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 13:44:06 +01:00
Michal Čihař
af0db9ffb0 Hardcoded browser setup for now 
The old code did not make much sense anyway as it did overwrite the
setting as many times as it was included.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 13:32:24 +01:00
Michal Čihař
b89988a4e9 Fix path to a file 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 13:30:04 +01:00
Michal Čihař
f790a2c7ed Remove not used line 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 13:23:27 +01:00
Michal Čihař
3a1a8e8bf8 Testing Selenium and BrowserStack integration 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 12:25:10 +01:00
Michal Čihař
778a641c34 Fix comments in testsuite setup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 12:05:49 +01:00
Michal Čihař
6922e3653a Reintroduce forgotten user config 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 12:02:48 +01:00
Michal Čihař
5f4988567e Move selenium configuration to test/bootstrap-dist.php 
This way it can be overridden from environment.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 11:58:44 +01:00
Michal Čihař
b9187f7a69 Document this section 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 11:58:44 +01:00
Michal Čihař
938ba599a5 Merge pull request #943 from jeffchan/fix-arraywalk 
Fix PMA_arrayWalkRecursive to ensure single pass thru keys
 2014-02-17 09:01:37 +01:00
Jeff Chan
896fe8169a Fix PMA_arrayWalkRecursive to ensure single pass thru keys 
Fix a bug with PMA_arrayWalkRecursive that causes it to apply a function
to its keys/values more than once. A previously incorrect test is fixed
as well.

The bug happens because when keys are modified, PHP's foreach loops
through the new keys again. This does not usually happen unless the
iterating array is passed through by reference (or has refcount=1).
See: http://stackoverflow.com/a/14854568/791890

Please see #936 for full explanation.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-02-17 03:09:34 +00:00
Marc Delisle
d20f0fee78 Merge branch 'QA_4_1' 2014-02-16 12:57:37 -05:00
Marc Delisle
06bd132d46 bug #4287 Printview - Always one column too much 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-16 12:57:01 -05:00
Marc Delisle
b79abc4f18 Merge branch 'QA_4_1' 2014-02-16 06:50:39 -05:00
Marc Delisle
273909b56b Merge commit '8d3e6df' 2014-02-16 06:50:32 -05:00
Marc Delisle
1029776df1 Merge commit 'ac80367' 2014-02-16 06:49:53 -05:00
Marc Delisle
8d3e6df816 Merge pull request #934 from sampathLiyanage/bugfix4286 
bug fix 4286
 2014-02-16 06:49:24 -05:00
Marc Delisle
eceef4155c ChangeLog entry for fix of bug #4286 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-16 06:48:01 -05:00
Weblate
1ef691f7d7 Merge remote-tracking branch 'origin/master' 2014-02-16 10:34:48 +01:00
Huang Zhiyi
90dce87a3d Translated using Weblate (Simplified Chinese) 
Currently translated at 89.0% (2442 of 2741)
 2014-02-16 10:34:46 +01:00
Michal Čihař
81a37ad810 Use https for l10n.cihar.com 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-16 10:34:38 +01:00
Yuki Shira
adf5f378f3 Translated using Weblate (Japanese) 
Currently translated at 89.6% (2465 of 2749)
 2014-02-16 02:03:25 +01:00