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
Dieter Adriaenssens
e82584aaee coding style : use lower case constant false 2011-11-30 16:36:37 +01:00
Michal Čihař
e448774704 Improve description of MaxTableUiprefs 2011-11-30 14:17:39 +01:00
Dieter Adriaenssens
b4b9b34ec5 clarify function descriptions 2011-11-29 21:40:42 +01:00
Marc Delisle
3dce618b7b Merge branch 'QA_3_4' 2011-11-26 06:54:49 -05:00
Marc Delisle
5e61730157 bug #3438420 [core] Magic quotes removed in PHP 5.4 2011-11-26 06:54:40 -05:00
Marc Delisle
277b6a96fa Merge branch 'QA_3_4' 2011-11-26 06:17:16 -05:00
Marc Delisle
dddcddbf38 bug #3442004 [interface] DB suggestion not correct for user with underscore 2011-11-26 06:17:08 -05:00
Madhura Jayaratne
bbc44c410c Merge branch 'QA_3_4' 
Conflicts:
	ChangeLog
	Documentation.html
	README
	libraries/Config.class.php
	libraries/display_tbl.lib.php
 2011-11-25 18:25:13 +05:30
Madhura Jayaratne
9c278d020c bug #3442028 [edit] Inline editing enum fields with null shows no dropdown 2011-11-25 18:12:53 +05:30
Marc Delisle
c43babad7c 3.4.9-dev 2011-11-24 17:05:44 -05:00
Marc Delisle
96dd071a5f Fix merge conflicts 2011-11-24 16:54:25 -05:00
Dieter Adriaenssens
f62c4a1809 coding style : control structures 2011-11-24 15:32:30 +01:00
Dieter Adriaenssens
90bd76540c coding style : correct use of includeonce() 2011-11-24 14:47:45 +01:00
Dieter Adriaenssens
077c10020e [security] Self-XSS on invalid query (table overview), see PMASA-2011-18 2011-11-22 21:59:19 +01:00
Marc Delisle
b289fe0824 [security] Self-XSS on database names (Synchronize), see PMASA-2011-18 2011-11-21 17:53:10 -05:00
Marc Delisle
29e658a1f7 Merge branch 'QA_3_4' 2011-11-21 12:42:07 -05:00
Marc Delisle
e2b6af5a99 Avoid showing the password in phpinfo()'s output 2011-11-21 12:41:13 -05:00
Madhura Jayaratne
8fa909da78 Merge branch 'QA_3_4' 
Conflicts:
	libraries/server_synchronize.lib.php
 2011-11-20 22:33:02 +05:30
Madhura Jayaratne
81f6766f96 bug #3439292 [core] Fail to synchronize column with name of keyword 2011-11-20 22:18:55 +05:30
Madhura Jayaratne
b5c45d0d35 White space cleanup 2011-11-20 21:52:22 +05:30
Madhura Jayaratne
7d2718801e Coding style improvements 2011-11-20 18:30:56 +05:30
Rouslan Placella
46fbe36b6b Wrapped the "Indexes" and "Information" sections from tbl_structure.php in fieldsets 2011-11-19 14:43:52 +00:00
Rouslan Placella
f8e6631dfd "No index" or "duplicate indexes" on a column are not errors 2011-11-19 14:43:52 +00:00
Marc Delisle
c2a8246bc8 Merge branch 'QA_3_4' 2011-11-19 07:03:12 -05:00
Marc Delisle
8219f7c544 When ShowTooltipAliasTB is true, VIEW is wrongly shown as the view name in main panel db Structure page 2011-11-19 07:02:54 -05:00
Marc Delisle
584fa4d2c8 Merge branch 'QA_3_4' 2011-11-15 12:48:29 -05:00
Remi COLLET
ac430ea21d patch #3437354 [core] Notice: Array to string conversion in PHP 5.4 2011-11-15 12:47:28 -05:00
Marc Delisle
3142c0caf1 See bug #3418579. In commit f2fe4db5f1 
this global definition was removed, causing the bug.
 2011-11-12 11:00:37 -05:00
Marc Delisle
979209c4cc Code cleanup 2011-11-12 10:18:35 -05:00
Thomas Hergenhahn
7cd6894257 patch #3432835 [interface] Add useful intermediate pages to pageselector 2011-11-12 10:15:12 -05:00
Michal Čihař
c672292268 rfe #1632106 [interface] Improved error handling 2011-11-10 15:44:00 +01:00
Marc Delisle
839c0d493a Merge branch 'QA_3_4' 2011-11-10 09:00:13 -05:00
Marc Delisle
edea25b07b Merge branch 'MAINT_3_4_7' into QA_3_4 2011-11-10 08:56:39 -05:00
Michal Čihař
34d99de000 Disable XML loading plugins on old PHP 
When libxml_disable_entity_loader is not available, we can not guarantee
safe handling of XML data.
 2011-11-07 15:18:10 +01:00
Michal Čihař
f496bc9f1f Better error message 2011-11-07 15:16:47 +01:00
Michal Čihař
a5e206fbd2 Disable loading of external XML entities when loading XML 
Fixes CVE-2011-4107
 2011-11-07 14:47:54 +01:00
Rouslan Placella
a00fc340f9 Merge branch 'menubar' 2011-11-05 14:36:08 +00:00
Rouslan Placella
75a7e6f50b Generate the "floating_menubar" element in PHP to avoid firing it's JS handler in the navi frame 2011-11-05 14:05:13 +00:00
Marc Delisle
02d5799893 Fix merge conflicts 2011-11-05 10:00:50 -04:00
Robert Scheck
8170d03d3c Patch by Robert Scheck <robert@fedoraproject.org> 
for phpMyAdmin >= 3.4.7, which makes the php-gettext
library that is used configurable, which is helpful or even required for
some vendors or downstreams. The default is the internal library to keep
backward compatibility. More details can be found at SourceForge:
https://sourceforge.net/tracker/?func=detail&aid=3433770&group_id=23067&atid=377410
 2011-11-05 09:57:28 -04:00
Rouslan Placella
15b25f93e9 Fixed incorrect display of breadcrumbs in RTL mode 2011-11-04 14:43:25 +00:00
Marc Delisle
7ea269797d Typo 2011-11-02 15:29:12 -04:00
Marc Delisle
8d3bb76d26 Typo 2011-11-02 15:25:58 -04:00
Marc Delisle
4e2533f506 Typo 2011-11-02 15:17:48 -04:00
Marc Delisle
4c123bc560 Change to a similar message 2011-11-02 15:03:30 -04:00
Marc Delisle
0b16d690d2 Fix merge conflicts 2011-11-02 12:41:13 -04:00
Marc Delisle
d22fae4201 bug #3428065 [parser] TRUE not recognized by parser 2011-11-02 12:39:43 -04:00
Marc Delisle
00576dc1bb Fix merge conflicts 2011-10-31 12:36:45 -04:00
Marc Delisle
a691fce64c bug #3428627 [import] ODS import ignores memory limits 2011-10-31 12:35:02 -04:00
Marc Delisle
6f7ca79218 patch #3410688 [interface] Improving field size for character columns 2011-10-30 05:35:00 -04:00
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