gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,744 Commits 12 Branches 481 Tags 2.4 GiB
5b2fff405f
Commit Graph

95744 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
5b2fff405f Merge branch 'QA_4_2' 
Conflicts:
	js/sql.js

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-04 13:48:02 -08:00
Madhura Jayaratne
e4d5503bcf bug #4577 Additional fix for table structure page. Multi submits can be inputs as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-04 13:31:51 -08:00
Madhura Jayaratne
4d16273018 Merge branch 'QA_4_2' 
Conflicts:
	js/sql.js

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-04 13:04:06 -08:00
Madhura Jayaratne
eef8565b73 bug #4577 Multi row actions cause full page reloads 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-04 13:00:03 -08:00
Hugues Peccatte
1390d133f6 Minor modifications. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-03 22:02:01 +01:00
Hugues Peccatte
68501a6b16 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-11-03 21:59:08 +01:00
Madhura Jayaratne
15646eb24f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-11-04 00:09:27 -08:00
Madhura Jayaratne
9d9b1f0ffb Update tests to the new default value of 'FirstLevelNavigationItems' config 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-04 00:08:24 -08:00
Madhura Jayaratne
3fc5da3e08 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-11-03 23:58:57 -08:00
Madhura Jayaratne
ea01a45eda Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-11-03 23:57:41 -08:00
Madhura Jayaratne
6df7ff8044 Set the default value of 'FirstLevelNavigationItems' configuration to a lower value to avoid too much databases from loading in the initial page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-03 23:55:26 -08:00
Madhura Jayaratne
69dee25e95 $singleItem is a boolean variable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-03 21:43:03 -08:00
Madhura Jayaratne
91b21184ba Use post params directly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-03 21:24:21 -08:00
Madhura Jayaratne
f65871c100 Success message for display column change. Update display column in the database only if it has changed from the original value. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-03 21:03:09 -08:00
Madhura Jayaratne
15a806824f Success message for internal relations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-03 20:18:09 -08:00
Madhura Jayaratne
a9d64610d2 Refactor getPresence() method into a set of smaller methods 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-03 19:03:37 -08:00
Madhura Jayaratne
0fc18eef29 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-11-03 18:44:10 -08:00
Madhura Jayaratne
3ce934faba Break gigantic getData() method into smaller methods 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-03 18:42:34 -08:00
Hugues Peccatte
2b4d6c955e Remove duplicated js function. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-03 21:57:55 +01:00
Hugues Peccatte
f15e658b56 Fix wrong test in ImportMediawiki. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-03 19:38:04 +01:00
Marc Delisle
15c13e613c Fix code execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-03 13:27:29 -05:00
Marc Delisle
43c0be8a84 Merge pull request #1386 from drainx/master 
Fix Status->All status variables to display correct suffix and formattin...
 2014-11-03 13:12:37 -05:00
Chanaka Dharmarathna
54a9d84a11 Remove duplicated condition and fixed phpcs error 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-11-03 22:58:17 +05:30
Michal Čihař
a73486da3d Add mising space 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-03 11:52:16 +01:00
Michal Čihař
e38969de53 Merge branch 'runkit' 2014-11-03 11:50:21 +01:00
Michal Čihař
a5337bf0ea Set timezone in PHP snippet 
There is no clean way to adjust HHVM settings from Travis, see
https://github.com/travis-ci/travis-ci/issues/2523

Caused by HHVM configuration no longer including timezone settings, see
https://github.com/travis-ci/travis-ci/issues/2812

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-03 10:40:43 +01:00
Michal Čihař
a42c4b9fab Revert "Configure timezone for Travis tests" 
This reverts commit 39a953fddd.
 2014-11-03 10:39:55 +01:00
Michal Čihař
00f45c7956 Revert "Split up Travis PHP config snippets" 
This reverts commit 6cd819a92e.
 2014-11-03 10:39:48 +01:00
Michal Čihař
11d92ad13e This patch works only for 5.6 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-03 10:34:44 +01:00
Michal Čihař
a0476824a9 Add runkit support for PHP 5.6 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-03 10:17:50 +01:00
Michal Čihař
6cd819a92e Split up Travis PHP config snippets 
We want to se timezone always, but runkit is available only for some
versions.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-03 10:13:36 +01:00
Weblate
bd399095ff Merge remote-tracking branch 'origin/master' 2014-11-03 10:11:53 +01:00
Dreezerd
baa51312f5 Translated using Weblate (English (United Kingdom)) 
Currently translated at 91.2% (2713 of 2973 strings)

[CI skip]
 2014-11-03 10:11:51 +01:00
Michal Čihař
39a953fddd Configure timezone for Travis tests 
Otherwise date related tests in HHVM fail.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-03 10:11:21 +01:00
Madhura Jayaratne
d4873d08d0 Merge pull request #1381 from madhuracj/Performance 
Minor performance improvements
 2014-11-03 07:23:23 +05:30
Madhura Jayaratne
79adf3d4b6 Fix test failures 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-03 07:00:28 +05:30
Perfectionist
ebcc6c62f2 Fix Status->All status variables to display correct suffix and formatting. 
Broken by f9cd1a1a22

Signed-off-by: Daniel Rix <drainx1@live.com>
 2014-11-02 19:23:53 -06:00
Atul Pratap Singh
3af9d58b81 Merge pull request #1385 from drainx/master 
Fix token error on Status menu items
 2014-11-03 05:15:53 +05:30
Madhura Jayaratne
88089a76a7 Merge branch 'master' into Performance 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-03 05:06:49 +05:30
drainx
ef224381ea Fix token error on Status menu items 
Remove a '?' missed from a540e6ba87

Signed-off-by: Daniel Rix <drainx1@live.com>
 2014-11-02 17:29:17 -06:00
Hugues Peccatte
42e0bdd47a Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 18:32:42 +01:00
Hugues Peccatte
eea3332acf Remove unused parameters. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 17:49:22 +01:00
Hugues Peccatte
dc4b7fc239 Minor test update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 16:07:12 +01:00
Hugues Peccatte
01ffac5f39 Refactor code in ImportMediawiki.class.php. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 15:18:06 +01:00
Hugues Peccatte
2b6833d87e Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-11-02 14:59:32 +01:00
Hugues Peccatte
026c31fab6 Fix PHPCS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:59:19 +01:00
Hugues Peccatte
5e7fa3b821 Remove unused local variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:52:20 +01:00
Chirayu Chiripal
b1510fc535 add HHVM travis builds to allowed failures (HHVM 3.3.0) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-11-02 19:16:20 +05:30
Hugues Peccatte
270b9e7a5d Add and update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:44:46 +01:00
Hugues Peccatte
fd7f02f929 Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:33:41 +01:00