Commit Graph

95 Commits

Author SHA1 Message Date
Michal Čihař
397b6fd00e Cleanup spacing after @return 2012-04-27 11:33:26 +02:00
Madhura Jayaratne
8e62b92d70 Coding style improvements 2012-04-14 17:44:39 +05:30
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
Jo Michael
88de8778ac Replaced obsolete a[name] with a[id] for URL fragment jump 2012-03-31 18:36:41 +02:00
Jo Michael
c9a370af1b Replaced valign HTML attribute with CSS 2012-03-31 18:21:45 +02:00
Jo Michael
c36a9113e0 Replaced td[align] with td[class] due to HTML5 2012-03-18 19:53:43 +01:00
Jo Michael
b2fd866d87 Leading ./ paths for includes can be omitted, part 2 2012-03-16 23:11:57 +01:00
Michal Čihař
2d354d70f1 Use ordered format string to ease work for translators 2012-03-14 16:34:37 +01:00
Madhura Jayaratne
35b18e57a2 Coding style improvements - Multiline assignments 2011-12-07 23:28:50 +05:30
Rouslan Placella
8812aeb7e2 Fixed initialisation of makegrid in database search results 2011-10-30 20:44:23 +00: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
Dieter Adriaenssens
0ade69e84d use include() instead of require() when including file conditionally 2011-09-06 17:57:48 +02:00
Dieter Adriaenssens
94c6836f8b fix coding style : control structures 2011-09-05 14:28:17 +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
Michal Čihař
db50c8cf09 Remove unused variables 2011-08-09 08:33:50 +02:00
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ř
9405dbb82a Fix spacing after @param 2011-07-22 09:21:55 +02:00
Michal Čihař
219ec73d69 Spacing around if 2011-07-22 09:10:37 +02:00
Piotr Przybylski
7255ec2100 Change PMA_DBI_get_columns() to always return complex descriptions, never simple column list (it was needed for one case anyway)
Bugfixes
2011-06-30 00:48:19 +02:00
Piotr Przybylski
a3b1000b43 Fix database search 2011-06-28 18:36:51 +02:00
Piotr Przybylski
713bf22079 Drizzle has no CONVERT and everything is utf-8 2011-06-28 17:47:47 +02:00
Piotr Przybylski
3bde595666 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-27 23:55:32 +02:00
Michal Čihař
c9c9fdf49d Consistent capitalisation of PMA_sqlAddSlashes 2011-06-27 14:48:15 +02:00
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02: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
Michal Čihař
cf905b6afe Avoid using (s), there can be always multiple choices 2011-06-22 09:14:48 +02:00
Piotr Przybylski
12f70e8938 Replace all SHOW FIELDS calls with PMA_DBI_get_columns() or PMA_DBI_get_columns_sql()
Fix PMA_DBI_get_columns() in Drizzle when $full == false
2011-06-17 00:22:25 +02:00
Aris Feryanto
d28d7daba1 Fix merge conflict with origin/master 2011-06-15 07:23:06 +07:00
Michal Čihař
8cebaca19b bug #3315720 [search] Fix search in non unicode tables
We need to convert field to unicode because the connection is in utf-8
and we might give utf-8 input as well.
2011-06-14 09:15:07 +02:00
Aris Feryanto
770b1c7dd3 Fix: column resizing & reordering under db_search.php (also enable inline edit support) 2011-06-14 11:55:35 +07:00
Madhura Jayaratne
326f13827b Do not highlight rows of these tables 2011-03-15 20:35:53 +05:30
Michal Čihař
7d5efb58dc Escape html 2011-03-03 07:13:49 +01:00
Michal Čihař
85ca9c02c3 Fix translated string 2011-03-03 07:12:17 +01:00
Thilanka
a994e13c33 Ajaxify browse and delete criteria in DB search 2011-02-28 12:44:44 -05:00
Michal Čihař
290d448b9a No need to explicitely add jquery 2011-02-01 17:50:14 +01:00
Marc Delisle
6b51fd57ad Conditional Ajax on db Search
Remove extra wrapping of jQuery object
Avoid extra generation of hidden field
Add vim modeline
2011-01-27 06:46:17 -05:00
Marc Delisle
b923bb3fbb Upgrade to jQuery 1.4.4 2011-01-02 08:00:25 -05:00
Herman van Rink
15e3837850 removed quotes from translated string, messed up in JS. And fixed to sprintf. 2010-11-28 14:44:50 +01:00
Herman van Rink
fff3afc08e bug #3115519: Prevent long queries from being shown in confirmation popup 2010-11-26 20:55:58 +01:00
Michal Čihař
d17fba309c Fix permissions.
Most files were made executable somewhere in ninadsp tree, reverting
this.
2010-08-30 09:53:37 +02:00
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Michal Čihař
862e3ca2a7 Merge branch 'QA_3_3'
Conflicts:
	libraries/core.lib.php
	server_databases.php
	server_privileges.php
2010-08-20 13:40:37 +02:00
Michal Čihař
6d548f7d44 Fix XSS on field_str in db_search.php. 2010-08-18 11:30:19 +02:00
ninadsp
6a3d0a7f58 Added documentation, fixed some minor bugs/typos 2010-08-13 23:34:10 +05:30
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Michal Čihař
d291827444 No need to require_once footer
It is the last thing executed anyway (ends with exit).
2010-07-26 16:20:24 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
3e57a8eca9 No @uses __('Something'). 2010-07-20 15:06:34 +02:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
Marc Delisle
6fb9c5bb14 more plural forms 2010-07-19 13:22:42 -04:00