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

6380 Commits

Author SHA1 Message Date
Marc Delisle
1c872ed133 Typo 2011-10-05 12:56:33 -04:00
Madhura Jayaratne
0cacdc7fca Merge branch 'QA_3_4' 
Conflicts:
	libraries/navigation_header.inc.php
 2011-10-05 00:42:56 +05:30
Madhura Jayaratne
f7a31e5f4c bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false 2011-10-05 00:34:56 +05:30
Rouslan Placella
306901394e Fixed usage of undefined function PMA_getImage() in setup script 2011-10-04 19:51:02 +01:00
Marc Delisle
c25b7c8966 Merge branch 'QA_3_4' 2011-10-04 06:20:48 -04:00
Marc Delisle
bc5aa87ae9 Merge branch 'MAINT_3_4_6' into QA_3_4 2011-10-04 06:20:28 -04:00
Marc Delisle
1af420e223 [security] Fixed XSS in setup (verbose parameter) 2011-10-04 06:20:17 -04:00
Marc Delisle
73913f135e Use standard SQL terminology in format string 2011-10-04 05:49:20 -04:00
Marc Delisle
b939d1048e 3.4.7-dev is starting 2011-10-03 12:41:20 -04:00
Marc Delisle
46a1afb372 Preparing for 3.4.6-rc1 2011-10-03 12:34:18 -04:00
Piotr Przybylski
a1da3096a1 Pure CSS linear gradient for IE 10 and new syntax for linear gradient in Safari 5.1 and Chrome 10+ 
Added browser versions in comments
 2011-10-02 22:41:48 +02:00
Madhura Jayaratne
634220143b Valid starts 2011-10-02 08:12:24 +05:30
Madhura Jayaratne
44c15352ec Revert 5a6a74481a 2011-10-02 08:05:34 +05:30
Madhura Jayaratne
5a6a74481a For PMA_linkURL() applied URLs 2011-10-02 00:59:53 +05:30
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
e96b059dfa Merge branch 'QA_3_4' 2011-09-29 19:45:48 +05:30
Madhura Jayaratne
a9f2c38942 bug #3414744 [core] External link fails in 3.4.5 2011-09-29 19:43:28 +05:30
Marc Delisle
963f478fdd Fix merge conflicts 2011-09-29 07:12:57 -04:00
Marc Delisle
86138fa914 Merge branch 'QA_3_4' 2011-09-29 07:06:48 -04:00
Marc Delisle
acbbd8fc56 bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken 2011-09-29 06:41:06 -04:00
Marc Delisle
86722781eb A table has been dropped from outside phpMyAdmin 2011-09-29 06:19:03 -04:00
Marc Delisle
789ed0d3d1 A table has been dropped from outside phpMyAdmin 2011-09-29 06:08:30 -04:00
Madhura Jayaratne
192b534b95 bug #3356456 [interface] Interface problems for queries having LIMIT clauses 2011-09-28 15:30:13 +05:30
Madhura Jayaratne
0ad1a0f831 Fix doc blocks and multiline if statements 2011-09-27 21:49:41 +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
Marc Delisle
2dfc843711 We use SQL's terminology (columns and not fields) 2011-09-25 18:34:08 -04:00
Piotr Przybylski
55d72e8c71 Merge branch 'QA_3_4' 
Conflicts:
	pmd_general.php
 2011-09-25 17:35:07 +02:00
Piotr Przybylski
29a41fc991 "javascript:" is not needed here 2011-09-25 17:26:21 +02:00
Marc Delisle
480e77e77e Merge branch 'QA_3_4' 2011-09-24 06:18:00 -04:00
Marc Delisle
158ce0657a Undefined variables when no server has been selected and no default server is defined 2011-09-24 06:17:34 -04: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
3fc3194bce - Bug #3383572 Cannot execute saved query 
- Remove bookmark from the list after deletion (Ajax)
 2011-09-23 08:14:42 -04:00
