Commit Graph

102 Commits

Author SHA1 Message Date
Kasun Chathuranga
6b1f6ae046 Merge branch 'master' into DBI_naming_cleanUp
Conflicts:
	libraries/database_interface.lib.php
	libraries/db_table_exists.lib.php
	libraries/relation.lib.php
	libraries/rte/rte_triggers.lib.php
	libraries/schema/Dia_Relation_Schema.class.php
	libraries/schema/Visio_Relation_Schema.class.php
	tbl_addfield.php
2013-05-01 00:51:15 +05:30
Kasun Chathuranga
32e6c06324 PMA_DBI_get_columns --> PMA_DBI_getColumns 2013-04-30 23:36:47 +05:30
Kasun Chathuranga
bee0134b1f PMA_DBI_get_tables_full --> PMA_DBI_geTablesFull 2013-04-30 23:27:27 +05:30
Madhura Jayaratne
2007eb7ff7 Space after exclamation mark 2013-04-12 22:09:26 +05:30
Marc Delisle
84e8341abb Fix merge conflicts 2013-02-01 07:49:33 -05:00
Gemorroj
fc51a91713 many some minor fixes (sorry, see diff) 2013-01-26 15:35:29 +03:00
Dieter Adriaenssens
bbcf7c176e cleanup code : remove debug code 2013-01-23 14:32:58 +01:00
Dieter Adriaenssens
ce856f772e improve coding style : remove mixed php and html 2013-01-23 14:32:09 +01:00
Dieter Adriaenssens
093d6f94ea wrap long lines 2013-01-23 14:30:26 +01:00
Dieter Adriaenssens
e8bee402e3 remove unused variable : is not used 2013-01-23 14:13:36 +01:00
Michal Čihař
1495dc0a6a Add missing label tag 2013-01-03 14:30:38 +01:00
Michal Čihař
aad6318b53 Correctly remember showing of fields 2013-01-03 14:28:52 +01:00
Michal Čihař
aa010110ee Avoid off by one error 2013-01-03 14:27:05 +01:00
Michal Čihař
96f5cdc712 Improve cleanup dialog look 2013-01-03 14:26:21 +01:00
Michal Čihař
86cdd9890c Code cleanup 2013-01-03 14:23:45 +01:00
Michal Čihař
e312159db1 Drop dom-drag.js and implement the functionality using jQuery (rfe#3597853) 2013-01-03 13:59:21 +01:00
Michal Čihař
9f5cde6c73 No inline javascript for control buttons for scratchboard 2013-01-03 13:26:24 +01:00
Michal Čihař
f3b931fdf9 Paper change no longer uses inline javascript 2013-01-03 13:22:35 +01:00
Michal Čihař
70fe323a23 Replace inline javascript with jQuery handler 2013-01-03 12:24:31 +01:00
Rouslan Placella
1cb588b797 Fixed export of relational schema 2012-10-30 20:24:00 +00:00
Chanaka Indrajith
0ff571a128 Modify classes with property 2012-09-16 15:29:56 +05:30
Michal Čihař
8b3756a8d9 Various coding style improvements 2012-09-03 14:51:13 +02:00
Rouslan Placella
6bfa855fcb Revert "Fixed submission of Export Schema form"
This reverts commit 3b75241fa9.
2012-07-22 11:35:46 +01:00
Rouslan Placella
3b75241fa9 Fixed submission of Export Schema form 2012-07-21 18:17:19 +01:00
Marc Delisle
865d06ff7f Could not add a table to a relational schema 2012-07-21 13:13:39 -04:00
Marc Delisle
02af4bcf4c Could not delete a relational schema page 2012-07-21 12:58:24 -04:00
Marc Delisle
03f34c4ef0 Unused method: setCommonFunctions() 2012-07-10 12:36:27 -04:00
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
Michal Čihař
705c01b5c9 Better name for function 2012-06-04 12:08:14 +02:00
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
67c68ba7ca Fix function names: PMA_foreignkey_supported -> PMA_isForeignKeySupported 2012-05-11 22:11:24 +05:30
Madhura Jayaratne
b5bfe6df6a Fix function names: PMA_display_html_radio -> PMA_displayHtmlRadio 2012-05-11 21:59:34 +05:30
Chanaka Indrajith
dfc73d3494 Resolved conflicts after merge 2012-05-08 23:57:59 +05:30
Chanaka Indrajith
004f4f5258 Render HTML content in PMA_displayTableHeaders() function at once, in display_tbl.lib.php file 2012-05-08 22:19:40 +05:30
Dieter Adriaenssens
7cb39d038a remove unused variables 2012-05-05 23:18:03 +02:00
Marc Delisle
2a66742a00 Improve naming 2012-04-29 15:07:46 -04:00
Dieter Adriaenssens
0f772aa173 check if PHPMYADMIN is set 2012-04-14 16:51:26 +02:00
Jo Michael
03eeeb3ccd Removed: table[border] attribute (default is 0 anyways), a[rel] for non-standard values for HTML5 validity 2012-03-18 17:46:22 +01:00
Jo Michael
3b56f6a53b Leading ./ paths for links and favicons can be omitted, part 1 2012-03-16 23:04:12 +01: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
Madhura Jayaratne
f06e8ee9fc Merge branch 'QA_3_4'
Conflicts:
	libraries/schema/Pdf_Relation_Schema.class.php
	libraries/schema/User_Schema.class.php
2011-10-08 14:26:48 +05:30
Madhura Jayaratne
329c9cac68 Avoid warnings on undefined variables 2011-10-08 14:15:17 +05:30
Rouslan Placella
ef2e103adb Merge branch 'sprites' 2011-09-30 19:51:05 +01:00
Marc Delisle
963f478fdd Fix merge conflicts 2011-09-29 07:12:57 -04:00
Marc Delisle
86138fa914 Merge branch 'QA_3_4' 2011-09-29 07:06:48 -04:00
Marc Delisle
acbbd8fc56 bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken 2011-09-29 06:41:06 -04:00
Marc Delisle
86722781eb A table has been dropped from outside phpMyAdmin 2011-09-29 06:19:03 -04:00
Marc Delisle
789ed0d3d1 A table has been dropped from outside phpMyAdmin 2011-09-29 06:08:30 -04:00