gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,450 Commits 12 Branches 481 Tags 2.4 GiB
13bb477377
Commit Graph

96450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
13bb477377 Merge commit '2741f8b' 2014-12-05 10:10:42 -05:00
Madhura Jayaratne
d208ea0ed5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-12-05 20:05:39 +05:30
Madhura Jayaratne
1c78268a7b Update tests. Add meaningful values 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 20:03:40 +05:30
Madhura Jayaratne
692e0ae6ae Make pma_quick_warp a class 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 17:31:04 +05:30
Madhura Jayaratne
806178eca2 Upgrade GIS visualization page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 17:26:54 +05:30
Atul Pratap Singh
04248a22e2 Merge pull request #1411 from madhuracj/update 
jQuery upgrade
 2014-12-05 17:04:05 +05:30
Weblate
d1b487a845 Merge remote-tracking branch 'origin/master' 2014-12-05 12:18:50 +01:00
Igor
c1ed773280 Translated using Weblate (Ukrainian) 
Currently translated at 91.2% (2728 of 2991 strings)

[CI skip]
 2014-12-05 12:18:48 +01:00
Chirayu Chiripal
00c45a2346 merge branch origin/QA_4_3 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-12-05 16:47:24 +05:30
Weblate
2741f8be03 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-05 12:15:59 +01:00
Igor
be806c398c Translated using Weblate (Ukrainian) 
Currently translated at 91.3% (2720 of 2978 strings)

[CI skip]
 2014-12-05 12:15:57 +01:00
Chirayu Chiripal
b900a521de use function_exists for checking function existence 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-12-05 16:36:42 +05:30
Weblate
33175c25ca Merge remote-tracking branch 'origin/master' 2014-12-05 11:43:39 +01:00
Igor
b52605b4fd Translated using Weblate (Ukrainian) 
Currently translated at 90.7% (2713 of 2991 strings)

[CI skip]
 2014-12-05 11:43:37 +01:00
Chirayu Chiripal
9bbc3b7217 Merge branch 'QA_4_3' 2014-12-05 16:11:22 +05:30
Chirayu Chiripal
573f85f1bf Fix bug-4613 HHVM: method ob_gzhandler not found 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-12-05 16:05:48 +05:30
Michal Čihař
e92155b675 Check if set before using 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-05 10:49:38 +01:00
Michal Čihař
61fcf215e5 Detect failure of curl_init 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-05 10:20:13 +01:00
Michal Čihař
974295ac85 Silent warning from is_readable 
They emit warning in open_basedir mode.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-05 10:09:05 +01:00
Michal Čihař
f7c77ab667 Do not run lint with Selenium tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-05 09:37:50 +01:00
Michal Čihař
adfdafe58b The hhvm build should no longer fail 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-05 09:36:01 +01:00
Michal Čihař
e7a9575a02 Do not use multiline regexps here 
They don't seem to work reliable on hhvm.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-05 09:35:27 +01:00
Michal Čihař
e72dffbe4a Browserstack credentials are now stored in Travis environment vars 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-05 09:18:54 +01:00
Madhura Jayaratne
982a5bce73 Update jquery-ui to version 1.11.2 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 13:12:54 +05:30
Madhura Jayaratne
bb32f04183 Merge branch 'master' into update 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 08:19:43 +05:30
Madhura Jayaratne
80f4bb9782 Update jquery to version 1.11.1 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 08:09:02 +05:30
Weblate
a750a799d7 Merge remote-tracking branch 'origin/master' 2014-12-05 03:06:59 +01:00
Igor
c505d7f7de Translated using Weblate (Ukrainian) 
Currently translated at 90.6% (2712 of 2991 strings)

[CI skip]
 2014-12-05 03:06:56 +01:00
Ann + J.M
09a501d900 Translated using Weblate (German) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-12-05 03:06:53 +01:00
Madhura Jayaratne
49109dc2e5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-12-05 07:36:38 +05:30
Madhura Jayaratne
270b37c775 Merge branch 'QA_4_3' 2014-12-05 07:35:37 +05:30
Weblate
23507189d5 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-05 03:04:59 +01:00
Igor
e07d92920b Translated using Weblate (Ukrainian) 
Currently translated at 91.0% (2712 of 2978 strings)

[CI skip]
 2014-12-05 03:04:57 +01:00
Ann + J.M
1607167439 Translated using Weblate (German) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-12-05 03:04:54 +01:00
Madhura Jayaratne
e9e4faaeb4 bug #4618 Page scrolls while GIS visualization is zoomed in/out with mousewheel 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 07:34:42 +05:30
Marc Delisle
3062152abf Merge branch 'QA_4_3' 2014-12-04 14:02:48 -05:00
Marc Delisle
00db138a47 bug #4620 Undefined index while adding to the central columns list 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-04 14:01:52 -05:00
Michal Čihař
d5f3e7dda3 Fix path to BrowserStackLocak 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 17:00:26 +01:00
Michal Čihař
aca159e87d Another syntax error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 16:44:45 +01:00
Michal Čihař
a7eb3ea927 Allow failure for Selenium tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 16:39:22 +01:00
Michal Čihař
0fa659e3ad Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 16:37:23 +01:00
Michal Čihař
129007fc91 Switch Selenium tests to PHP 5.6 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 16:37:00 +01:00
Marc Delisle
7134242839 Merge branch 'QA_4_3' 2014-12-04 10:36:24 -05:00
Marc Delisle
3aa884ee36 Fix undefined index notice (fields) in PMA_getParamsForUpdateOrInsert() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-04 10:35:58 -05:00
Michal Čihař
c29e42627e Simplify BrowserStack testing setup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 16:33:16 +01:00
Michal Čihař
f9a9986b6d Fix syntax error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 16:13:49 +01:00
Michal Čihař
2e6614d453 Run clean as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 16:12:05 +01:00
Michal Čihař
f1d9ff99dc Start PHP from main script for selenium tests 
Otherwise the child script just hangs

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 16:07:15 +01:00
Michal Čihař
8602829473 Merge lint run into testsuite run 
It should be faster to run these in parallel, but given limited amount
of workers, it's better to do more work in single run. The run takes
longer, but overall time to run all tests is lower due to less waiting
for free worker.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 15:55:11 +01:00
Michal Čihař
88d2892f1e Supress success output from lint 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 15:52:47 +01:00