gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,979 Commits 12 Branches 481 Tags 2.4 GiB
7f55065d71
Commit Graph

90979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
7f55065d71 Use correct port for testing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-27 12:04:37 +01:00
Michal Čihař
6fa5736a23 Set local flags only if needed 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-27 11:47:16 +01:00
Michal Čihař
9b8c943a50 Enable BrowserStack debugging 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-27 11:36:25 +01:00
Michal Čihař
c02dd60d70 Wait for load 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-27 11:36:25 +01:00
Michal Čihař
80126a115e Set build identifier for local builds 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-27 11:36:25 +01:00
Michal Čihař
474ab1ac17 Use hardcoded port 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-27 11:36:25 +01:00
Michal Čihař
d25fe6b5ec Set browserstack.local flag for Travis builds 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-27 11:36:25 +01:00
Michal Čihař
72580c4b9a Translated using Weblate (Czech) 
Currently translated at 100.0% (2770 of 2770)
 2014-03-27 11:10:27 +01:00
Michal Čihař
ced826dde3 Need locales for testing as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-27 11:07:50 +01:00
Michal Čihař
09eed1f8e9 Fix typo in method name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-27 10:14:08 +01:00
Weblate
892311234b Merge remote-tracking branch 'origin/master' 2014-03-27 09:50:46 +01:00
Giovanni Sora
7fa3ed63e8 Translated using Weblate (Interlingua) 
Currently translated at 44.6% (1238 of 2770)
 2014-03-27 09:50:42 +01:00
Michal Čihař
b53dd865b7 Workaround for Selenium tests with coverage 
The phpunit-selenium tries to set cookie just after opening Selenium
session, what fails (at least with Chrome) as the browser is currently
pointing to data: URL and not our application one. So we need to set URL
just as the Selenium session is opened.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-27 09:49:30 +01:00
Michal Čihař
5dd722d4c3 Revert "Try to open page in setUp." 
This reverts commit 37e58a8961.

It needs to be done with existing session.
 2014-03-27 09:47:08 +01:00
Michal Čihař
37e58a8961 Try to open page in setUp. 
This could workaround phpunit-selenium issue:
https://github.com/sebastianbergmann/phpunit-selenium/issues/295

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-27 09:27:13 +01:00
Burak Yavuz
1d1907ae27 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2770 of 2770)
 2014-03-27 07:32:22 +01:00
Matías Bellone
29b04a6d70 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2770 of 2770)
 2014-03-27 03:24:02 +01:00
Domen
75f67239d5 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2770 of 2770)
 2014-03-27 01:02:50 +01:00
Marc Delisle
2cfecbea95 Update po files 2014-03-26 17:07:47 -04:00
Marc Delisle
e0ebed0eb7 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-26 17:05:48 -04:00
Weblate
f186d07018 Merge remote-tracking branch 'origin/master' 2014-03-26 22:01:24 +01:00
Helder Santana
71afe129bb Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.5% (2751 of 2763)
 2014-03-26 22:01:21 +01:00
Marc Delisle
e4224bf18d Merge pull request #1095 from ashutoshdhundhara/favourite_tables_icon_only 
Feature request: #1476 Favorite tables select box.
 2014-03-26 17:01:18 -04:00
Panagiotis Papazoglou
a3c30eeeca Translated using Weblate (Greek) 
Currently translated at 100.0% (2762 of 2762)
 2014-03-26 19:27:45 +01:00
Ashutosh Dhundhara
8bc21b7876 Feature request: #1476 Favourite tables select box. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Changes in "create_tables.sql".

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Minor fix in structure.lib.php.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Ripped Trailing White spaces.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Removed irrelevant comments from "FavouriteTable.class.php".

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed Table Summary colspan.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Changed Favourite to Favorite

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed failing test.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Feature request: #1476 Favourite tables select box. (Icon only)

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Gray and Golden Icons.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Removed unwanted icon from "img".

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed error in PMA_buildActionTitles_test.php.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Re-positioned star icon and added tooltip to it.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Ripped trailing spaces from "structure.lib.php" and "db_structure.js".

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-03-26 23:37:19 +05:30
Michal Čihař
c3d43299ca Revert "Use long parameters for better readibility" 
This reverts commit 826482b4c6.

Long params unfortunately do not work with PHP 5.3.
 2014-03-26 18:04:02 +01:00
Marc Delisle
81345e9b53 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-26 12:39:52 -04:00
Michal Čihař
bebab9aa83 Update po files 2014-03-26 16:30:00 +01:00
Michal Čihař
fec8d4886c Allow failures in Selenium till it is debugged 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-26 16:29:29 +01:00
Michal Čihař
826482b4c6 Use long parameters for better readibility 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-26 16:27:04 +01:00
Michal Čihař
638f3be8af Correct call to free method 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-26 16:23:02 +01:00
Michal Čihař
d4e34e76bb No need to install coveralls for hhvm 
It does not work with it anyway.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-26 16:19:16 +01:00
Michal Čihař
c3633bef2f Use ant to build locales 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-26 16:17:35 +01:00
Michal Čihař
91fa25a1eb Prefer stable version of php-coveralls 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-26 16:04:17 +01:00
Michal Čihař
cec9ad430a No need to install ant, it's already in Travis 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-26 16:00:36 +01:00
Michal Čihař
3080cf8e32 Wrap long line 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-26 15:53:15 +01:00
Michal Čihař
abb0cb9262 Coding style cleanup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-26 15:52:08 +01:00
Michal Čihař
31d1edda9f We don't need full git history of runkit 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-26 15:43:48 +01:00
Michal Čihař
17c09354b5 Changelog entry 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-26 15:35:27 +01:00
Michal Čihař
01c75d95fb Merge pull request #1101 from maxday/1486-possibility-of-disabling-databases-expansion 
#1486 Possibility of disabling database expansion
 2014-03-26 15:34:05 +01:00
Michal Čihař
d15fd7a57b Run the server in background 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-26 15:30:45 +01:00
Michal Čihař
549c9af064 No more silencing of lint output 
It can cause timeout issue on Travis if run too long.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-26 15:28:58 +01:00
Michal Čihař
c61c8cc825 Do not run apt quiet, we want to see possible problems 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-26 15:24:23 +01:00
Maxime DAVID
a395d9474f #1486 Possibility of disabling database expansion + doc + integration 
Signed-off-by: Maxime DAVID <got2bex@gmail.com>
 2014-03-26 10:15:14 -04:00
Matías Bellone
74b8db8f68 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2761 of 2761)
 2014-03-26 15:00:12 +01:00
Weblate
7bfb7caed8 Merge remote-tracking branch 'origin/master' 2014-03-26 14:58:48 +01:00
Matías Bellone
59e7006c69 Translated using Weblate (Spanish) 
Currently translated at 99.9% (2760 of 2761)
 2014-03-26 14:58:45 +01:00
Giovanni Sora
48d9fed629 Translated using Weblate (Interlingua) 
Currently translated at 44.5% (1230 of 2761)
 2014-03-26 14:58:42 +01:00
Michal Čihař
578dc78624 Missing ; 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-26 14:58:35 +01:00
Michal Čihař
488129992d Initial attempt to integrate BrowserStack with Travis 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-26 14:52:03 +01:00