Commit Graph

915 Commits

Author SHA1 Message Date
Dieter Adriaenssens
84a237b117 escape variable output 2012-04-06 11:00:56 +02:00
Rouslan Placella
f15d0fd1d8 Removed most <noscript> tags and made JS mandatory to login 2012-04-05 22:58:57 +01:00
Jo Michael
5b09d0f066 Cleanup HTML5 validity issues 2012-04-01 20:14:50 +02:00
Jo Michael
570e7cdae8 Fixed spacing for inline edit link 2012-04-01 16:28:43 +02:00
Marc Delisle
5243abcd0d Merge branch 'QA_3_5' 2012-03-29 12:46:37 -04:00
Marc Delisle
ce341a0d4e bug #3511471 [interface] View name not seen in navi panel (MySQL 5.1) 2012-03-29 12:46:23 -04:00
Jo Michael
b9c474c21c Replaced *[align] with *[class] for HTML5 validity 2012-03-27 14:09:12 +02:00
Madhura Jayaratne
90b2d66317 Merge branch 'QA_3_5' 2012-03-26 22:16:35 +05:30
Madhura Jayaratne
54084929a5 bug #3510784 [edit] Limit clause ignored when sort order is remembered 2012-03-26 22:01:11 +05:30
Madhura Jayaratne
b531455738 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Conflicts:
	libraries/mult_submits.inc.php
2012-03-21 05:59:46 +05:30
Madhura Jayaratne
9f179dddc2 Coding style improvements - mostly doc comments 2012-03-21 05:45:12 +05:30
Marc Delisle
a196cbd85f Merge pull request #7 from mynetx/master
Various
2012-03-18 12:09:23 -07:00
Madhura Jayaratne
d5d3d2bba4 Use 'void' if nothing is returned 2012-03-18 10:04:39 +05:30
Jo Michael
891abb9f86 Merge branch 'master' of git://github.com/phpmyadmin/phpmyadmin 2012-03-17 16:32:07 +01:00
Jo Michael
3b56f6a53b Leading ./ paths for links and favicons can be omitted, part 1 2012-03-16 23:04:12 +01:00
Madhura Jayaratne
ed219b5446 Coding style improvements 2012-03-17 01:13:00 +05:30
Jo Michael
33d6b783a4 Added print button styling for pmahomme 2012-03-16 20:31:03 +01:00
Marc Delisle
4f91642969 Changelog entry; add spaces around operator 2012-02-28 12:41:38 -05:00
Alex Marin
4550b049c1 Patch #3495284 XML Import - fix message and redirect 2012-02-28 12:39:35 -05:00
Madhura Jayaratne
4145cf04ab Merge branch 'QA_3_5' 2012-02-19 21:36:34 +05:30
Madhura Jayaratne
3fadd41b41 Merge branch 'QA_3_4' into QA_3_5
Conflicts:
	libraries/common.lib.php
2012-02-19 21:32:16 +05:30
Madhura Jayaratne
6cec91e805 libraries/common.lib.php might have not been loaded by the time PMA_isSerializable() is called. 2012-02-19 21:22:36 +05:30
Madhura Jayaratne
6c9c571e1b Merge branch 'QA_3_5' 2012-02-18 17:28:22 +05:30
Madhura Jayaratne
ff11bfbe64 Merge branch 'QA_3_4' into QA_3_5
Conflicts:
	libraries/common.lib.php
2012-02-18 17:25:38 +05:30
Madhura Jayaratne
f9b2f08f21 bug #3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names in navigation 2012-02-18 17:17:01 +05:30
Madhura Jayaratne
b3a70fe352 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-02-18 15:27:05 +05:30
Madhura Jayaratne
e14b73d23e Merge branch 'QA_3_4' into QA_3_5
Conflicts:
	libraries/common.lib.php
2012-02-18 14:51:23 +05:30
Madhura Jayaratne
0d1407f178 bug #3486970 [import] Exception on XML import 2012-02-18 14:43:05 +05:30
Marc Delisle
87183ee0e1 Remove BLOBstreaming support; will need to run update-po after releasing version 3.5 2012-02-17 09:25:45 -05:00
Michal Čihař
9502e57c34 Whitespace cleanup 2011-12-16 15:35:35 +01:00
Rouslan Placella
628a0c6469 Speed up PMA_getImage() 2011-12-11 23:01:03 +00:00
Marc Delisle
6a786a859e Merge branch 'QA_3_4' 2011-12-05 14:14:26 -05:00
Marc Delisle
b02f4eec07 bug #3384035 [display] Problems regarding ShowTooltipAliasTB 2011-12-05 14:14:13 -05:00
Marc Delisle
96dd071a5f Fix merge conflicts 2011-11-24 16:54:25 -05: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
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ř
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ř
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