Marc Delisle
|
f39d7c44e5
|
Merge branch 'QA_4_0'
|
2013-06-30 06:59:20 -04:00 |
|
Marc Delisle
|
08566b8175
|
Merge branch 'MAINT_4_0_4' into QA_4_0
|
2013-06-30 06:59:00 -04:00 |
|
Marc Delisle
|
e0c1ed02a1
|
4.0.4.1 release
|
2013-06-30 06:58:32 -04:00 |
|
Marc Delisle
|
a5ada0c89c
|
Merge commit '42d6983'
|
2013-06-30 06:43:22 -04:00 |
|
Marc Delisle
|
2d0fc58ced
|
Fix merge conflict
|
2013-06-30 06:43:08 -04:00 |
|
Marc Delisle
|
bc9efa7661
|
Merge commit 'a16600d'
|
2013-06-30 06:42:03 -04:00 |
|
Marc Delisle
|
fd111566c9
|
Fix merge conflict
|
2013-06-30 06:41:44 -04:00 |
|
Marc Delisle
|
d8b95988f4
|
Merge commit '443a604'
|
2013-06-30 06:40:35 -04:00 |
|
Weblate
|
cdb5fd8397
|
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
|
2013-06-30 12:39:48 +02:00 |
|
Aputsiaq Niels Janussen
|
ab6901a837
|
Translated using Weblate (Danish)
Currently translated at 100.0% (2607 of 2607)
|
2013-06-30 12:39:44 +02:00 |
|
Marc Delisle
|
42d6983d06
|
Fix merge conflict
|
2013-06-30 06:38:36 -04:00 |
|
Marc Delisle
|
43b75a7a4f
|
4.0.4.1 release date
|
2013-06-30 06:36:09 -04:00 |
|
Mehbooob Khan
|
a16600ddb8
|
Translated using Weblate (Urdu)
Currently translated at 25.9% (675 of 2607)
|
2013-06-30 12:22:04 +02:00 |
|
Marc Delisle
|
d2ea973105
|
Merge pull request #464 from xmujay/0624_server_variable
fix the syntax error
|
2013-06-29 12:09:03 -07:00 |
|
Aputsiaq Niels Janussen
|
42f053fc78
|
Translated using Weblate (Danish)
Currently translated at 100.0% (2673 of 2673)
|
2013-06-29 18:06:29 +02:00 |
|
xmujay
|
f5700a6137
|
fix the syntax error
|
2013-06-29 23:25:35 +08:00 |
|
Weblate
|
c424febdbb
|
Merge remote-tracking branch 'origin/master'
|
2013-06-29 14:38:55 +02:00 |
|
Marc Delisle
|
53dc747628
|
Translated using Weblate (Italian)
Currently translated at 88.9% (2376 of 2673)
|
2013-06-29 14:38:51 +02:00 |
|
Marc Delisle
|
b69520f8cb
|
Merge pull request #462 from xmujay/0624
fix the code style error for some server_view pages
|
2013-06-29 05:38:41 -07:00 |
|
xmujay
|
c8681dcc29
|
fix the code style error for some server_view pages
|
2013-06-29 16:58:30 +08:00 |
|
Marc Delisle
|
edfcac2e06
|
Merge commit '07a5ace'
|
2013-06-28 14:51:42 -04:00 |
|
Spun Nakandala
|
07a5ace900
|
bookmark creation error corrected
|
2013-06-28 23:48:40 +05:30 |
|
Marc Delisle
|
0124642684
|
[security] Global variables scope injection vulnerability (see PMASA-2013-7)
|
2013-06-28 13:09:13 -04:00 |
|
Spun Nakandala
|
2ecc1d3d69
|
the method name is straight forward
|
2013-06-28 22:26:26 +05:30 |
|
Spun Nakandala
|
fe5ae9f04f
|
not valid for current master
|
2013-06-28 22:23:55 +05:30 |
|
Spun Nakandala
|
9322cf4317
|
phpcs warnings and errors corrected
|
2013-06-28 21:44:03 +05:30 |
|
Spun Nakandala
|
70a58bcfd0
|
unwanted parameters removed
|
2013-06-28 20:19:50 +05:30 |
|
Spun Nakandala
|
7014a0fccb
|
parse error corrected
|
2013-06-28 20:18:28 +05:30 |
|
Marc Delisle
|
aa15e7a86b
|
This happens in unit testing; add temporary workaround
|
2013-06-28 08:40:11 -04:00 |
|
Weblate
|
d3a543616e
|
Merge remote-tracking branch 'origin/master'
|
2013-06-28 14:22:53 +02:00 |
|
Mehbooob Khan
|
1c3fab0ffe
|
Translated using Weblate (Urdu)
Currently translated at 25.1% (672 of 2673)
|
2013-06-28 14:22:48 +02:00 |
|
Marc Delisle
|
f55184e2ac
|
Merge commit 'c86d80b8c73dfc5c1d000fb864c91fb3f39ee05c'
|
2013-06-28 08:22:12 -04:00 |
|
Spun Nakandala
|
58657ab55f
|
every request will be ajax. Therefore else condition removed
|
2013-06-27 23:01:19 +05:30 |
|
Spun Nakandala
|
c86d80b8c7
|
irrelevant for current master. So removed.
|
2013-06-27 22:53:20 +05:30 |
|
Spun Nakandala
|
d1bbfdcf29
|
missing doc added
|
2013-06-27 22:51:01 +05:30 |
|
Spun Nakandala
|
8c40ba768c
|
removed unnecessary code
|
2013-06-27 22:44:25 +05:30 |
|
Spun Nakandala
|
d3e6df82d3
|
function renamed
|
2013-06-27 22:43:56 +05:30 |
|
Marc Delisle
|
becfb9fbc2
|
Merge pull request #461 from xmujay/0624
fix the code style of function definition
|
2013-06-27 09:21:23 -07:00 |
|
xmujay
|
1b70534892
|
fix code style warnings
|
2013-06-27 22:35:09 +08:00 |
|
xmujay
|
0ad6da277d
|
fix the code style of function definition
|
2013-06-27 22:01:19 +08:00 |
|
Spun Nakandala
|
5a2b0b2581
|
added method PMA_hasCurrentDBChanged
|
2013-06-27 19:29:10 +05:30 |
|
Spun Nakandala
|
e40d24f52f
|
created method PMA_getNumberOfRowsAffectedOrChanged
|
2013-06-27 19:18:50 +05:30 |
|
Tony Chen
|
443a604357
|
Translated using Weblate (Traditional Chinese)
Currently translated at 100.0% (2607 of 2607)
|
2013-06-27 12:22:05 +02:00 |
|
Spun Nakandala
|
67ff3aee1b
|
Added methods PMA_getDefaultSqlQueryForBrowse, PMA_goBackFurtherPage, PMA_handleQueryExecuteError, PMA_storeTheQueryAsBookmark, PMA_executeQueryAndStoreResults
|
2013-06-27 15:50:50 +05:30 |
|
Michal Čihař
|
8c04815355
|
Merge pull request #455 from adamgsoc2013/UT_pluginss
add test case for import SQL and CSV
|
2013-06-27 01:42:23 -07:00 |
|
Kyeong Su Shin
|
6c99ac1680
|
Translated using Weblate (Korean)
Currently translated at 69.9% (1822 of 2607)
|
2013-06-27 03:22:10 +02:00 |
|
Marc Delisle
|
78aae99698
|
Set UNIX-style end of lines
|
2013-06-26 13:08:40 -04:00 |
|
Marc Delisle
|
6734b64056
|
Add hints for the new relational view dropdowns
|
2013-06-26 13:03:28 -04:00 |
|
Marc Delisle
|
2b0b7be416
|
Merge pull request #453 from scnakandala/gsoc_bug_fixing
Refactoring SQL executor
|
2013-06-26 09:43:23 -07:00 |
|
Marc Delisle
|
f9416f1982
|
Merge pull request #457 from xmujay/0624
fix code style
|
2013-06-26 09:35:09 -07:00 |
|
