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
c380102816 Setup for controlhost 2011-10-29 08:24:11 -04:00
Marc Delisle
46ce1d765e Default values for controlhost 2011-10-29 08:07:44 -04:00
Marc Delisle
991cbfcc97 Provide for the case when controlhost is not defined 2011-10-29 07:58:40 -04:00
Marco Gergele
af8a61f73c patch #3428376 [pmadb] pmadb on a different MySQL server 2011-10-29 07:55:39 -04:00
Marc Delisle
21ebf72d9e Missing ending for documentation anchor 2011-10-27 15:27:58 -04:00
Rouslan Placella
1fd7a96135 Merge branch 'enum' 
Conflicts:
	enum_editor.php
 2011-10-26 16:29:10 +01:00
Rouslan Placella
f6d2da769b Integrated the ENUM/SET editor with the Routines editor 2011-10-26 16:26:15 +01:00
Rouslan Placella
93686fd47a Improved ENUM/SET editor 2011-10-26 16:01:24 +01:00
Michal Čihař
999e85b505 Coding style, documentation 2011-10-25 11:17:56 +02:00
Michal Čihař
b7c1742809 Coding style improvements, mostly in docblocks 2011-10-25 11:12:37 +02:00
Michal Čihař
e56949f160 Use package name PhpMyAdmin 
Needed to match phpdoc rules as package name must begin with upper case.
 2011-10-25 10:13:17 +02:00
Michal Čihař
c673bf42c5 Make messages look like sentences, avoid mentioning server type 2011-10-24 17:47:12 +02:00
Michal Čihař
833cfec332 Avoid message concatenation in this case 2011-10-24 17:43:17 +02:00
Michal Čihař
6d1bd82939 Factor out error message formatting 2011-10-24 17:42:07 +02:00
Michal Čihař
017ca0c22d Coding style improvements 2011-10-24 17:37:30 +02:00
Michal Čihař
97f89e63c4 Coding style improvements 2011-10-24 17:34:52 +02:00
Michal Čihař
bea61e9f48 Coding style 2011-10-24 17:28:18 +02:00
Michal Čihař
2c1970b48b Fix package 2011-10-24 17:25:16 +02:00
Michal Čihař
2518085d23 Wrap long line 2011-10-24 17:25:12 +02:00
Marc Delisle
cb19413253 Improve menu tab and page title 2011-10-24 09:50:39 -04:00
Michal Čihař
663958b564 Use same logic for printing SQL results as elsewhere 2011-10-24 14:17:02 +02:00
Michal Čihař
3dc06f4f70 Unify print button code and factor it out to function 2011-10-24 14:13:47 +02:00
Marc Delisle
a8a93c3e5a 3.4.7 2011-10-23 08:06:56 -04:00
Marc Delisle
a3132f6e91 3.4.8-dev 2011-10-19 16:58:10 -04:00
Marc Delisle
fd82f1d12c 3.4.7-rc1 2011-10-19 16:56:13 -04:00
Michal Čihař
88c5f90e53 Merge branch 'QA_3_4' 
Conflicts:
	libraries/core.lib.php
	libraries/sanitizing.lib.php
 2011-10-18 12:46:24 +02:00
Michal Čihař
8b9e7c1279 bug #3425184 [doc] Fix links to PHP documentation 2011-10-18 12:44:32 +02:00
Michal Čihař
246b37937b PMA_linkURL can be used from fatal errors early in execution, where library is not yet loaded 2011-10-18 12:42:05 +02:00
Michal Čihař
75d1dce908 PMA_getPHPDocLink can be used from fatal errors early in execution, where gettext is not yet loaded 2011-10-18 12:41:42 +02:00
Michal Čihař
3535dcfec3 Merge remote-tracking branch 'origin/QA_3_4' 2011-10-18 11:53:40 +02:00
Michal Čihař
3fa0b1f639 [core] Allow to set language in URL 2011-10-18 11:51:24 +02:00
Marc Delisle
4336ffca2b As suggested by Tyron Madlener: 
Display the input field for the default value only after "As defined:"
is selected, and also focus it automatically once it's selected so the user
can type immediately
 2011-10-16 09:10:48 -04:00
Madhura Jayaratne
a478b8164d bug #3299486 [prettyprint] Order By in a query containing comment character 2011-10-15 16:23:31 +05:30
Madhura Jayaratne
77ad710d08 bug #3423725 [pdf] Broken PDF file when exporting database to PDF 2011-10-14 20:17:25 +05:30
Rouslan Placella
e03dcf7669 Removed some unused variables 2011-10-13 22:06:52 +01:00
Marc Delisle
281faff4b2 As suggested by Michal 2011-10-13 12:59:59 -04:00
Piotr Przybylski
4a5cb00df5 Fix jQuery UI version number 
It's 1.8.16, not 1.8.6
 2011-10-11 02:00:45 +02:00
Piotr Przybylski
ac365e0262 Upgrade jQuery UI to 1.8.6 2011-10-10 22:35:36 +02:00
Marc Delisle
328defc9d9 bug [view] View renaming did not work 2011-10-10 07:25:52 -04:00
Marc Delisle
6fec80c614 bug [view] View renaming did not work 2011-10-10 07:16:30 -04: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
Madhura Jayaratne
eef315c635 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-10-08 17:27:26 +05:30
Marc Delisle
d1aa3e3b02 [interface] Remove DefaultPropDisplay feature 2011-10-08 06:40:10 -04:00
Madhura Jayaratne
bf4b95dafe Little bit more width for tables 2011-10-08 14:33:39 +05:30
Madhura Jayaratne
f06e8ee9fc Merge branch 'QA_3_4' 
Conflicts:
	libraries/schema/Pdf_Relation_Schema.class.php
	libraries/schema/User_Schema.class.php
 2011-10-08 14:26:48 +05:30
Madhura Jayaratne
329c9cac68 Avoid warnings on undefined variables 2011-10-08 14:15:17 +05:30
Madhura Jayaratne
55f2d0726b Typo 2011-10-08 14:14:13 +05:30
Marc Delisle
c64ac7291e Typos 2011-10-07 07:57:30 -04:00
Marc Delisle
66036d00d4 - Simplify message for table creation 
- Remove link to the current database; it did not provided added value
 2011-10-07 07:35:05 -04:00
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