gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,352 Commits 12 Branches 481 Tags 2.4 GiB
889a291927
Commit Graph

105352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
889a291927 Merge pull request #11978 from zixtor/master 
Resolve #11643 : Maintain filter states for db/table navigation filters
 2016-02-22 14:44:12 +01:00
Michal Čihař
943f404b36 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 14:23:19 +01:00
Michal Čihař
55fec136f7 Add back SQL parser messages to phpMyAdmin 
Temporary solution until we decide for something better.

See issue #12013

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 14:21:57 +01:00
Michal Čihař
c81561bac4 Avoid extracting translations from third party libraries 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 14:19:46 +01:00
Michal Čihař
aa077eee78 Merge pull request #11963 from Achilles-96/Issue-11865 
Fixes #11865 partially
 2016-02-22 13:00:55 +01:00
Achilles-96
4073e4676f Fixes #11865 partially-Added support for shortcuts 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2016-02-22 17:06:23 +05:30
Michal Čihař
6a46ea5684 Include tests in test coverage 
It helps to identify not executed test files.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 11:41:56 +01:00
Michal Čihař
b8c39d413d Do not try to run selenium tests if not told so 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 09:26:28 +01:00
Michal Čihař
d7bd3a8158 Fix typo in variable description 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 09:20:25 +01:00
Michal Čihař
2b93cf164b Do not try to run Selenium tests in normal tests run 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 09:06:34 +01:00
Michal Čihař
69ac841539 Cache pip cache 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:57:16 +01:00
Michal Čihař
25654522e7 Remove extra spacing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:46:29 +01:00
Michal Čihař
e4a5f6f8ca Changelog entry for switch to composer for PHP libraries 
Fixes #11962

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:30:29 +01:00
Michal Čihař
9a9586515b Merge branch 'composer' 2016-02-22 08:29:57 +01:00
Michal Čihař
97ab863db2 Changelog entry for MSIE code removal 
Fixes #11987

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:27:48 +01:00
Michal Čihař
a7ebe79d29 Merge remote-tracking branch 'origin/pull/11995' 2016-02-22 08:27:21 +01:00
Michal Čihař
cec39a3d77 Do not destroy gettext global variables 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
559e5a0f16 Remove no loger second loading of gettext 
We now load it very early.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
faa87a31c8 Load gettext earlier 
It's used by SQLParser, so it should be included before autloader.

See #11677

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
3a29e5cf64 Document installation from Git with composer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
930bade2fa Generate coverage reports for Selenium tests 
With PHP 7.0 it's no longer that huge penaly.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
ad9fd0bf15 Install some dependencies by apt instead of pip 
It seems to work faster (as we have to run apt anyway to get latest
git).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
f58b441415 Separate install phase per CI modes 
This allows us to install only needed components for each run.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
ebccbfda6f Rewrite Travis setup 
- run lint separately
- run selenium on PHP 7.0 (it's faster)
- avoid not needed steps for various ci modes

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
2424c41514 Create separate branch for ci tests 
Otherwise we're unable to test pull requests on Travis as they are not
on any branch.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
55042fbaec Install sphinx so that we can build docs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
6bfd40857b Add git-core repository for newer git 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
8cce648a74 Try installing newer git 
We need that for worktrees support.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
129b70af9c Use TRAVIS_BRANCH for setup testing if available 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
e7e5b6af45 Reduce number of lint runs in tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
0b9a65cead Use strings for PHP versions 
Otherwise it's converted to number in YML and can cause strange results
(PHP 7.0 becomes 7 and it doesn't properly compare).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
bbf2e43d67 Cleanup more files on release 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
b3fb278ba5 Better cleanup phpseclib from not needed files 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
e0c4eef9b6 Improve detection fo Config class filename 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
cb42d787eb Switch to correct captcha library 
The previous one was older from third party, we need to use current from
Google.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
d983803095 Strip composer packages of undeeded files 
We want to produce reasonable sized releases, so let's strip not needed
files.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
06849a8c40 Test creating release in Travis 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
aad35d7b22 Propagate test return code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
b622c2066d Add support for running testsuite on the release time 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
602568c132 Create release worktree even if same branch is already worked on 
Also prune stale work trees before creating new one.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
09904cc959 Add safeguard to require branch and version 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
33c5861f94 Improve parsing of option in create-release script 
It no longer depdends on order of specified parameters.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
39c04171f7 Remove cleanup for versions older than 3.5 
These are not supported for quite long time.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
debb613771 Remove support for old style documentation 
None of supported releases uses that.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
01f05b52b4 Use git worktrees for creating release 
This way we do not need to do the clone, just add another working tree.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
536dff321f Find out Config class name without doing checkout 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
974b9fe82c Do not generate coverage for composer packages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
f5d0da0f31 The class_exists uses autoloading no need to do it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
84e0dec552 Fix coding style 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
1aed866fdb Remove obsolete paths from exclusion 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00