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

96423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Michal Čihař
f8939546bd Do not cache runkit 
The improvement is not noticeable in this case, so let's always use
fresh copy.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 15:43:20 +01:00
Michal Čihař
f2047699be Show php log after tests are executed 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 15:39:45 +01:00
Michal Čihař
9b919bcca7 Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 15:25:47 +01:00
Marc Delisle
a5d9c59bae Merge branch 'QA_4_3' 2014-12-04 09:16:02 -05:00
Marc Delisle
bd2a8b501c Fix other undefined index notices in PMA_getDiagMessageForFeature() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-04 09:15:18 -05:00
Michal Čihař
5da00dc8fe Run PHP in background 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 15:01:58 +01:00
Michal Čihař
084458720d Fail on exit 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 14:57:22 +01:00
Michal Čihař
7dc3a76aae Fix runkit caching 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 14:57:22 +01:00
Marc Delisle
6596f1e5f7 Merge pull request #1413 from nisargjhaveri/dropdown_placeholder 
Better implementation of placeholder in dropdowns
 2014-12-04 08:55:07 -05:00
Madhura Jayaratne
987fa01013 Detect IE11 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-04 19:22:30 +05:30
Michal Čihař
d6559c9c57 Cache runkit build as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 14:52:18 +01:00
Michal Čihař
a4c2afaf45 Directly clone correct runkit version 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 14:47:57 +01:00
Michal Čihař
e3ddf2ddeb Cache browserstack download 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 14:45:29 +01:00
Madhura Jayaratne
61418078db $.browser is deprecated in jquery 1.9+ 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-04 19:03:15 +05:30
Michal Čihař
b4302373e6 Move browserstack setup to external script 
It makes it easier to manage and measure.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 14:23:27 +01:00
Michal Čihař
bceb08a204 Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 14:22:10 +01:00
Nisarg Jhaveri
9bfb7dd35b Better implementation of placeholder in dropdowns 
If something else is selected, show placeholder as disabled option.
Previously it was ignoring `$active_choice` if placeholder is given.

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2014-12-04 18:42:46 +05:30
Michal Čihař
2489caebd7 Move runkit installation to external script 
This makes easier to read .travis.yml and also allows us to measure time
it takes.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 14:06:09 +01:00
Michal Čihař
f07c5a4a0f Install ocular using composer instead of wget 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 14:03:48 +01:00
Madhura Jayaratne
478e781f1b Replace more instances of .live() and .die() with .on() and .off() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-04 18:33:37 +05:30
Michal Čihař
23c3a2d070 Simplify if statements 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 13:58:22 +01:00
Michal Čihař
1ae770ca1b Move composer setup to separate phase 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 13:56:13 +01:00
Michal Čihař
4927c4e914 Set environment in single place 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 13:55:54 +01:00
Madhura Jayaratne
0023d15cdb Merge branch 'master' into update 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-04 18:13:31 +05:30
Madhura Jayaratne
038ed2dc04 Update jquery-ui-timepicker-addon to version 1.5.0 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-04 18:01:02 +05:30
Madhura Jayaratne
eac0b0ff79 Update ba-hashchange for jquery 1.9+ since there are no new releases of ba-hashchange 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-04 17:52:58 +05:30
Michal Čihař
43bb8c11af Merge branch 'QA_4_3' 2014-12-04 13:18:45 +01:00