Commit Graph

225 Commits

Author SHA1 Message Date
Madhura Jayaratne
c4a5af9182 Merge branch 'QA_3_5'
Conflicts:
	js/tbl_select.js
	po/da.po
	tbl_select.php
2012-08-06 22:04:02 +05:30
J.M
53f96bd760 bug #3546277 [core] Call to undefined function __() when config file has wrong permissions 2012-08-06 09:20:07 +02:00
Chanaka Indrajith
106265a7f8 Resolve conflicts 2012-06-30 11:30:39 +05:30
Chanaka Indrajith
74de5e3fd3 common.lib.php file renamed to CommonFunctions.class.php 2012-06-28 06:00:58 +05:30
Chanaka Indrajith
766466135e Implement class behavior of common.lib.php file 2012-06-22 23:38:33 +05:30
Alex Marin
415bd34b1c oop: change include locations for plugins 2012-06-22 19:13:33 +03:00
Alex Marin
65467e9c77 oop: AuthenticationCookie bug 2012-06-22 15:38:54 +03:00
Alex Marin
0565b0e12a oop: integrate authentication plugins 2012-06-22 11:43:54 +03:00
Michal Čihař
6fe86fc549 More clever URL rewriting with ForceSSL (bug #3510196) 2012-06-20 10:29:16 +02:00
Michal Čihař
d578bda100 Clarify code for ForceSSL
Conflicts:

	libraries/common.inc.php
2012-06-20 10:29:09 +02:00
Rouslan Placella
007b10e90a Moved lost global 2012-06-12 14:07:00 +01:00
Rouslan Placella
c7d835347c Force JSON response for AJAX requests 2012-06-11 14:06:04 +01:00
Rouslan Placella
796012fcc5 Completely drop footnotes and use tooltips instead 2012-06-11 14:06:04 +01:00
Rouslan Placella
f6bcab6425 Don't die before the Response class is instanciated 2012-06-11 14:06:04 +01:00
Rouslan Placella
6e12d1a088 Ensure that PMA_Response is instanciated in common.inc.php 2012-06-11 14:06:04 +01:00
Rouslan Placella
07c7b29f48 Fixes for disabling the response 2012-06-11 14:06:03 +01:00
Rouslan Placella
a5761291f7 Added PMA_Response class 2012-06-11 14:06:03 +01:00
Rouslan Placella
e7a698200d Added PMA_Footer and PMA_Footnotes classes 2012-06-11 14:06:03 +01:00
Rouslan Placella
da1e70e1fb Integrated authentication libraries with PMA_Header class 2012-06-11 14:06:03 +01:00
Rouslan Placella
4a740376c8 Dropped header.inc.php in favor of the PMA_Header class 2012-06-11 14:06:02 +01:00
Rouslan Placella
97449dae42 New classes PMA_Header and PMA_Scripts 2012-06-11 14:06:02 +01:00
Madhura Jayaratne
8649b8263c Fix function names: PMA_AddJSCode -> PMA_addJSCode 2012-05-25 22:45:21 +05:30
Rouslan Placella
933ad71021 Merged CSS stylesheets 2012-05-18 19:14:09 +01:00
Michal Čihař
54dc10a012 Use PMA_fatalError instead of die 2012-05-09 11:58:10 +02:00
Madhura Jayaratne
e2e2bc47e6 Coding style improvements. Mostly wrapping long lines 2012-05-01 16:20:42 +05:30
Michal Čihař
281faa1c01 Prepare for different Types class for MySQL/Drizzle 2012-04-26 10:20:02 +02:00
Michal Čihař
a2bf814f57 Add class for handling types 2012-04-25 15:14:19 +02:00
Madhura Jayaratne
4b8d52d937 Fix CheckStyle warnings, Type:CloseBracketNewLine (Closing parenthesis of a multi-line IF statement must be on a new line) 2012-04-22 21:28:41 +05:30
Rouslan Placella
ff66fdbdf9 Remove stray trailing whitespaces 2012-04-22 00:12:30 +01:00
Jo Michael
cf27d588fe Fix Notice in libraries\common.inc.php#819 Undefined index: collation_connection 2012-04-20 10:35:01 +02:00
Jo Michael
3d28ac3b9e Fix Notice in libraries\common.inc.php#819 Undefined index: collation_connection 2012-04-19 18:44:50 +02:00
Michal Čihař
55eaf86ca3 Move SSL URI generating logic to Config class 2012-04-19 14:19:26 +02:00
Michal Čihař
07445e89a3 More clever URL rewriting with ForceSSL (bug #3510196) 2012-04-19 14:06:47 +02:00
Michal Čihař
9b977fa280 Clarify code for ForceSSL 2012-04-19 14:03:13 +02:00
Willian Gustavo Veiga
fca5517ae6 Small typo: "JavaScript" instead of "Java script" 2012-04-13 22:08:25 -03:00
Marc Delisle
7fb054554c Put back jQuery 1.6.2 due to conflicts with Highcharts 2.1.5 (tried to upgrade Highcharts but faced other problems) 2012-04-10 18:08:58 -04:00
Marc Delisle
a3edbfc1b1 Add parameter to strDoYouReally message for better translatability
Include jquery.sprintf.js everywhere
2012-04-09 08:20:45 -04:00
Jo Michael
4521b28517 Use pma-bbcode for trigger_error messages 2012-04-08 21:09:31 +02:00
Jo Michael
b620322350 Fix theme test page 2012-04-08 19:00:40 +02:00
Marc Delisle
1fd405d20e Update to jQuery 1.7.2 2012-04-07 09:29:47 -04:00
Marc Delisle
ef95bce35b Final removal of grab_globals script 2012-03-27 13:04:46 -04:00
Jo Michael
9842f01444 Replaced HTML5-obsolete <tt> tags with <code> 2012-03-18 18:04:50 +01:00
Madhura Jayaratne
ed219b5446 Coding style improvements 2012-03-17 01:13:00 +05:30
Marc Delisle
ad7f2f283c Remove todo about timezone 2012-03-03 07:59:39 -05:00
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
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
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
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