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

472 Commits

Author SHA1 Message Date
Madhura Jayaratne
bbc44c410c Merge branch 'QA_3_4' 
Conflicts:
	ChangeLog
	Documentation.html
	README
	libraries/Config.class.php
	libraries/display_tbl.lib.php
 2011-11-25 18:25:13 +05:30
Madhura Jayaratne
9c278d020c bug #3442028 [edit] Inline editing enum fields with null shows no dropdown 2011-11-25 18:12:53 +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
Madhura Jayaratne
a478b8164d bug #3299486 [prettyprint] Order By in a query containing comment character 2011-10-15 16:23:31 +05:30
Rouslan Placella
ef2e103adb Merge branch 'sprites' 2011-09-30 19:51:05 +01:00
Madhura Jayaratne
192b534b95 bug #3356456 [interface] Interface problems for queries having LIMIT clauses 2011-09-28 15:30:13 +05:30
Rouslan Placella
d17814f463 Replaced use of hard coded images with the sprite-aware PMA_getImage() functions (both PHP and JS). 2011-09-26 20:54:59 +01:00
Madhura Jayaratne
f44ba87d59 Fix some doc blocks 2011-09-21 17:51:35 +05:30
Madhura Jayaratne
92a00cdbe6 Coding style improvements 2011-09-21 16:48:24 +05:30
Madhura Jayaratne
bd786ea7c2 Fix indentation for multiline function calls 2011-09-21 16:29:13 +05:30
Madhura Jayaratne
7446161738 Proper indentation for multiline if statements 2011-09-21 16:15:12 +05:30
Madhura Jayaratne
2e7a8c9eea better variable name 2011-09-21 12:18:49 +05:30
Madhura Jayaratne
379ad840d3 Fixing some undefined variables 2011-09-21 11:34:08 +05:30
Madhura Jayaratne
1fd6beb74f Drizzle does not have GIS data types 2011-09-21 08:49:55 +05:30
Madhura Jayaratne
95e6e0b447 Merge branch 'QA_3_4' 
Conflicts:
	libraries/display_tbl.lib.php
 2011-09-19 23:28:24 +05:30
Madhura Jayaratne
a211b8ba0e bug #3411224 [display] Broken binary column when 'Show binary contents' not set 2011-09-19 23:17:13 +05:30
Madhura Jayaratne
5cae094164 Merge branch 'QA_3_4' 2011-09-19 23:08:32 +05:30
Madhura Jayaratne
63d164ca99 bug #3411535 [display] Full text button unchecks results display options 2011-09-19 23:07:42 +05:30
Marc Delisle
87c7d027ac Missing text next to these icons 2011-09-15 12:37:12 -04:00
Piotr Przybylski
1c2dbf0cbb Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/advisory_rules.txt
 2011-08-22 11:18:26 +02:00
Madhura Jayaratne
4db9c176b3 bug #3385954 - unknown table status:Create_time on dispalying view (again) 2011-08-20 07:19:17 +05:30
Piotr Przybylski
1aa438539a Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/common.lib.php
	libraries/config.default.php
	server_synchronize.php
 2011-08-17 16:39:43 +02:00
Madhura Jayaratne
d501fc1fe6 Merge branch 'OpenGIS' 2011-08-17 18:02:25 +05:30
Aris Feryanto
88f3796f1e Grid edit: add datetimepicker support for date, datetime, and timestamp field 2011-08-17 13:12:31 +08:00
Madhura Jayaratne
7d7dd02e8c Merge branch 'master' into OpenGIS 
Conflicts:
	tbl_select.php
 2011-08-13 14:12:46 +05:30
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
a9cd487f0f Fix merge conflict with origin/master 2011-08-10 21:27:31 +08:00
Michal Čihař
c23696fbfa Another ocurence of Prev/Next 2011-08-10 13:14:21 +02:00
Madhura Jayaratne
fa3e058e25 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-08-09 06:16:12 +05:30
Michal Čihař
021e811653 Use standard way for passing messages 2011-08-08 15:23:20 +02:00
Michal Čihař
8f618e6f01 Convert more occurences of inline autosubmit code to external js 2011-08-08 13:29:20 +02:00
Aris Feryanto
c13f3fda43 Fix error caused on previous merge conflict 2011-08-08 17:14:59 +08:00
Aris Feryanto
ca0aa169c0 Fix merge conflict with grid branch 2011-08-08 15:48:51 +08:00
Aris Feryanto
7b3d0f0107 Fix bug - show/hide feature not working correctly (maybe caused by merge error in git) 2011-08-08 14:34:08 +08:00
Aris Feryanto
ba7913a260 Remove inline edit feature 2011-08-08 14:07:59 +08:00
Madhura Jayaratne
0e84927693 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	libraries/common.lib.php
 2011-08-08 07:45:53 +05:30
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
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ř
9998646600 Add some docblocks 2011-08-05 15:46:59 +02:00
Michal Čihař
37ec6cae84 Add some docblocks 2011-08-05 15:23:04 +02:00
Michal Čihař
52375334c3 Add some docblocks 2011-08-05 15:21:24 +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ř
4fb5b65fd2 Remove unused parameter $container from PMA_getIcon 2011-08-04 13:47:44 +02:00
Aris Feryanto
53fec4ac4d Merge branch 'recent' into aris 2011-08-04 18:27:46 +08:00
Piotr Przybylski
11f2c43f11 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-03 23:58:48 +02:00
Madhura Jayaratne
55c6eacf3e Merge branch 'QA_3_4' 2011-08-04 00:07:04 +05:30
Madhura Jayaratne
68e21b05e4 Changelog entry for bug #3383711. Some formatting 2011-08-04 00:04:16 +05:30
Sven Strickroth
7909da2ea0 quick fix for issue #3383711 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2011-08-03 23:48:42 +05:30
Aris Feryanto
341e18b10f Merge branch 'grid' into aris 2011-08-03 11:59:03 +08:00