Madhura Jayaratne
299da6d047 More style errors fixed 2011-09-23 11:36:14 +05:30
Madhura Jayaratne
21c5148d17 Style errors with class declarations 2011-09-23 11:24:06 +05:30
Madhura Jayaratne
13adb5adf7 Use lower case for true, false and null 2011-09-23 11:11:41 +05:30
Madhura Jayaratne
9bcb83af03 File is being conditionally included; use "include" instead 2011-09-23 10:56:30 +05:30
Madhura Jayaratne
e67a0a2531 Spaces between parameters in function calls 2011-09-23 08:43:41 +05:30
Dieter Adriaenssens
ac088aaee0 use include() instead of require() when including file conditionally 2011-09-23 00:46:58 +02:00
Madhura Jayaratne
f44ba87d59 Fix some doc blocks 2011-09-21 17:51:35 +05:30
Madhura Jayaratne
92a00cdbe6 Coding style improvements 2011-09-21 16:48:24 +05:30
Madhura Jayaratne
bd786ea7c2 Fix indentation for multiline function calls 2011-09-21 16:29:13 +05:30
Madhura Jayaratne
7446161738 Proper indentation for multiline if statements 2011-09-21 16:15:12 +05:30
Madhura Jayaratne
2e7a8c9eea better variable name 2011-09-21 12:18:49 +05:30
Madhura Jayaratne
379ad840d3 Fixing some undefined variables 2011-09-21 11:34:08 +05:30
Madhura Jayaratne
f1745c155d Drizzle does not support GIS data types. So no need to import ESRI shape files 2011-09-21 09:56:05 +05:30
Madhura Jayaratne
1fd6beb74f Drizzle does not have GIS data types 2011-09-21 08:49:55 +05:30
Piotr Przybylski
55d70a7fe1 This should be escaped 2011-09-20 13:02:54 +02:00
Madhura Jayaratne
95e6e0b447 Merge branch 'QA_3_4' 
Conflicts:
	libraries/display_tbl.lib.php
 2011-09-19 23:28:24 +05:30
Madhura Jayaratne
a211b8ba0e bug #3411224 [display] Broken binary column when 'Show binary contents' not set 2011-09-19 23:17:13 +05:30
Madhura Jayaratne
5cae094164 Merge branch 'QA_3_4' 2011-09-19 23:08:32 +05:30
Madhura Jayaratne
63d164ca99 bug #3411535 [display] Full text button unchecks results display options 2011-09-19 23:07:42 +05:30
Marc Delisle
5e83631469 Fix merge conflicts 2011-09-18 08:26:47 -04:00
Marc Delisle
6ac29b4791 bug #3383572 [interface] Cannot execute saved query 
When the Go button related to the "Run SQL query" section is pressed,
avoid transmitting the value of id_bookmark from the "Bookmarked SQL
query" section; otherwise import.php would think that it needs to
do a bookmark action instead of executing the query.
 2011-09-18 08:11:15 -04:00
