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

118 Commits

Author SHA1 Message Date
Madhura Jayaratne
35b18e57a2 Coding style improvements - Multiline assignments 2011-12-07 23:28:50 +05:30
Rouslan Placella
1fd7a96135 Merge branch 'enum' 
Conflicts:
	enum_editor.php
 2011-10-26 16:29:10 +01:00
Rouslan Placella
93686fd47a Improved ENUM/SET editor 2011-10-26 16:01:24 +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
Marc Delisle
4336ffca2b As suggested by Tyron Madlener: 
Display the input field for the default value only after "As defined:"
is selected, and also focus it automatically once it's selected so the user
can type immediately
 2011-10-16 09:10:48 -04:00
Marc Delisle
281faff4b2 As suggested by Michal 2011-10-13 12:59:59 -04:00
Marc Delisle
d1aa3e3b02 [interface] Remove DefaultPropDisplay feature 2011-10-08 06:40:10 -04:00
Madhura Jayaratne
9bcb83af03 File is being conditionally included; use "include" instead 2011-09-23 10:56:30 +05:30
Piotr Przybylski
a31b30ba57 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-23 21:56:33 +02:00
Michal Čihař
1433b4c331 Fixed and simplified type detection on editing 
Fixes bug#3392824 and cleans up the code.
 2011-08-23 11:59:43 +02:00
Piotr Przybylski
7f1fa1bab0 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	libraries/database_interface.lib.php
	libraries/mysql_charsets.lib.php
 2011-08-05 17:17:47 +02:00
Michal Čihař
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +02:00
Piotr Przybylski
66665f326a Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_qbe.php
	js/server_status.js
	libraries/export/xml.php
	libraries/schema/Pdf_Relation_Schema.class.php
	tbl_printview.php
	tbl_structure.php
 2011-08-04 20:19:43 +02:00
Michal Čihař
57ab1b3e20 No longer needed 2011-08-04 17:12:08 +02:00
Michal Čihař
48149c261c Use already calculated values 2011-08-04 17:11:47 +02:00
Piotr Przybylski
ce7e6feaf5 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/export/htmlword.php
	libraries/export/latex.php
	libraries/export/odt.php
	libraries/export/sql.php
	libraries/export/texytext.php
	libraries/export/xml.php
 2011-08-03 00:25:43 +02:00
Piotr Przybylski
0427378a05 Allow to use noclick class on table level 2011-08-02 23:14:52 +02:00
Piotr Przybylski
a445d94ee0 Function list and column types for Drizzle 2011-07-06 19:08:23 +02:00
Piotr Przybylski
b1b4e6389d Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/server_synchronize.lib.php
 2011-07-06 18:31:38 +02:00
Piotr Przybylski
19ec26904b Revert "Provide proper function list in Insert dropdowns and proper column types in field type dropdowns (Drizzle)" 
This reverts commit 35843439df.
 2011-07-06 18:22:55 +02:00
Piotr Przybylski
866d1da95a Move ColumnTypes, AttributeTypes, Functions, RestrictColumnTypes, RestrictFunctions and DefaultFunctions to a separate file 2011-07-06 17:29:33 +02:00
Piotr Przybylski
9ba2650bc6 Don't offer FULLTEXT in table creation form (Drizzle) 2011-07-03 01:48:32 +02:00
Piotr Przybylski
35843439df Provide proper function list in Insert dropdowns and proper column types in field type dropdowns (Drizzle) 2011-07-03 01:47:03 +02:00
Piotr Przybylski
d4d647e169 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-26 18:32:20 +02:00
Marc Delisle
a04169f97d "Add a new" is redundant" 2011-06-26 07:33:09 -04: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
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
Rouslan Placella
c220bb4e13 Moved PMA_getSupportedDatatypes() to common.lib.php 2011-06-14 13:56:00 +01:00
Marc Delisle
da46a09c24 rfe #3310562 Wording about Column 2011-06-02 11:25:12 -04:00
Thilanka Kaushalya
0b5f4410cd Changed the add columns fieldset to top of the create table form 2011-05-27 15:56:15 +05:30
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Marc Delisle
dfa4668fe6 Bug #3187422 Form validation and submission 2011-03-06 08:30:51 -05:00
Marc Delisle
589d918ee7 Errors from the Ajax create table dialog where not displayed 2011-02-08 17:36:05 -05:00
Michal Čihař
f11509d5b5 Add table caption and move documentation link there. 
Otherwise the separate documentation link looks little strange.
 2011-02-02 14:52:56 +01:00
Marc Delisle
e311848262 Conditional Ajax on table create 2011-01-25 13:06:17 -05:00
Marc Delisle
200dce3a25 Messages not under gettext 2010-12-28 15:34:19 -05:00
Marc Delisle
38334e4f91 CtrlArrowsMoving not really needed as an option, now always active 2010-10-04 08:07:48 -04:00
Marc Delisle
c699e8800e XHTML compliance 2010-09-26 07:29:49 -04:00
Marc Delisle
14c02c1e67 to avoid undefined attribute errors, give different ids to the create table form and add fields form; then use the .live() method directly after a selector as recommended 2010-09-26 07:22:58 -04:00
Michal Čihař
adb94ccb4b No need to escape manually. 2010-09-07 10:44:10 +02: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ř
124ba18d03 Better to use format strings. 2010-08-19 11:26:34 +02:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
lorilee
428053bef5 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-26 13:44:30 -07:00
lorilee
2a59451ac5 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	server_export.php
 2010-07-26 13:42:42 -07:00
Michal Čihař
ee767e2d3d No need to explicitely include relation.lib its anyway included in common.inc 2010-07-26 16:17:59 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
lorilee
aa49b85fad Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 
Conflicts:
	libraries/display_export.lib.php
 2010-07-20 15:23:12 -07:00
lorilee
2ebf96d242 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/display_export.lib.php
	libraries/display_import.lib.php
 2010-07-20 13:04:03 -07:00