Commit Graph

188 Commits

Author SHA1 Message Date
Ann + J.M
b1a7039ae3 Convert PMA_URL_getCommon calls to new style
Rewritten tests need validation
Signed-Off-By: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
2014-10-18 19:42:29 +02:00
Hugues Peccatte
5985894160 Fix typos.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-07 00:31:45 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-06 10:44:03 +02:00
Marc Delisle
551099bc93 Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-23 07:34:11 -04:00
Ashutosh Dhundhara
35dab58bf5 RFE#1492: Remove the distinct query window.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-08-12 01:47:20 +05:30
Ashutosh Dhundhara
04d7be1b06 RFE#869: Run SQL query: Allow rollback for InnoDB tables.
Rollback support for other Transactional engines other than InnoDB.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-06-22 22:41:23 +05:30
Chirayu Chiripal
b527dc74a1 bugfix-4415,4453,4452,4451: Complete makeover of rfe-1518
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-06-13 23:56:24 +05:30
Michal Čihař
98034ba148 Remove $GLOBALS['cfg']['Bookmark'] variable
It makes it impossible to include bookmark library at any time as when
it is included before configuration is loaded it caches false result for
bookmarks support.

And anyway, using superglobals is always bad idea.

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-12 13:45:03 +02:00
Hugues Peccatte
22d3e26cba Minor PHPDoc and return update.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-06-09 15:20:22 +02:00
Marc Delisle
673fce8145 Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-03 12:33:25 -04:00
Michal Čihař
77caf6151b Correct punctuation for sentences
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-02 11:19:15 +01:00
Michal Čihař
f51823fb3c Merge commit '142b64581c882f866c99f897793b559b36869b3d' 2014-01-15 08:41:43 +01:00
Viduranga Wijesooriya
a526fa384a fixed #4229 Javascript error in SQL edit window
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
2014-01-15 08:37:54 +05:30
Madhura Jayaratne
6335b10574 Fix coding style
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-08 14:35:15 +05:30
Marc Delisle
2588725b02 Merge branch 'QA_4_1' 2013-12-16 12:57:36 -05:00
Archit Verma
f63a36fbf8 bug fix #4185; changed action to import.php
Signed-off-by: Archit Verma <architv07@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-16 12:54:09 -05:00
Marc Delisle
9e877e6eb0 Fix coding style 2013-11-24 07:20:17 -05:00
Umair Khan
5594ad5778 Fix code style 2013-11-14 13:59:04 +05:30
Umair Khan
8d331c1cc9 Bug Fix #4086 2013-11-14 13:53:14 +05:30
Hugues Peccatte
464ec23ad8 Huge PHPDoc update. 2013-11-10 23:04:58 +01:00
Madhura Jayaratne
f4704c6c46 Coding style fixes 2013-11-10 07:22:59 +05:30
Marc Delisle
9cec77d0e0 Adapt fix to 4.1 2013-11-02 21:26:58 -04:00
Marc Delisle
cfbf4b84b2 Merge commit '902e2bd' 2013-11-02 21:18:46 -04:00
Umair Khan
902e2bd0ad Bug Fix #4150 2013-11-02 20:59:35 +05:30
Madhura Jayaratne
531950b73a Fix duplicate IDs. Remove bookmark section when there are no bookmarks 2013-10-18 10:44:40 +05:30
xmujay
ea1f6f3750 refactor PMA_getHtmlForSqlQueryForm and fix code style 2013-08-20 21:36:58 +08:00
xmujay
e3e100f0c4 refactor the function name to PMA_getHtmlForSqlQueryFormBookmark 2013-08-18 18:13:59 +08:00
xmujay
eb47a21d85 fix code style 2013-08-18 17:34:59 +08:00
xmujay
13be797fd7 refactor PMA_getHtmlForSqlQueryFormInsert : render HTML at once 2013-08-18 17:27:15 +08:00
xmujay
bc9bb645b3 refactor PMA_sqlQueryFormBookmark: render HTML at once 2013-08-18 16:44:50 +08:00
xmujay
660ead3629 refactor PMA_sqlQueryFormUpload: render HTML at once 2013-08-18 16:32:36 +08:00
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00
Michal Čihař
d1bb142e87 Remove unused param from PMA_Util::showMySQLDocu 2013-08-07 08:48:50 +02:00
Michal Čihař
0e96f7a8af Always initialize variable 2013-08-06 13:49:20 +02:00
Michal Čihař
7a97781c23 Share code for checking whether to show icons 2013-07-30 14:54:21 +02:00
Michal Čihař
df3502e804 Another adding of comma to sentences 2013-07-12 15:54:18 +02:00
Michal Čihař
bebba32337 Merge remote-tracking branch 'origin/QA_4_0'
Conflicts:
	libraries/config.values.php
	libraries/sql_query_form.lib.php
	server_binlog.php
	server_databases.php
	tbl_structure.php
	test/classes/PMA_DisplayResults_test.php
2013-06-24 10:41:54 +02:00
Marc Delisle
d4d5a03766 Bug #3960 NavigationBarIconic config not honored 2013-06-21 10:00:41 -04:00
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Marc Delisle
d44367e4db Fix merge conflicts 2013-05-15 13:07:22 -04:00
J.M
529903e0dd Fix bug #3907 undefined variables, function parameter problems
Thanks Rasmus Lerdorf for analyzing!
2013-05-13 11:27:56 +02:00
Michal Čihař
051834dccd Remove spaces param from PMA_Kanji_encodingForm
We mostly don't indent code anyway now.
2013-05-10 10:00:05 +02:00
Michal Čihař
0c2832ca04 Consistent function naming in Kanji support module 2013-05-10 09:53:41 +02:00
Kasun Chathuranga
6b1f6ae046 Merge branch 'master' into DBI_naming_cleanUp
Conflicts:
	libraries/database_interface.lib.php
	libraries/db_table_exists.lib.php
	libraries/relation.lib.php
	libraries/rte/rte_triggers.lib.php
	libraries/schema/Dia_Relation_Schema.class.php
	libraries/schema/Visio_Relation_Schema.class.php
	tbl_addfield.php
2013-05-01 00:51:15 +05:30
Kasun Chathuranga
32e6c06324 PMA_DBI_get_columns --> PMA_DBI_getColumns 2013-04-30 23:36:47 +05:30
Michal Čihař
2fbb4cee0d Consistently include colon in strings to translate
In some languages this makes difference in translating, so it's better
to give translators full context.
2013-04-25 14:22:31 +02:00
Marc Delisle
ee09f98f73 Forgotten in refactoring 2013-04-14 19:21:35 -04:00
Marc Delisle
c33285daf2 Merge pull request #236 from xmujay/gsoc2013_6
[Refactor] function PMA_PMA_sqlQueryForm refactor:
2013-04-10 14:04:27 -07:00
Marc Delisle
8693167ea5 Improve readability 2013-04-10 13:14:44 -04:00
xmujay
1fa8851468 [Refactor] function PMA_PMA_sqlQueryForm refactor:
0.split long lines
1 render the HTML element at once
2013-04-10 22:50:45 +08:00