Madhura Jayaratne
8373e5feec Removed redundant function 2011-09-18 16:59:03 +05:30
Marc Delisle
4441512052 Use newest message 2011-09-18 06:13:22 -04:00
Madhura Jayaratne
20ca1e471c bug #3410999 - Zoom search, problems with data editor 2011-09-18 11:54:59 +05:30
Rouslan Placella
dad70b66d9 Fixed broken retreival of triggers for a specific table 2011-09-17 15:54:27 +01:00
Madhura Jayaratne
5d3735b3b4 Merge branch 'QA_3_4' 2011-09-16 23:50:47 +05:30
Madhura Jayaratne
5511ae8fbc bug #3410604 [config] Configuration storage incorrect suggested table name 2011-09-16 23:45:36 +05:30
Madhura Jayaratne
65fff4483e No need to force text here 2011-09-15 23:10:18 +05:30
Marc Delisle
87c7d027ac Missing text next to these icons 2011-09-15 12:37:12 -04:00
Marc Delisle
47463352c4 Not field but column 2011-09-13 12:28:29 -04:00
Marc Delisle
003d879a64 Merge branch 'QA_3_4' 2011-09-11 06:51:29 -04:00
Marc Delisle
03a75ab9e0 bug #3399951 [export] Config for export compression not used 2011-09-11 06:51:09 -04:00
Madhura Jayaratne
dd0b1399e0 Coding style improvements for blobstreaming.lib.php 2011-09-10 22:59:47 +05:30
Madhura Jayaratne
ef86c8d879 Coding style improvements for Advisor.class.php 2011-09-10 22:36:58 +05:30
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
f1fbb2bb8c Merge branch 'QA_3_4' 2011-09-07 07:37:23 -04:00
Isaac Bennetch
0bdbde8c90 Patch #3404173 InnoDB comment display with tooltips/aliases 2011-09-07 07:36:00 -04:00
Dieter Adriaenssens
87459a5cf6 use include() instead of require() when including file conditionally 2011-09-06 22:04:51 +02:00
Dieter Adriaenssens
a30554b1e4 use require() instead of include() when including file unconditionally 2011-09-06 21:48:05 +02:00
Dieter Adriaenssens
94c6836f8b fix coding style : control structures 2011-09-05 14:28:17 +02:00
Marc Delisle
1b5461dc75 3.4.6-dev 2011-09-02 12:42:55 -04:00
Dieter Adriaenssens
9611e049c3 typos 2011-09-02 15:48:15 +02:00
Michal Čihař
1b8b7a9b93 This is not needed as well 2011-09-01 14:29:39 +02:00
Michal Čihař
46c5bfc01d Fix transformation without download 2011-09-01 14:29:03 +02:00
Michal Čihař
15f887a979 Avoid loading themes from non directories, . and .. 2011-08-31 08:07:47 -04:00
Michal Čihař
e077ad2797 Fix format string 2011-08-31 10:40:45 +02:00
Aris Feryanto
036d1a8397 Correctly show error message when unable to save UI property 2011-08-29 15:00:06 +08:00
Madhura Jayaratne
e79ffb99cd Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-27 23:04:20 +05:30
Madhura Jayaratne
08ec08059a Coding style improvements 2011-08-27 22:57:08 +05:30
Marc Delisle
85037b0d6a Missing choice for InitialSlidersState 2011-08-27 13:21:55 -04:00
Marc Delisle
a06d689598 Avoid duplicate ids 2011-08-26 12:47:20 -04:00
Dieter Adriaenssens
3d1813c66c fix coding style, whitespace cleanup, docblocks 2011-08-25 23:04:03 +02:00
Dieter Adriaenssens
946b82a1fb remove unused code 2011-08-25 22:41:40 +02:00
Dieter Adriaenssens
5c751cd1c0 make die() messages translatable, where possible 2011-08-25 22:38:51 +02:00
Dieter Adriaenssens
fd118e02d4 try indentation 2011-08-25 22:03:08 +02:00
Dieter Adriaenssens
a805121a22 fix DocCoding 2011-08-25 22:00:32 +02:00
Dieter Adriaenssens
fb5820487c try indentation 2011-08-25 21:44:04 +02:00
Piotr Przybylski
53f7ea521e PHPDoc 2011-08-25 13:20:50 +02:00
Piotr Przybylski
f45a79a651 Whitespace cleanup, code formatting 2011-08-25 13:16:28 +02:00
Piotr Przybylski
bd3b7d28d4 Whitespace cleanup 2011-08-25 13:16:06 +02:00
Michal Čihař
d3c7b0ea4d Adjust to new calling conventions 2011-08-25 08:56:59 +02:00
Michal Čihař
7fdc4aa2ce Fix syntax 2011-08-25 08:50:36 +02:00
Michal Čihař
016a210d6c Remove useless comment 2011-08-25 08:50:22 +02:00
Michal Čihař
ddfa57e1db Fix typo 2011-08-25 08:49:57 +02:00
Michal Čihař
347fca5b86 Use same order of database and table params as elsewhere 2011-08-25 08:49:31 +02:00
Piotr Przybylski
f678a45cd2 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/database_interface.lib.php
 2011-08-24 21:40:52 +02:00
