Commit Graph

877 Commits

Author SHA1 Message Date
Michal Čihař
3dc06f4f70 Unify print button code and factor it out to function 2011-10-24 14:13:47 +02:00
Madhura Jayaratne
84c1b79a08 Typo in comment 2011-10-10 07:32:16 +05:30
Madhura Jayaratne
39cd736648 When in 'show as php' mode, no need to have 'refresh'. 'Submit query' is there instead. 2011-10-10 07:31:35 +05:30
Marc Delisle
73913f135e Use standard SQL terminology in format string 2011-10-04 05:49:20 -04:00
Rouslan Placella
ef2e103adb Merge branch 'sprites' 2011-09-30 19:51:05 +01:00
Rouslan Placella
b8d454f851 Fixed unit tests 2011-09-30 16:44:06 +01:00
Madhura Jayaratne
192b534b95 bug #3356456 [interface] Interface problems for queries having LIMIT clauses 2011-09-28 15:30:13 +05:30
Rouslan Placella
d17814f463 Replaced use of hard coded images with the sprite-aware PMA_getImage() functions (both PHP and JS). 2011-09-26 20:54:59 +01:00
Rouslan Placella
1431d02c8f Made PMA aware of the presence of sprites + added a script for generating sprites from icons 2011-09-26 20:46:28 +01:00
Rouslan Placella
3cbc022058 Use the fallback in PMA_toggleButton(), if the theme is missing the graphics for it 2011-09-23 19:15:17 +01:00
Marc Delisle
7bbe78b049 With previous logic, could not change a BLOB column to specify its MIME type 2011-09-10 07:32:57 -04:00
Madhura Jayaratne
9d4e9efe4b Merge branch 'QA_3_4' 2011-09-10 08:47:35 +05:30
Madhura Jayaratne
7e7e55b953 bug #3404886 [navi] Edit SQL statement after error 2011-09-10 08:43:13 +05:30
Marc Delisle
a06d689598 Avoid duplicate ids 2011-08-26 12:47:20 -04:00
Piotr Przybylski
b4f4a209c8 PMA_getServerType() - recognize Percona Server 2011-08-24 12:58:40 +02:00
Piotr Przybylski
8cd8760256 Create PMA_is_system_schema() function which checks whether current database server treats it as a system schema 2011-08-23 22:48:14 +02:00
Piotr Przybylski
a31b30ba57 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-23 21:56:33 +02:00
Michal Čihař
4b83f0bc0d Clarify 2011-08-23 12:36:36 +02:00
Michal Čihař
93255067eb Clarify comment for translators, avoid duplicating message context 2011-08-23 10:37:31 +02:00
Piotr Przybylski
d2255fb9ae Merge remote-tracking branch 'origin/master' into drizzle 2011-08-22 15:19:50 +02:00
Madhura Jayaratne
966716ec68 More coding style improvements 2011-08-22 14:51:56 +05:30
Piotr Przybylski
1c2dbf0cbb Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/advisory_rules.txt
2011-08-22 11:18:26 +02:00
Madhura Jayaratne
adbdb71e60 Coding style improvements 2011-08-22 07:42:24 +05:30
Madhura Jayaratne
ea30c016c8 Opening braces should be on a new line 2011-08-22 07:30:29 +05:30
Madhura Jayaratne
c726d423fe Fix doc blocks 2011-08-22 07:28:37 +05:30
Madhura Jayaratne
05e78b2778 Proper coding style for multi line if statements 2011-08-22 06:46:39 +05:30
Piotr Przybylski
1aa438539a Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/common.lib.php
	libraries/config.default.php
	server_synchronize.php
2011-08-17 16:39:43 +02:00
Madhura Jayaratne
46722b8035 Merge branch 'master' into OpenGIS 2011-08-17 16:43:18 +05:30
Dieter Adriaenssens
35b3595ec0 coding style and wrapping long lines 2011-08-16 22:39:46 +02:00
Piotr Przybylski
a502f95af4 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-16 16:11:43 +02:00
Piotr Przybylski
f2842a22bf Fox comment 2011-08-16 14:35:02 +02:00
Madhura Jayaratne
7d7dd02e8c Merge branch 'master' into OpenGIS
Conflicts:
	tbl_select.php
2011-08-13 14:12:46 +05:30
Piotr Przybylski
a7c0c55c7f Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	js/server_status.js
	libraries/common.lib.php
	tbl_printview.php
	tbl_select.php
	tbl_structure.php
2011-08-12 22:02:40 +02:00
Michal Čihař
d374feb967 Add context to another potentionally unclear message 2011-08-11 09:32:42 +02:00
Aris Feryanto
a9cd487f0f Fix merge conflict with origin/master 2011-08-10 21:27:31 +08:00
Michal Čihař
c8c9b7501c Use pgettext for Next/Prev as it is needed for some translations (eg. Chinese) 2011-08-10 13:09:31 +02:00
Madhura Jayaratne
fa3e058e25 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-08-09 06:16:12 +05:30
Marc Delisle
630cdd9915 Missing docblock 2011-08-08 12:31:49 -04:00
Michal Čihař
90e7b75189 Fix indentation 2011-08-08 17:40:00 +02:00
Michal Čihař
9317162dcc Fix indentation 2011-08-08 17:39:19 +02:00
Michal Čihař
f7d85630ed Improve coding style 2011-08-08 17:38:26 +02:00
Michal Čihař
bc17e5eedd Fix indentation 2011-08-08 17:37:49 +02:00
Michal Čihař
617f6f5c24 Adjust switch blocks to PEAR coding standards 2011-08-08 17:36:16 +02:00
Michal Čihař
4b61ccb92e Reintroduce trailing \n 2011-08-08 16:23:14 +02:00
Michal Čihař
3803a1cde4 Single call of strtr instead of three str_replace 2011-08-08 16:20:37 +02:00
Michal Čihař
3d621fd3af Simplify replace logic 2011-08-08 16:19:05 +02:00
Michal Čihař
5379b55691 Coding style 2011-08-08 16:17:48 +02:00
Michal Čihař
c722d0d696 Simplify escape functions usint strtr 2011-08-08 16:16:47 +02:00
Michal Čihař
323026c0ea Use strtr instead of str_replace and array_keys/values combo 2011-08-08 16:15:24 +02:00
Michal Čihař
fcf2a7be85 Improve coding style 2011-08-08 16:12:11 +02:00