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

267 Commits

Author SHA1 Message Date
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00
Michal Čihař
9816ac0683 Merge pull request #539 from fustundag/master 
feature-requests #1444
 2013-08-02 02:24:15 -07:00
Marc Delisle
269d0c89fe Fix merge conflicts 2013-07-28 06:17:38 -04:00
Marc Delisle
836529be42 Fix merge conflicts 2013-07-28 05:55:40 -04:00
Fatih Üstündağ
2666eb81a5 verbose md5 check fix 2013-07-25 14:19:22 +03:00
Fatih Üstündağ
c873c161d0 verbose check added to lookup server 2013-07-25 03:05:09 +03:00
Marc Delisle
7992beb8e4 Move protection statement at beginning of script 2013-07-17 15:18:52 -04:00
Marc Delisle
8e4fe7c57a [security] Avoid full path disclosure from libraries/common.inc.php, see PMASA-2013-12 2013-07-17 15:06:18 -04:00
Marc Delisle
0fea53b7b8 [security] Avoid full path disclosure from some libraries script, see 
PMASA-2013-12

Move the PHPMYADMIN constant definition earlier
 2013-07-17 14:56:50 -04:00
Madhura Jayaratne
e5519859fb Make all string function accessible via $GLOBALS['PMA_String'] 2013-07-17 16:36:13 +05:30
Marc Delisle
22884539af No need for this to be a global variable 2013-07-14 15:55:44 -04:00
Michal Čihař
37d142bc3f Remove compatibility code for PHP 5.2 2013-07-01 15:29:56 +02:00
Michal Čihař
0f3754a271 Raise requirements to PHP 5.3 2013-07-01 15:29:47 +02:00
Marc Delisle
4ea69f0536 Merge commit 'f0232c3' 2013-06-24 08:00:47 -04:00
Marc Delisle
f0232c3cda bug #3985 Call to undefined function mb_detect_encoding 2013-06-24 07:58:23 -04:00
Michal Čihař
b38c7637d8 Merge branch 'QA_4_0' 2013-06-04 09:07:14 +02:00
Michal Čihař
9afc2fba57 Add check for json module in PHP 
Debian no longer ships JSON support built in into PHP because of some
licensing issues found in the PHP 5.5 and others might follow, so we
need to check whether JSON module is there.
 2013-06-04 09:05:47 +02:00
Madhura Jayaratne
2baf473ad7 Merge branch 'master' into OOP_DBI 
Conflicts:
	libraries/database_interface.lib.php
 2013-05-26 21:43:33 +05:30
Madhura Jayaratne
0dab7f2463 Separate DatabaseInterface class and creation of an instance of it 2013-05-26 21:28:42 +05:30
Madhura Jayaratne
50b0eed668 isSuperuser() is also a part of DatabaseInterface class 2013-05-26 09:18:11 +05:30
Atul Pratap Singh
8cd420ac94 Remove duplicate code, profiling scripts already included 2013-05-25 16:47:32 +05:30
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Atul Pratap Singh
c88762e386 Include profiling scripts initially, bug#3639 in QA_4_0 2013-05-23 23:54:29 +05:30
Atul Pratap Singh
dbb0ed3e6a Include profiling scripts initially, bug#3639 2013-05-23 18:07:24 +05:30
Michal Čihař
2bcc317b1c Better name for a function 2013-05-10 10:10:09 +02:00
Kasun Chathuranga
adb2e43f7d Implement feature request #1414 - Allow specifying crontrolport 
Set the value of controlport based on the value of controlhost
 2013-05-02 21:36:05 +05:30
Michal Čihař
1d5539d3aa Better function names 
Follow PEAR coding standard for function names.
 2013-05-02 15:01:11 +02:00
Michal Čihař
04063608cb Use format string instead of concatenation 2013-04-25 14:42:45 +02:00
Madhura Jayaratne
2007eb7ff7 Space after exclamation mark 2013-04-12 22:09:26 +05:30
Marc Delisle
bcfba0d46c Fix merge conflicts 2013-02-09 07:50:16 -05:00
Marc Delisle
c8dfa6b2f7 Bug #3777 Cannot log out from second server 2013-01-20 12:51:48 -05:00
Marc Delisle
95fa48fc8e Remove remaining code in tbl_alter.php 2012-12-18 15:44:39 -05:00
Rouslan Placella
b621d2b56c Split the server staus monitor features into a separate page 2012-12-14 19:05:04 +00:00
Rouslan Placella
b1829bf2b2 No such files 2012-11-29 21:28:23 +00:00
Rouslan Placella
0dcaa03d39 Fixed undefined variable 2012-11-29 20:45:25 +00:00
Rouslan Placella
d505e3c70e Wait for erroring out about the token until after the authentication 2012-11-27 01:00:56 +00:00
Michal Čihař
3332746d90 Remove dead code 2012-11-12 09:16:08 +01:00
Rouslan Placella
0d7687d235 Fixed handling of NaviWidth configuration directive 2012-10-30 20:16:57 +00:00
Rouslan Placella
9e3a9ee52f Dropped main.php 2012-10-30 20:10:20 +00:00
Chanaka Indrajith
6971295e96 Renamed PMA_CommonFunctions::getInstance()-> with PMA_Util:: 2012-09-16 14:41:47 +05:30
Chanaka Indrajith
a6234ae0a3 Renamed the file to Util.class.php and modify the relavant files 2012-09-16 13:48:21 +05:30
Michal Čihař
82da547cf8 Fix gettext invocation 2012-09-05 15:50:08 +02:00
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