Piotr Przybylski
e13aab1087 Condition excluding XML output from server export was broken 2011-08-24 21:34:08 +02:00
Piotr Przybylski
6bbf248350 Remove unused variable 2011-08-24 21:26:39 +02:00
Piotr Przybylski
5ab5afd506 Use PMA_Table::isView() instead of PMA_isView() 2011-08-24 21:16:04 +02:00
Piotr Przybylski
c12073871d Remove deprecated method PMA_Table::_isView() 2011-08-24 21:00:41 +02:00
Madhura Jayaratne
84f621b545 Sanitize filenames in a unified manner - more instances 2011-08-24 22:52:28 +05:30
Marc Delisle
4d2521ac91 Merge branch 'QA_3_4' 2011-08-24 12:30:15 -04:00
Marc Delisle
3b75f549f4 Merge branch 'MAINT_3_4_4' into QA_3_4 2011-08-24 12:29:30 -04:00
Piotr Przybylski
3e0af18434 Fix indentation broken by past merges 2011-08-24 13:24:21 +02:00
Piotr Przybylski
df4f5b7c96 Whitespace 2011-08-24 13:13:59 +02:00
Piotr Przybylski
b4f4a209c8 PMA_getServerType() - recognize Percona Server 2011-08-24 12:58:40 +02:00
Piotr Przybylski
710c7e2dd7 Print server_comment after server software version 2011-08-24 12:53:13 +02:00
Piotr Przybylski
f42b1d14dc PMA_DBI_fetch_single_row() shouldn't allow to set the $options argument 2011-08-24 12:12:04 +02:00
Madhura Jayaratne
b768e4de82 Typo 2011-08-24 10:06:23 +05:30
Madhura Jayaratne
136921c9cd Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-24 10:01:46 +05:30
Madhura Jayaratne
9b007f9920 Min-max calculation for polygons needs not consider inner rings 2011-08-24 09:40:08 +05:30
Piotr Przybylski
e7994a364e PMA_DBI_fetch_value() doesn't shouldn't allow to set the $options argument 2011-08-23 22:56:35 +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
92be06e6e9 Better comment 2011-08-23 22:25:14 +02:00
Piotr Przybylski
da6c5b7129 Inline PMA_DBI_get_default_engine(), this one-liner is used only once 2011-08-23 22:19:21 +02:00
Piotr Przybylski
57bea0630a Use PMA_DBI_get_table_indexes_sql() only when really needed, in all other cases use PMA_DBI_get_table_indexes() 2011-08-23 22:14:15 +02:00
Piotr Przybylski
a31b30ba57 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-23 21:56:33 +02:00
Madhura Jayaratne
b072a8d47c Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-23 19:37:07 +05:30
Madhura Jayaratne
b0465744fb Coding style improvements 2011-08-23 19:20:22 +05:30
Michal Čihař
b99420e2ae Remove some unused variables 2011-08-23 15:02:18 +02:00
Michal Čihař
4b83f0bc0d Clarify 2011-08-23 12:36:36 +02:00
Michal Čihař
1433b4c331 Fixed and simplified type detection on editing 
Fixes bug#3392824 and cleans up the code.
 2011-08-23 11:59:43 +02:00
Michal Čihař
93255067eb Clarify comment for translators, avoid duplicating message context 2011-08-23 10:37:31 +02:00
Aris Feryanto
de3ac00227 Fix printing JS arrays 2011-08-23 08:09:55 +02:00
Michal Čihař
9cda17487c Fix CSS rule 2011-08-22 15:56:01 +02:00
Michal Čihař
19ab72bf85 One place to generate CodeMirror CSS 2011-08-22 15:52:35 +02:00
Michal Čihař
e898b1ec19 Move theme helpers to theme class 2011-08-22 15:42:37 +02:00
Michal Čihař
85e778ffc8 Should not be called anymore 2011-08-22 15:36:54 +02:00
Michal Čihař
a0309eb384 Fix function name 2011-08-22 15:35:46 +02:00
Michal Čihař
d15abfb25b Fold PMA_ieFilter into PMA_css_Gradied 2011-08-22 15:35:32 +02:00
Piotr Przybylski
d2255fb9ae Merge remote-tracking branch 'origin/master' into drizzle 2011-08-22 15:19:50 +02:00
Michal Čihař
ccbefbb5ef Adjust calling convention, do not include # in color 2011-08-22 15:09:21 +02:00
Michal Čihař
5b8bb36168 Add forgotten file 2011-08-22 15:01:54 +02:00
Madhura Jayaratne
cc367fad58 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-22 15:01:26 +05:30
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
Michal Čihař
ef1fe35f37 Merge branch 'tyron' 2011-08-22 09:25:02 +02:00
Michal Čihař
f1b4c72e41 Revert "Fix: Monitor broken from a change by michal" 
This reverts commit 6f20ebf5cf.
 2011-08-22 09:24:53 +02:00
