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

96391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Michal Čihař
43bb8c11af Merge branch 'QA_4_3' 2014-12-04 13:18:45 +01:00
Michal Čihař
07c4e4cae4 Merge branch 'MAINT_4_3_0' into QA_4_3 2014-12-04 13:18:38 +01:00
Michal Čihař
dc81ab1b3b Merge branch 'QA_4_2' into MAINT_4_3_0 2014-12-04 13:18:28 +01:00
Michal Čihař
63c5e674cc Merge branch 'MAINT_4_2_13' into QA_4_2 2014-12-04 13:18:16 +01:00
Michal Čihař
996e7314a8 Cache composer cache 
Signed-off-by: Michal Čihař <michal@cihar.com>

Conflicts:
	.travis.yml

Conflicts:
	.travis.yml
 2014-12-04 13:18:06 +01:00
Michal Čihař
642e5795e2 Merge branch 'QA_4_3' 2014-12-04 10:48:51 +01:00
Michal Čihař
a649ebadc2 Merge branch 'MAINT_4_3_0' into QA_4_3 2014-12-04 10:48:32 +01:00
Michal Čihař
7ecdaa2fd2 Merge branch 'QA_4_2' into MAINT_4_3_0 
Conflicts:
	.travis.yml
 2014-12-04 10:48:25 +01:00
Michal Čihař
0bf779c61c Merge branch 'MAINT_4_2_13' into QA_4_2 2014-12-04 10:47:53 +01:00
Michal Čihař
e4a933de8f Do not let coveralls fail the build 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 10:47:46 +01:00
Michal Čihař
6e9e9cc472 Merge branch 'QA_4_3' 
Conflicts:
	scripts/generate-mo
 2014-12-04 10:34:33 +01:00
Michal Čihař
d19fe59438 Merge branch 'MAINT_4_3_0' into QA_4_3 2014-12-04 10:33:57 +01:00
Michal Čihař
7e4baefbf0 Merge branch 'QA_4_2' into MAINT_4_3_0 2014-12-04 10:33:48 +01:00
Michal Čihař
5bd1aca4aa Merge commit 'c2ad99da2bf166de7e114e1e129ee435c9e23756' into MAINT_4_3_0 2014-12-04 10:33:40 +01:00
Michal Čihař
779c318313 Merge commit '942f366e71605bb423d786523ad086396cf62afb' into MAINT_4_3_0 2014-12-04 10:33:06 +01:00
Michal Čihař
357bd55571 Merge commit 'e9e3998949adbacf82b90e9d2061bf56e609a373' into MAINT_4_3_0 2014-12-04 10:32:56 +01:00
Michal Čihař
67cade9d80 Merge commit '19802ca9f9cb12c3dd9034a0928f2c417bf91d30' into MAINT_4_3_0 2014-12-04 10:31:50 +01:00
Michal Čihař
c4ffccd6e2 Merge branch 'MAINT_4_2_13' into QA_4_2 2014-12-04 10:30:29 +01:00
Michal Čihař
f5a99f5a63 Improve locales compiling 
- return correct error code on failure
- try to compile all locales and report error for each failing
- color error messages

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 10:29:46 +01:00
Michal Čihař
c2ad99da2b Merge branch 'MAINT_4_2_13' into QA_4_2 2014-12-04 10:21:17 +01:00
Michal Čihař
7a41a4f325 Fix syntax errors in po files 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 10:21:11 +01:00
Michal Čihař
f8ed8422e6 Revert "Adjust plurals equation" 
This reverts commit 72d2741f37.
 2014-12-04 10:19:44 +01:00