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

184 Commits

Author SHA1 Message Date
J.M
53f96bd760 bug #3546277 [core] Call to undefined function __() when config file has wrong permissions 2012-08-06 09:20:07 +02: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
Jo Michael
3d28ac3b9e Fix Notice in libraries\common.inc.php#819 Undefined index: collation_connection 2012-04-19 18:44:50 +02: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
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
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
Dieter Adriaenssens
87459a5cf6 use include() instead of require() when including file conditionally 2011-09-06 22:04:51 +02:00
Dieter Adriaenssens
94c6836f8b fix coding style : control structures 2011-09-05 14:28:17 +02:00
Dieter Adriaenssens
5c751cd1c0 make die() messages translatable, where possible 2011-08-25 22:38:51 +02:00
Piotr Przybylski
92be06e6e9 Better comment 2011-08-23 22:25:14 +02:00
Piotr Przybylski
a7c0c55c7f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	libraries/common.lib.php
	tbl_printview.php
	tbl_select.php
	tbl_structure.php
 2011-08-12 22:02:40 +02:00
Ammar Yasir
57af6f9502 Merge remote branch 'phpmyadmin/master' 
Conflicts:
	js/tbl_select.js
 2011-08-12 00:10:17 +05:30
Michal Čihař
0829162550 Merge remote-tracking branch 'tyron/master' into integration 
Conflicts:
	js/functions.js
 2011-08-11 11:25:18 +02:00
Aris Feryanto
a9cd487f0f Fix merge conflict with origin/master 2011-08-10 21:27:31 +08:00
Tyron Madlener
82a1f9c033 addded PMA_AddJSCode() to load js code into the page header 2011-08-09 10:35:53 +03:00
Aris Feryanto
ca0aa169c0 Fix merge conflict with grid branch 2011-08-08 15:48:51 +08:00
Aris Feryanto
ba7913a260 Remove inline edit feature 2011-08-08 14:07:59 +08:00
Ammar Yasir
33ad955596 Merge remote branch 'phpmyadmin/master' 2011-08-07 10:55:41 +05:30
Piotr Przybylski
7f1fa1bab0 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	libraries/database_interface.lib.php
	libraries/mysql_charsets.lib.php
 2011-08-05 17:17:47 +02:00
Michal Čihař
4afb63d08f Upgrade to jQuery 1.6.2 
This should be compatible with 1.6.1 and my tests show no problems.
 2011-08-05 15:31:38 +02:00
Aris Feryanto
376cc353dc Recent table: fix bug - not work for db or table name containing custom characters 2011-08-04 18:27:37 +08:00
Ammar Yasir
32969f3d42 Merge remote branch 'phpmyadmin/master' 2011-07-31 07:14:01 +05:30
Piotr Przybylski
0eca09ffff Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/dbi/mysqli.dbi.lib.php
 2011-07-27 20:10:38 +02:00
Piotr Przybylski
69ac509584 This should be checked in common, not in dbi library 2011-07-27 19:59:48 +02:00
Ammar Yasir
95ea722d73 Fixed redirection issue on tbl_zoom_select.php page 2011-07-22 17:51:53 +05:30
Piotr Przybylski
3586bb992f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_structure.php
	libraries/database_interface.lib.php
	libraries/server_synchronize.lib.php
	server_status.php
	sql.php
 2011-07-22 11:07:04 +02:00
Michal Čihař
d55306252b Replace tabs with spaces, cleanup identation 2011-07-22 10:15:08 +02:00
Michal Čihař
219ec73d69 Spacing around if 2011-07-22 09:10:37 +02:00
Piotr Przybylski
a28beb9c1f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/server_synchronize.lib.php
	server_status.php
 2011-07-21 15:25:52 +02:00
Michal Čihař
48e9af42e0 Add missing space after foreach calls 2011-07-21 11:21:26 +02:00
Piotr Przybylski
c3d1a8b14a Ignore SkipLockedTables (Drizzle) 2011-07-13 16:59:22 +02:00
Piotr Przybylski
bf9469ec18 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-13 12:25:06 +02:00
Piotr Przybylski
7d99d57cca Merge remote-tracking branch 'origin/master' into drizzle 2011-06-25 01:00:00 +02:00
Rouslan Placella
75fd7df711 Merge branch 'master' into rte 2011-06-24 13:49:55 +01:00
Piotr Przybylski
2399c8a784 Remove PMA_MULTIBYTE_ENCODING constant 2011-06-23 23:28:05 +02:00
Rouslan Placella
67c5b63a4a Merge branch 'master' into rte 2011-06-23 14:10:19 +01:00
Piotr Przybylski
e38b5cd4ff Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_structure.php
	libraries/common.lib.php
	libraries/database_interface.lib.php
	tbl_structure.php
 2011-06-23 14:02:58 +02:00
Marc Delisle
929cb3d63f Typo 2011-06-23 06:33:39 -04:00
Marc Delisle
c911e891a1 Typo 2011-06-23 06:32:09 -04:00
Rouslan Placella
4f4efd231d Better "event scheduler" functionality 2011-06-22 18:27:32 +01:00
Michal Čihař
ee0b2fee37 Better error message when config file can not be parsed 
- shorter text
- directly show errors in iframe instead saying user to load other page
 2011-06-22 09:29:14 +02:00
Marc Delisle
723e51dfdb Merge commit 'ede177c577668a712e0d89a8c895c1d0c200f42f' 2011-06-21 08:13:41 -04:00
Aris Feryanto
7e5fddf4ae Recent table: Add support for browser without javascript 2011-06-20 13:21:07 +07:00