Michal Čihař
ef80b78991 Docblocks 2011-08-22 09:10:39 +02:00
Michal Čihař
863d8f2e52 Support for not escaped js code 2011-08-22 09:06:31 +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
Dieter Adriaenssens
e82d3c7136 require/include are statements not functions; no parentheses are required 2011-08-21 23:36:10 +02:00
Dieter Adriaenssens
0c6dbb530d coding style 2011-08-21 23:19:30 +02:00
Dieter Adriaenssens
20a6232173 remove unused code 2011-08-21 22:57:23 +02:00
Dieter Adriaenssens
2f1443c637 fix typo 2011-08-21 22:54:38 +02:00
Dieter Adriaenssens
ded7b7065c coding style, wrapping long lines 2011-08-21 22:53:43 +02:00
Madhura Jayaratne
4d77e95640 Coding style improvements for Svg_Relation_Schema 2011-08-22 00:44:51 +05:30
Tyron Madlener
6f20ebf5cf Fix: Monitor broken from a change by michal 2011-08-21 17:58:30 +03:00
Marc Delisle
0eb8f28a06 Merge commit '4f4ab7dc6951ad3537c9e3578cf0601effa4c688' 2011-08-21 07:32:39 -04:00
Ammar Yasir
4f4ab7dc69 Fixed: 'Browse foreign values' not working properly 2011-08-21 10:47:20 +05:30
Madhura Jayaratne
c052a0203b More instances of coding style violations in Eps_Relation_Schema 2011-08-21 00:47:29 +05:30
Madhura Jayaratne
efbbc52568 Coding style improvements for Pdf_Relation_Schema 2011-08-21 00:45:47 +05:30
Madhura Jayaratne
d5c3cbf42a Style improvements for Export_Relation_Schema 2011-08-20 23:38:22 +05:30
Tyron Madlener
5b5344dca7 Merge remote-tracking branch 'origin/master' 2011-08-20 20:33:24 +03:00
Piotr Przybylski
b0ed51d8cd Remove todo item 2011-08-20 13:51:06 +02:00
Tyron Madlener
08604d7f08 duplicate rule name 2011-08-20 14:18:53 +03:00
Madhura Jayaratne
249a1d5c8c Coding style improvements to Eps_Relation_Schema 2011-08-20 07:30:11 +05:30
Madhura Jayaratne
c5b108b716 Coding style improvements to Dia_Relation_Schema 2011-08-20 07:29:53 +05:30
Madhura Jayaratne
e3a3e26146 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-20 07:22:16 +05:30
Madhura Jayaratne
4db9c176b3 bug #3385954 - unknown table status:Create_time on dispalying view (again) 2011-08-20 07:19:17 +05:30
Piotr Przybylski
e5157838e5 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-20 01:03:11 +02:00
Piotr Przybylski
9b2570b0cf Advisor: mark that 'Rate of reading fixed position' may be wrong, requires further investigation 2011-08-20 00:59:11 +02:00
Piotr Przybylski
9be1bad63c Advisor: link to MySQL 5.5 documentation, it's better and more complete 2011-08-20 00:56:06 +02:00
Piotr Przybylski
dec6f85a06 Advisor: don't run 'MyISAM concurrent inserts' on Drizzle 2011-08-20 00:49:22 +02:00
Piotr Przybylski
41c18f6113 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/Table.class.php
	libraries/Tracker.class.php
 2011-08-20 00:48:40 +02:00
