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

95764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yogeshwar Dan Charan
ee0d19069b Translated using Weblate (Hindi) 
Currently translated at 42.6% (1268 of 2976 strings)

[CI skip]
 2014-11-04 22:38:22 +01:00
Hugues Peccatte
74ece2e220 Remove PMA_String::strpos call. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-04 21:23:24 +01:00
Marc Delisle
3ecad07325 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-04 12:37:19 -05:00
Marc Delisle
f3e16baf53 Merge branch 'QA_4_2' 2014-11-04 12:35:53 -05:00
Marc Delisle
4360a174e5 bug ReferenceError: targeurl is not defined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-04 12:35:10 -05: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
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
Dieter Adriaenssens
3abf4138eb Translated using Weblate (Dutch) 
Currently translated at 100.0% (2976 of 2976 strings)

[CI skip]
 2014-11-04 17:38:37 +01:00
Michal Čihař
6b6e48fa8f Translated using Weblate (Persian) 
Currently translated at 28.6% (854 of 2976 strings)

[CI skip]
 2014-11-04 14:07:56 +01:00
Marc Delisle
69e49bac4a Translated using Weblate (French) 
Currently translated at 100.0% (2976 of 2976 strings)

[CI skip]
 2014-11-04 14:07:39 +01:00
Kristjan Räts
731294e338 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2976 of 2976 strings)

[CI skip]
 2014-11-04 13:55:15 +01:00
Weblate
6f49ec5cc1 Merge remote-tracking branch 'origin/master' 2014-11-04 12:13:31 +01:00
Madhura Jayaratne
5151958472 Improve coding style 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-04 16:46:17 +05:30
Madhura Jayaratne
b6487bdc50 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-11-04 16:41:19 +05:30
Weblate
1bbaa22107 Merge remote-tracking branch 'origin/master' 2014-11-04 12:08:49 +01:00
Michal Čihař
e7319abe97 Translated using Weblate (Persian) 
Currently translated at 28.6% (854 of 2976 strings)

[CI skip]
 2014-11-04 12:08:46 +01:00
Michal Čihař
b6b371e8bd Translated using Weblate (Czech) 
Currently translated at 94.7% (2821 of 2976 strings)

[CI skip]
 2014-11-04 12:08:44 +01:00
Madhura Jayaratne
aa99164cc8 Escape column type as well. Enums may contain arbitrary value 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-04 16:38:33 +05:30
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
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
Burak Yavuz
346b62740a Translated using Weblate (Turkish) 
Currently translated at 100.0% (2976 of 2976 strings)

[CI skip]
 2014-11-04 11:27:46 +01:00
Michal Čihař
3f8217141a Update po files 2014-11-04 10:48:14 +01:00
Michal Čihař
05f01d9c2a Split HTML markup from translatable string 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-04 10:47:50 +01:00
Madhura Jayaratne
a8866653ec Fix merge error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-04 14:29:49 -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