Commit Graph

95 Commits

Author SHA1 Message Date
Marc Delisle
269d0c89fe Fix merge conflicts 2013-07-28 06:17:38 -04:00
Marc Delisle
45d3f4326c Fix merge conflicts 2013-07-17 15:05:23 -04:00
Gemorroj
a225209aad minor phpdocs improvements and fox possible php notice (undefined variable $dblist) 2013-07-03 10:16:22 +03:00
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Michal Čihař
0068e8b567 Merge remote-tracking branch 'origin/QA_4_0'
Conflicts:
	libraries/config/messages.inc.php
2013-05-21 14:01:40 +02:00
Marc Delisle
5a251b8b07 Dead code 2013-05-20 13:21:53 -04:00
Marc Delisle
b5dd9e2d04 Dead code 2013-05-20 13:19:12 -04:00
Marc Delisle
19d1efd90b Dead code 2013-05-20 13:17:49 -04:00
Marc Delisle
b7508e237b Dead code 2013-05-20 13:14:58 -04:00
Kasun Chathuranga
556bcb9f9d PMA_DBI_num_rows --> PMA_DBI_numRows 2013-05-04 08:39:43 +05:30
Kasun Chathuranga
1c884f0cca PMA_DBI_free_result --> PMA_DBI_freeResult 2013-05-04 08:33:49 +05:30
Kasun Chathuranga
a242ed1ae5 PMA_DBI_fetch_row --> PMA_DBI_fetchRow 2013-05-04 08:31:22 +05:30
Kasun Chathuranga
5bcc32999f PMA_DBI_fetch_assoc --> PMA_DBI_fetchAssoc 2013-05-04 08:30:12 +05:30
Kasun Chathuranga
fbe4438628 PMA_DBI_fetch_result --> PMA_DBI_fetchResult 2013-05-01 00:05:16 +05:30
Kasun Chathuranga
d933575811 PMA_DBI_try_query --> PMA_DBI_tryQuery 2013-04-30 23:05:18 +05:30
Marc Delisle
da0f681fc7 Remove the database ordering sub-feature of the only_db directive 2013-03-09 07:48:08 -05:00
Rouslan Placella
7356b407ad Rewrite and integration of js/common.js 2012-10-30 20:23:59 +00:00
Rouslan Placella
4f4671b284 Renamed configuration directive: LeftFrameDBSeparator => NavigationTreeDbSeparator 2012-10-30 20:16:57 +00:00
Rouslan Placella
6f8544c5ef Renamed configuration directive: LeftFrameDBTree => NavigationTreeEnableGrouping 2012-10-30 20:16:57 +00:00
Rouslan Placella
5f66444f5b Dropped configuration directives: ShowTooltipAliasDB and ShowTooltipAliasTB 2012-10-30 20:16:56 +00:00
Rouslan Placella
c24010362f Dropped references to index.php 2012-10-30 20:07:02 +00:00
Chanaka Indrajith
13208324d3 Removed unnecessary empty lines in functions 2012-09-19 00:15:15 +05:30
Chanaka Indrajith
36ffe5e0a3 Modified some untracked changes 2012-09-16 14:51:13 +05:30
Chanaka Indrajith
e6894be57f Renamed ->method() with PMA_Util::method() 2012-09-16 14:35:45 +05:30
Chanaka Indrajith
0829709064 Remove variable 2012-09-16 14:31:22 +05:30
Chanaka Indrajith
766466135e Implement class behavior of common.lib.php file 2012-06-22 23:38:33 +05:30
Madhura Jayaratne
5a64005dc8 Protected methods should not be prefixed with underscore 2012-06-02 23:15:15 +05:30
Madhura Jayaratne
fce68140bc Protected variables should not be prefixed with underscore 2012-06-02 23:09:00 +05:30
Rouslan Placella
933ad71021 Merged CSS stylesheets 2012-05-18 19:14:09 +01:00
Madhura Jayaratne
540ee229c6 Fix @since tags 2012-05-12 23:30:08 +05:30
Madhura Jayaratne
954b0cc69f Fix function names: PMA_unescape_mysql_wildcards -> PMA_unescapeMysqlWildcards 2012-05-11 22:31:12 +05:30
Madhura Jayaratne
ec9a8cf997 Coding style improvements 2012-05-01 19:38:04 +05:30
Jo Michael
fd6a96264a Fix some checkstyle FunctionDeclaration NotAtEnd warnings 2012-04-29 02:23:06 +02:00
Dieter Adriaenssens
0d06e3941a missing semicolon 2012-04-29 01:09:09 +02:00
Dieter Adriaenssens
229cb53101 wrap long lines 2012-04-28 23:29:14 +02:00
Dieter Adriaenssens
f793655b70 improve docblocks 2012-04-28 23:14:33 +02:00
Dieter Adriaenssens
b14acc2e1c fix indentation 2012-04-28 22:44:03 +02:00
Michal Čihař
397b6fd00e Cleanup spacing after @return 2012-04-27 11:33:26 +02:00
Dieter Adriaenssens
0f772aa173 check if PHPMYADMIN is set 2012-04-14 16:51:26 +02:00
Dieter Adriaenssens
84a237b117 escape variable output 2012-04-06 11:00:56 +02:00
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
ac83360796 Coding style improvements 2012-03-21 05:45:58 +05:30
Marc Delisle
a196cbd85f Merge pull request #7 from mynetx/master
Various
2012-03-18 12:09:23 -07:00
Jo Michael
653f086815 Replaced xml:lang attributes by lang for HTML5 2012-03-18 14:46:59 +01:00
Madhura Jayaratne
4cb5bcd4b5 Improve coding style 2012-03-18 09:53:33 +05:30
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
Madhura Jayaratne
299da6d047 More style errors fixed 2011-09-23 11:36:14 +05:30
Madhura Jayaratne
e67a0a2531 Spaces between parameters in function calls 2011-09-23 08:43:41 +05:30
Piotr Przybylski
a502f95af4 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-16 16:11:43 +02:00
Piotr Przybylski
df9b8c2729 Fix comments for functions with missing @return tag 2011-08-16 14:31:52 +02:00