Piotr Przybylski
80daf34494 Advisor: properly handle concurrent_insert on MySQL 5.5.3 2011-08-20 00:43:51 +02:00
Piotr Przybylski
11cd7afc7b Advisor: add exceptions for Drizzle 2011-08-20 00:39:52 +02:00
Piotr Przybylski
5ce1db5f1a Advisor: add Com_* variables in Drizzle 2011-08-20 00:37:35 +02:00
Piotr Przybylski
e9158da818 Add MYSQLI_TYPE_VARCHAR to mysqli dbi (required for Drizzle) 2011-08-20 00:36:41 +02:00
Marc Delisle
7e814a711a Merge branch 'QA_3_4' 2011-08-19 16:17:25 -04:00
Marc Delisle
29b694c225 bug #3392920 [edit] BLOB emptied after editing another column 2011-08-19 16:16:51 -04:00
Madhura Jayaratne
c28c33c471 Coding style improvements 2011-08-19 23:38:42 +05:30
Madhura Jayaratne
855dc6e645 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-19 23:30:32 +05:30
Piotr Przybylski
38389841d7 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-19 19:37:34 +02:00
Madhura Jayaratne
6b0fb6c206 Code style improvements 2011-08-19 21:51:32 +05:30
Piotr Przybylski
941c186d27 Advisor: properly detect 64-bit builds of MySQL on Windows 2011-08-19 18:17:56 +02:00
Piotr Przybylski
c1f20fefd4 Make Advisor evaluation code easier to understand 2011-08-19 18:16:14 +02:00
Madhura Jayaratne
d5489c4432 Fix doc blocks and multi line if statements 2011-08-19 21:43:07 +05:30
Madhura Jayaratne
7b054e9b7d Fix doc blocks, multi line if statements, switch-case statements 2011-08-19 20:48:27 +05:30
Madhura Jayaratne
88db32fafd More coding style improvements 2011-08-19 20:31:44 +05:30
Madhura Jayaratne
388dfb0e5d Coding style improvements 2011-08-19 20:29:47 +05:30
Madhura Jayaratne
ca16dfb46f Coding style improvements 2011-08-19 20:05:48 +05:30
Madhura Jayaratne
878e78866c proper indentation for switch-case statements 2011-08-19 19:55:43 +05:30
Madhura Jayaratne
21510a093a Fix some doc blocks 2011-08-19 19:54:25 +05:30
Piotr Przybylski
0ca4a5f02e Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_search.php
	libraries/Table.class.php
	libraries/schema/Pdf_Relation_Schema.class.php
	libraries/schema/User_Schema.class.php
	libraries/tbl_select.lib.php
	server_status.php
	tbl_change.php
 2011-08-19 15:56:26 +02:00
Michal Čihař
a1c5e7f67a Move library to libraries 2011-08-19 12:21:55 +02:00
Madhura Jayaratne
1dba9c1836 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/tbl_select.lib.php
 2011-08-19 15:17:32 +05:30
Michal Čihař
cb9f7a2c26 Clarify code 2011-08-19 11:15:31 +02:00
Michal Čihař
a3f14bbd80 Fix indentation 2011-08-19 11:15:24 +02:00
Madhura Jayaratne
a05eb3ebcd Should return results when $propertiesIconic == true 2011-08-19 14:27:25 +05:30
Michal Čihař
381b593e59 Fix typecasting 2011-08-19 10:52:32 +02:00
Michal Čihař
c289045dcd Fix typo 2011-08-19 10:49:58 +02:00
Michal Čihař
fb1c4bd9ee Handle more types in js variable formatting 2011-08-19 10:43:08 +02:00
Michal Čihař
4b5ae952dd Function for setting variable 2011-08-19 10:36:22 +02:00
Michal Čihař
17f4b82821 Factor out code escaping from echo 2011-08-19 10:35:00 +02:00
Michal Čihař
d2df35108e Wrap some long lines 2011-08-19 10:33:13 +02:00
Madhura Jayaratne
c5b393665c More code style corrections 2011-08-19 13:36:28 +05:30
Michal Čihař
c4c445b0e9 Use PMA_DBI_get_columns instead of custom query 2011-08-19 09:20:23 +02:00
Michal Čihař
5209562dd3 Use PMA_DBI_get_columns instead of custom query 2011-08-19 09:18:27 +02:00
Michal Čihař
f66f8b7074 Use PMA_DBI_get_columns instead of custom query 2011-08-19 09:14:54 +02:00
Michal Čihař
f0babc56a3 Fix indentation 2011-08-19 09:11:06 +02:00
Michal Čihař
dd046f10b3 Fix typo 2011-08-19 09:11:01 +02:00
Michal Čihař
88ef580bd5 Use PMA_DBI_get_columns instead of custom query 2011-08-19 09:09:12 +02:00
Michal Čihař
ab166dd849 Remove some unused vars 2011-08-19 09:06:46 +02:00
Michal Čihař
ecb999e010 Remove some unused variables 2011-08-19 09:02:11 +02:00
Madhura Jayaratne
77b2b7627d Adhere to PEAR coding standards 2011-08-19 11:21:21 +05:30
Madhura Jayaratne
4f438c3317 Coding style corrections 2011-08-19 11:07:11 +05:30
Madhura Jayaratne
0741a53401 Remove tab characters 2011-08-19 10:44:33 +05:30
Madhura Jayaratne
2d4a4427ef Fix doc blocks 2011-08-19 10:42:57 +05:30
Madhura Jayaratne
46262835b6 Only non-empty search values should go into where clause 2011-08-19 10:03:35 +05:30
Piotr Przybylski
627e4133c3 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	themes/original/css/theme_right.css.php
 2011-08-17 22:47:20 +02:00
