Commit Graph

120 Commits

Author SHA1 Message Date
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00
Michal Čihař
2711010c05 Use new truncating code 2013-08-06 12:30:53 +02:00
Michal Čihař
99af0cbc7e Remove unused parameter from PMA_Util::formatSql
We no longer need parsed SQL here.
2013-08-06 12:24:28 +02:00
Michal Čihař
959644445d PMA_Util::formatSql now requires unparsed query as well
In most cases we just need to output it as is, formatting is done in
javascript.
2013-08-06 12:04:14 +02:00
Michal Čihař
3063535532 Merge remote-tracking branch 'origin/QA_4_0'
Conflicts:
	tbl_tracking.php
2013-08-05 10:02:09 +02:00
Michal Čihař
3a6d29f183 Use PMA_generate_common_url for URL parameters 2013-08-05 10:00:39 +02:00
FliegenKLATSCH
bebe981371 Version-Parameter fixed
Single Tracking-Entries couldn't be deleted because of missing Version in the Delete-Link.
2013-08-05 09:58:17 +02:00
FliegenKLATSCH
511d8ec920 Version-Parameter fixed
Single Tracking-Entries couldn't be deleted because of missing Version in the Delete-Link.
2013-08-04 18:20:48 +02:00
Michal Čihař
a5f572e132 Factor out text showing detection as well 2013-07-30 15:07:44 +02:00
Michal Čihař
6c3099cae1 Remove double ; 2013-07-30 13:42:31 +02:00
Michal Čihař
bebba32337 Merge remote-tracking branch 'origin/QA_4_0'
Conflicts:
	libraries/config.values.php
	libraries/sql_query_form.lib.php
	server_binlog.php
	server_databases.php
	tbl_structure.php
	test/classes/PMA_DisplayResults_test.php
2013-06-24 10:41:54 +02:00
Marc Delisle
d4d5a03766 Bug #3960 NavigationBarIconic config not honored 2013-06-21 10:00:41 -04:00
Madhura Jayaratne
1edbc2cd3d Fix indentation, remove extra space 2013-06-19 13:00:04 +05:30
Madhura Jayaratne
472a6239a4 Rename PMA_filter_tracking -> PMA_filterTracking 2013-06-19 12:51:33 +05:30
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Kasun Chathuranga
556bcb9f9d PMA_DBI_num_rows --> PMA_DBI_numRows 2013-05-04 08:39:43 +05:30
Kasun Chathuranga
d454b41564 PMA_DBI_data_seek --> PMA_DBI_dataSeek 2013-05-04 08:31:47 +05:30
Kasun Chathuranga
2a2eac9b53 PMA_DBI_fetch_array --> PMA_DBI_fetchArray 2013-05-04 08:28:57 +05:30
Madhura Jayaratne
ae0125b013 Closing parenthesis of a multi-line IF statement must be on a new line 2013-04-12 21:54:03 +05:30
Marc Delisle
72eaf6d338 Fix merge conflicts 2012-12-12 15:04:55 -05:00
Rouslan Placella
fbb920c2d1 Fixed submission of table tracking forms 2012-10-30 20:07:02 +00:00
Michal Čihař
536ebb21aa Fix typo 2012-09-19 20:03:06 +02:00
Michal Čihař
7474e4635e Wrap some long lines 2012-09-19 14:14:33 +02:00
Michal Čihař
9fddc8a725 Simplify code 2012-09-19 14:14:33 +02:00
Michal Čihař
d5f7a90703 Replace mixed html and php with php 2012-09-19 14:14:33 +02:00
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
Madhura Jayaratne
2095bc3211 Wrap some long lines 2012-09-05 22:13:55 +05:30
Dieter Adriaenssens
163dba1143 fix coding style 2012-09-02 21:02:51 +02:00
Dieter Adriaenssens
112f8b92e3 fix coding style : correct function parameter spacing 2012-08-30 17:56:11 +02:00
Madhura Jayaratne
9a47688dc6 Various coding style improvements 2012-07-29 19:25:52 +05:30
Chanaka Indrajith
39d37fafcc Resolved conflicts 2012-06-27 21:53:59 +05:30
Madhura Jayaratne
ec046f7d11 Use camel case for function names (PMA_query_as_controluser => PMA_queryAsControlUser) 2012-06-23 23:06:29 +05:30
Chanaka Indrajith
766466135e Implement class behavior of common.lib.php file 2012-06-22 23:38:33 +05:30
Rouslan Placella
eb98110541 Dropped footer.inc.php 2012-06-11 14:06:04 +01:00
Madhura Jayaratne
10510e16b4 Fix function name: PMA_download_header -> PMA_downloadHeader 2012-06-01 21:52:30 +05:30
Chanaka Indrajith
dd237eb924 Resolve conflicts due to changes in method names of common.lib.php 2012-05-13 12:39:31 +05:30
Madhura Jayaratne
547880aad2 Fix function names: PMA_convert_bit_default_value -> PMA_convertBitDefaultValue 2012-05-11 21:51:04 +05:30
Chanaka Indrajith
bf15800089 Remove HTML rendering inside the functions in display_tbl.lib.php file itselves 2012-05-11 16:05:55 +05:30
Rouslan Placella
28923b496e Renamed tbl_common.php to tbl_common.inc.php for better consistency 2012-05-05 16:44:27 +01:00
Rouslan Placella
2c805ade8b Dropped tbl_links.inc.php 2012-05-05 16:44:27 +01:00
Madhura Jayaratne
8243eace0f Wrap some long lines 2012-04-30 23:23:50 +05:30
Michal Čihař
397b6fd00e Cleanup spacing after @return 2012-04-27 11:33:26 +02:00
Michal Čihař
b2243f08a8 Fix spacing around brackets 2012-04-27 11:30:47 +02:00
Madhura Jayaratne
4ff76ff31c Coding style improvements (Inline control structures are discouraged) 2012-04-25 23:39:04 +05:30
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
Marc Delisle
3da49e3418 Clarify variable name 2012-04-21 14:48:30 -04:00
Marc Delisle
1c58314c53 Clarify function name 2012-04-21 14:40:08 -04:00
Madhura Jayaratne
3332151859 Fix Checkstyle Warnings - Type: CloseBracketLine (Closing parenthesis of a multi-line function call must be on a line by itself) 2012-04-14 09:09:21 +05:30
Madhura Jayaratne
ea800101cb Fix Checkstyle Warnings - Type: BraceOnSameLine 2012-04-13 21:50:26 +05:30