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

170 Commits

Author SHA1 Message Date
Madhura Jayaratne
da0c3bbd13 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 
Conflicts:
	libraries/Table.class.php
 2012-04-25 23:53:12 +05:30
Madhura Jayaratne
d6e05d74b5 Various coding style fixes 2012-04-25 23:12:09 +05:30
Madhura Jayaratne
a817542fda Coding style improvements (Closing parenthesis of a multi-line function call must be on a line by itself) 2012-04-25 22:27:32 +05:30
Marc Delisle
503e45aba5 Fix merge conflicts 2012-04-25 12:29:55 -04:00
Michal Čihař
c90388c5b3 Wrap some long lines 2012-04-25 13:26:31 +02:00
Dieter Adriaenssens
0f772aa173 check if PHPMYADMIN is set 2012-04-14 16:51:26 +02: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
Jo Michael
b5bca9ce0b Move columns in table columns editor 2012-04-09 19:02:13 +02:00
Rouslan Placella
350c86bac7 Merge branch 'QA_3_5' 
Conflicts:
	po/fr.po
	po/pt_BR.po
 2012-04-04 21:16:05 +01:00
Rouslan Placella
bfaef90018 Merge branch 'QA_3_4' into QA_3_5 
Conflicts:
	po/fr.po
	po/pt_BR.po
 2012-04-04 21:14:41 +01:00
Chanaka Indrajith Dharmarathna
ac82ba0f45 Fixed bug #3512565 - Missing word Rows in table list tooltip after click 2012-04-04 21:08:35 +01:00
Madhura Jayaratne
d5d3d2bba4 Use 'void' if nothing is returned 2012-03-18 10:04:39 +05:30
Michal Čihař
f89b2a3f32 Allow reordering of parameters 2012-03-14 14:47:12 +01:00
Onur Avsar
b916cdb4aa Added feature request 'clearing DEFAULT NULL' (rfe:3484063). 2012-03-05 15:07:09 -05:00
Marc Delisle
d5dede3530 Fix merge conflicts 2011-12-29 09:41:55 -05:00
Glenn
8697ec3d48 patch #3458944 copy table data missing SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO' 2011-12-29 09:37:43 -05:00
Madhura Jayaratne
35b18e57a2 Coding style improvements - Multiline assignments 2011-12-07 23:28:50 +05:30
Madhura Jayaratne
7ac39c04c2 Merge branch 'QA_3_4' 
Conflicts:
	libraries/Table.class.php
 2011-12-07 08:53:13 +05:30
Madhura Jayaratne
6e0a10494f bug #3452506 [edit] Unable to move tables with triggers 2011-12-07 08:33:28 +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
Marc Delisle
328defc9d9 bug [view] View renaming did not work 2011-10-10 07:25:52 -04:00
Marc Delisle
6fec80c614 bug [view] View renaming did not work 2011-10-10 07:16:30 -04:00
Aris Feryanto
036d1a8397 Correctly show error message when unable to save UI property 2011-08-29 15:00:06 +08:00
Piotr Przybylski
f678a45cd2 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/database_interface.lib.php
 2011-08-24 21:40:52 +02:00
Piotr Przybylski
5ab5afd506 Use PMA_Table::isView() instead of PMA_isView() 2011-08-24 21:16:04 +02:00
Piotr Przybylski
c12073871d Remove deprecated method PMA_Table::_isView() 2011-08-24 21:00:41 +02:00
Piotr Przybylski
8cd8760256 Create PMA_is_system_schema() function which checks whether current database server treats it as a system schema 2011-08-23 22:48:14 +02:00
Piotr Przybylski
41c18f6113 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/Table.class.php
	libraries/Tracker.class.php
 2011-08-20 00:48:40 +02:00
Madhura Jayaratne
c28c33c471 Coding style improvements 2011-08-19 23:38:42 +05:30
Piotr Przybylski
0ca4a5f02e Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_search.php
	libraries/Table.class.php
	libraries/schema/Pdf_Relation_Schema.class.php
	libraries/schema/User_Schema.class.php
	libraries/tbl_select.lib.php
	server_status.php
	tbl_change.php
 2011-08-19 15:56:26 +02:00
Michal Čihař
cb9f7a2c26 Clarify code 2011-08-19 11:15:31 +02:00
Michal Čihař
a3f14bbd80 Fix indentation 2011-08-19 11:15:24 +02:00
Piotr Przybylski
a502f95af4 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-16 16:11:43 +02:00
Piotr Przybylski
cc4743d396 'comment' is not a reserved keyword, remove PMA_backquote 2011-08-16 00:05:26 +02:00
Piotr Przybylski
970262c435 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-15 12:03:04 +02:00
Michal Čihař
7327dab936 Include link to docs 2011-08-15 10:01:10 +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
Aris Feryanto
fe7eadab72 Add configuration for maximum tbl_uiprefs records, as suggested by Piotr 2011-08-12 15:49:53 +08:00
Sven Strickroth
fcb4986598 there is no create_time-status for views 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2011-08-07 18:26:49 +05:30
Sven Strickroth
ed45a8e1f5 use i10n for error message 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2011-08-07 18:26:27 +05:30
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
Piotr Przybylski
6dbcab261e Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	server_status.php
 2011-07-20 18:23:21 +02:00
Piotr Przybylski
6deed1fd2e Change NULL to null 2011-07-20 18:08:04 +02:00
Piotr Przybylski
a0a4628b11 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/export/latex.php
	libraries/export/odt.php
	libraries/export/texytext.php
	libraries/export/xml.php
 2011-07-14 22:38:20 +02:00
Piotr Przybylski
590059cc30 Fix db/table name escaping in UI preferences 2011-07-14 01:30:25 +02:00
Piotr Przybylski
1bf994d73f Try to cast default values for BOOLEAN columns to TRUE/FALSE 
Required for Drizzle, adds more correct values for MySQL
 2011-07-09 22:08:32 +02:00
Piotr Przybylski
024d4adc27 UUID has no length 2011-07-09 21:52:33 +02:00
Piotr Przybylski
382c020a85 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-09 21:50:23 +02:00
Piotr Przybylski
2c4c45a68d SERIAL and BOOLEAN columns have no length 2011-07-09 21:49:07 +02:00