Piotr Przybylski
746f3566bb set_time_limit may fail, make it do so silently 2011-08-17 22:22:39 +02:00
Madhura Jayaratne
683a512c41 Wrap long lines. 2011-08-18 00:04:40 +05:30
Madhura Jayaratne
5f2a52153b Use include_once when included conditionally 2011-08-17 23:54:14 +05:30
Madhura Jayaratne
18f567a3f1 Correcting indentation for switch statements 2011-08-17 23:52:36 +05:30
Madhura Jayaratne
1a1833662f Wrap long lines 2011-08-17 23:48:19 +05:30
Piotr Przybylski
dd8116cc61 Two more fixes for Tracking in Drizzle 2011-08-17 17:01:11 +02:00
Piotr Przybylski
99f52e1edd A few missing fixes for Tracking 2011-08-17 16:50:00 +02:00
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
d501fc1fe6 Merge branch 'OpenGIS' 2011-08-17 18:02:25 +05:30
Marc Delisle
798e9c44bd Merge commit '4ce54e17340d4155fa4613ff3954c91ad76d55e9' 2011-08-17 07:53:07 -04:00
Michal Čihař
82c6f950eb Avoid loading themes from non directories, . and .. 2011-08-17 13:32:49 +02:00
Michal Čihař
4e94e3e35d Remove unused code 2011-08-17 13:26:46 +02:00
Michal Čihař
a1d6104502 Use Theme class for getting file name 2011-08-17 13:25:48 +02:00
Madhura Jayaratne
46722b8035 Merge branch 'master' into OpenGIS 2011-08-17 16:43:18 +05:30
Michal Čihař
576e76d419 Fix indentation 2011-08-17 12:31:33 +02:00
Michal Čihař
08967fec6a Make the string translatable 2011-08-17 12:31:04 +02:00
Michal Čihař
e89da7e7e4 Fix typo 2011-08-17 12:30:15 +02:00
Aris Feryanto
5e60aa8380 Fix merge conflict with origin/master 2011-08-17 13:41:38 +08:00
Aris Feryanto
88f3796f1e Grid edit: add datetimepicker support for date, datetime, and timestamp field 2011-08-17 13:12:31 +08:00
Dieter Adriaenssens
cbca775738 coding style and wrapping long lines 2011-08-17 00:09:17 +02:00
Piotr Przybylski
4073badee2 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-17 00:01:05 +02:00
Dieter Adriaenssens
d6ba069b01 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-16 22:40:30 +02:00
Dieter Adriaenssens
35b3595ec0 coding style and wrapping long lines 2011-08-16 22:39:46 +02:00
Piotr Przybylski
8c4530e338 Simplify code 2011-08-16 22:19:41 +02:00
Piotr Przybylski
6694352f0c Only PMA_DBI_fetch_assoc is needed here 2011-08-16 22:18:08 +02:00
Piotr Przybylski
726594645c Optimize tracking query, only the first row is needed 2011-08-16 22:17:23 +02:00
Piotr Przybylski
b7f3d86a41 Make tracking compatible with Drizzle 
Simulate SET type by bit flags
 2011-08-16 22:14:24 +02:00
Piotr Przybylski
701c957f40 Inline three one-line methods 2011-08-16 20:23:15 +02:00
Piotr Przybylski
e72036b4b1 No need to use PMA_DBI_get_table_indexes_sql() here, use PMA_DBI_get_table_indexes() 2011-08-16 20:02:23 +02:00
Piotr Przybylski
f578d0dadc Merge remote-tracking branch 'origin/master' into drizzle 2011-08-16 19:58:16 +02:00