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

105373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
abfce82447 Fix test file names and test class names 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:39:15 +11:00
Madhura Jayaratne
b2e990a067 Fix class doc comments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:35:02 +11:00
Madhura Jayaratne
2a5f6acbee Class curly braces should be on the next line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:34:32 +11:00
Madhura Jayaratne
340861150a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-02-23 22:33:31 +11:00
Madhura Jayaratne
c7063d2517 Add class doc blocks 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 22:32:05 +11:00
Weblate
91fa913fdc Merge remote-tracking branch 'origin/master' 2016-02-23 10:00:37 +01:00
Domen
e2998b742f Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2016-02-23 10:00:36 +01:00
Madhura Jayaratne
f0bbe702ba Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-02-23 20:00:24 +11:00
Madhura Jayaratne
d1ac2a64a5 Fix #12017 Cannot easily select multiple tables when exporting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 19:58:18 +11:00
Kristjan Räts
fb7bea73f0 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2016-02-23 09:36:30 +01:00
Stefano Martinelli
b61c787e8f Translated using Weblate (Italian) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2016-02-22 22:10:38 +01:00
dingo thirteen
23b1337bdf Translated using Weblate (Dutch) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-22 20:18:21 +01:00
Burak Yavuz
ef34c811ad Translated using Weblate (Turkish) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-22 19:54:17 +01:00
Weblate
8fa667e7e3 Merge remote-tracking branch 'origin/master' 2016-02-22 16:10:53 +01:00
Giovanni Sora
4c2ff88de6 Translated using Weblate (Interlingua) 
Currently translated at 73.4% (2357 of 3208 strings)

[CI skip]
 2016-02-22 16:10:52 +01:00
Michal Čihař
8b518460fb Merge pull request #11996 from 007durgesh219/Issue#11989 
Issue#11989, #11988, #11990
 2016-02-22 16:10:46 +01:00
Παναγιώτης Παπάζογλου
c0e1c5bb52 Translated using Weblate (Greek) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2016-02-22 14:45:48 +01:00
Weblate
33807fdf1d Merge remote-tracking branch 'origin/master' 2016-02-22 14:44:20 +01:00
Παναγιώτης Παπάζογλου
da65ea02c8 Translated using Weblate (Greek) 
Currently translated at 99.9% (3205 of 3208 strings)

[CI skip]
 2016-02-22 14:44:17 +01:00
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
Durgesh
6650f7b07d Refactor text sanitization and javascript escaping, Issue #11989, #11988 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-22 14:45:19 +05:30
Durgesh
0b64827930 Refactored url parmeters generating, Issue #11990 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-22 14:36:41 +05:30
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