gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,556 Commits 12 Branches 481 Tags 2.4 GiB
68e0f592fc
Commit Graph

289 Commits

Author SHA1 Message Date
Marc Delisle
85037b0d6a Missing choice for InitialSlidersState 2011-08-27 13:21:55 -04:00
Piotr Przybylski
bd3b7d28d4 Whitespace cleanup 2011-08-25 13:16:06 +02:00
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
46722b8035 Merge branch 'master' into OpenGIS 2011-08-17 16:43:18 +05:30
Piotr Przybylski
970262c435 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-15 12:03:04 +02:00
Piotr Przybylski
e19d93a70c Remove unneeded variables from config.default.php 2011-08-15 11:58:54 +02: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
Marc Delisle
8f7312956d Merge commit '1b7e2f6c7be6c7a96d780a7e9870d498f84e7339' 2011-08-12 14:40:56 -04:00
Aris Feryanto
3a672d43b8 Change the default MaxTableUiprefs to 100 2011-08-12 16:11:17 +08:00
Aris Feryanto
fe7eadab72 Add configuration for maximum tbl_uiprefs records, as suggested by Piotr 2011-08-12 15:49:53 +08:00
Ammar Yasir
57af6f9502 Merge remote branch 'phpmyadmin/master' 
Conflicts:
	js/tbl_select.js
 2011-08-12 00:10:17 +05:30
Aris Feryanto
ca0aa169c0 Fix merge conflict with grid branch 2011-08-08 15:48:51 +08:00
Aris Feryanto
ba7913a260 Remove inline edit feature 2011-08-08 14:07:59 +08:00
Aris Feryanto
79e4e4fb88 Merge branch 'grid' into aris 2011-08-05 09:56:33 +08:00
Aris Feryanto
9adfe5b99c Grid edit: change the default cfg['SaveCellsAtOnce'] to false 2011-08-05 09:56:23 +08:00
Aris Feryanto
0e39df6ca4 add configuration in 'user preferences' and 'setup' to show/hide the Hint created with PMA_createqTip function 2011-08-04 16:27:47 +08:00
Ammar Yasir
e4b676e356 Merge remote branch 'phpmyadmin/master' 2011-08-03 09:15:29 +05:30
Aris Feryanto
11e1ead21c Merge remote-tracking branch 'origin/master' into aris 2011-08-01 17:22:44 +08:00
Madhura Jayaratne
fe10dec01f Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-31 23:25:33 +05:30
Piotr Przybylski
d7bea4d4ee Merge remote-tracking branch 'origin/master' into drizzle 2011-07-31 17:26:18 +02:00
Piotr Przybylski
6a54e26318 Remove information about PHP 4.3, the minimal supported version is now 5.2 2011-07-31 15:07:09 +02:00
Aris Feryanto
b81acce4c9 Merge remote-tracking branch 'origin/master' into grid 2011-07-27 10:16:53 +08:00
Aris Feryanto
4d3c9541de Merge branch 'grid' into aris 2011-07-26 18:33:02 +08:00
Aris Feryanto
338552b21d Grid edit: change cfg['SaveCellsAtOnce'] default to true 2011-07-26 18:32:46 +08:00
Aris Feryanto
4b0cd86ea7 Merge branch 'grid' into aris 2011-07-26 18:30:51 +08:00
Aris Feryanto
cb090c7e21 Grid edit: add configuration to save edited cell(s) at once 2011-07-26 18:30:40 +08:00
Piotr Przybylski
f2935d56d9 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	server_status.php
 2011-07-25 21:55:16 +02:00
Ammar Yasir
18a6f0b070 Merge remote branch 'phpmyadmin/master' 2011-07-25 04:49:22 +05:30
Madhura Jayaratne
ec7feea9b0 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	libraries/import.lib.php
	libraries/zip_extension.lib.php
 2011-07-24 23:05:35 +05:30
Marc Delisle
35a5f31283 Merge branch 'QA_3_4' 2011-07-24 08:08:51 -04:00
Marc Delisle
08ee54d4a4 bug #3358750 [core] With Suhosin, urls are too long in edit links 2011-07-24 08:08:38 -04:00
Ammar Yasir
811996e92a Merge remote branch 'phpmyadmin/master' 2011-07-15 00:38:31 +05:30
Madhura Jayaratne
1d9ef02608 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-13 23:55:14 +05:30
Piotr Przybylski
480fe9f78c Merge remote-tracking branch 'origin/master' into drizzle 2011-07-13 17:37:50 +02:00
Piotr Przybylski
c3d1a8b14a Ignore SkipLockedTables (Drizzle) 2011-07-13 16:59:22 +02:00
Marc Delisle
b2d8e0b60f Clarify directive name: ShowDisplayDir -> ShowDisplayDirection 2011-07-13 09:19:38 -04:00
Madhura
6f4db19f53 Merge remote branch 'origin/master' into OpenGIS 2011-07-08 18:05:52 +05:30
Ammar Yasir
41715e512a Removed mode feature, appended a missing configuration directive and changed help link duration to 10sec 2011-07-07 20:53:32 +05:30
Piotr Przybylski
ff0081bb7a Rename pk_char36 to FUNC_UUID 2011-07-06 19:06:51 +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
66158f66c2 Move DefaultFunctions back to config.default.php 2011-07-06 17:47:07 +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
87a539aea7 Remove *Operators configuration variables 2011-07-06 17:00:33 +02:00
Ammar Yasir
03a1a84b78 Test 2011-07-05 05:21:16 +05:30
Ammar Yasir
78f93fdd3c Merge remote branch 'phpmyadmin/master' 2011-07-04 21:58:47 +05:30
Madhura Jayaratne
1bc0473fe2 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	tbl_replace.php
 2011-07-03 21:42:04 +05:30
Marc Delisle
3c0853dc68 Merge commit '61ea5e765db6c9382ef8fba9ab27737664b2d6cc' 2011-07-03 07:29:03 -04: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