Commit Graph

84338 Commits

Author SHA1 Message Date
Marc Delisle
be37260b9b Update po files 2013-06-19 11:39:31 -04:00
Marc Delisle
a78df1b0eb Remove "Headers every x rows" from the Browse interface 2013-06-19 11:38:05 -04:00
Weblate
5afa6d4a30 Merge remote-tracking branch 'origin/master' 2013-06-19 16:35:26 +02:00
Tony Chen
2e0ddab195 Translated using Weblate (Traditional Chinese)
Currently translated at 85.6% (2287 of 2673)
2013-06-19 16:35:20 +02:00
Michal Čihař
b7622c7400 Merge remote-tracking branch 'origin/QA_4_0' 2013-06-19 16:35:06 +02:00
Michal Čihař
b6fe817707 Fix translation 2013-06-19 16:34:37 +02:00
Michal Čihař
192c96047f Translated using Weblate (Traditional Chinese)
Currently translated at 85.4% (2224 of 2603)
2013-06-19 16:21:43 +02:00
Weblate
9803ef4890 Merge remote-tracking branch 'origin/master' 2013-06-19 15:27:50 +02:00
Raimund Meyer
9865604cd8 Translated using Weblate (German)
Currently translated at 95.2% (2545 of 2673)
2013-06-19 15:27:47 +02:00
Marc Delisle
fa0af6fd28 Merge pull request #433 from scnakandala/gsoc_2013
Refactoring SQL executor
2013-06-19 06:27:36 -07:00
Spun Nakandala
93c2f414cd removed the redundant variable $bkm_user 2013-06-19 17:52:57 +05:30
Madhura Jayaratne
b34235328a Check whether file exists before reading 2013-06-19 14:00:49 +05:30
Michal Čihař
6e6e9048b9 Translated using Weblate (Traditional Chinese)
Currently translated at 85.4% (2284 of 2673)
2013-06-19 09:44:24 +02:00
Tony Chen
228a9b8421 Translated using Weblate (Traditional Chinese)
Currently translated at 85.4% (2224 of 2603)
2013-06-19 09:43:29 +02:00
Madhura Jayaratne
1edbc2cd3d Fix indentation, remove extra space 2013-06-19 13:00:04 +05:30
Madhura Jayaratne
f5755b5a2e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-19 12:52:35 +05:30
Madhura Jayaratne
472a6239a4 Rename PMA_filter_tracking -> PMA_filterTracking 2013-06-19 12:51:33 +05:30
Weblate
5ce7afdca4 Merge remote-tracking branch 'origin/master' 2013-06-19 09:16:46 +02:00
Tony Chen
4fd0c1962d Translated using Weblate (Traditional Chinese)
Currently translated at 85.4% (2284 of 2673)
2013-06-19 09:16:42 +02:00
Madhura Jayaratne
575513dc50 Fix indentation 2013-06-19 12:46:19 +05:30
Spun Nakandala
e3298a12d3 Error relating to the uninitialized variable $cfg corrected 2013-06-19 10:58:13 +05:30
Spun Nakandala
4bc178bbd2 USE database reloads the respective database 2013-06-18 23:07:47 +05:30
Marc Delisle
09e2cc1f01 Directly use the POST parameter 2013-06-18 08:25:14 -04:00
Weblate
726f647a34 Merge remote-tracking branch 'origin/master' 2013-06-18 14:07:16 +02:00
Yungu Kim
71c42ba66d Translated using Weblate (Korean)
Currently translated at 67.3% (1800 of 2675)
2013-06-18 14:07:12 +02:00
Madhura Jayaratne
4782d61fbf Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-18 17:36:49 +05:30
Madhura Jayaratne
9612ff150a Single click on relational link should lead to the foreign record 2013-06-18 17:36:08 +05:30
Michal Čihař
fd71b263e4 Merge pull request #430 from adamgsoc2013/UT_pluginss
XML import Test case: add doImport real case
2013-06-18 03:17:31 -07:00
adamgsoc2013
f8cc205285 using GLOBAL for code concurrency 2013-06-18 16:39:35 +08:00
adamgsoc2013
646329bdde using GLOBAL instead of global for code concurrency 2013-06-18 16:35:52 +08:00
Madhura Jayaratne
350b61bc10 update comment 2013-06-18 14:05:35 +05:30
Spun Nakandala
c1bd633a8a This bug is not relevant to the current master 2013-06-18 13:11:06 +05:30
adamgsoc2013
589f75976f change to assertion to import string but not all string since it will be changed frequently 2013-06-18 15:24:42 +08:00
adamgsoc2013
f4e230b180 add timezone setting for Text_Plain_Dateformat 2013-06-18 09:35:45 +08:00
Spun Nakandala
9d654bc172 PMA_getHtmlForBookmark method added to the sql.lib.php 2013-06-17 23:28:45 +05:30
Spun Nakandala
480f3062aa long if conditions transfered to the parser_analyzer.inc.php to initialize variables 2013-06-17 22:53:57 +05:30
Marc Delisle
7f8c7668c7 Merge branch 'QA_4_0' 2013-06-17 12:27:06 -04:00
Marc Delisle
5e9a436e39 4.0.4 release date 2013-06-17 12:26:42 -04:00
Marc Delisle
d28fbdcf92 Merge branch 'MAINT_4_0_4' into QA_4_0 2013-06-17 12:26:03 -04:00
Marc Delisle
64c2b9a59c 4.0.4 release 2013-06-17 12:25:41 -04:00
adamgsoc2013
cdfb0b890d fix the assertion due to PMA_IS_GD2 setting 2013-06-17 23:49:04 +08:00
adamgsoc2013
4b0abc1977 1. move test data to test_data dir
2. refactor the require_once
2013-06-17 23:35:07 +08:00
Marc Delisle
26bec29d1d Merge pull request #431 from xmujay/0609_monitor
refactor the Ajax request part of server_status_monitor.php
2013-06-17 07:23:12 -07:00
adamgsoc2013
e693108728 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into UT_pluginss 2013-06-17 22:14:15 +08:00
Michal Čihař
f4a9442ca3 Merge remote-tracking branch 'origin/QA_4_0' 2013-06-17 15:53:27 +02:00
Ádám Papp-Kuster
5f3960680e Translated using Weblate (Hungarian)
Currently translated at 79.2% (2062 of 2603)
2013-06-17 15:52:54 +02:00
Michal Čihař
8e16352b52 Translated using Weblate (Bosnian)
Currently translated at 18.7% (486 of 2603)
2013-06-17 15:52:52 +02:00
xmujay
e3a824cc7b 1. using a better function name 2. fix code style issue 3. add doc for functions 2013-06-17 21:43:13 +08:00
xmujay
8c000b4fee Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into 0609_monitor 2013-06-17 21:21:16 +08:00
Dieter Adriaenssens
87dbf5eb75 correctly indent parameter documentation 2013-06-17 15:14:55 +02:00