Commit Graph

1196 Commits

Author SHA1 Message Date
Marc Delisle
4ba58c71d5 Fix merge conflicts 2011-09-26 12:31:18 -04:00
Marc Delisle
22aaa6d9c5 Document that a public bookmark having the same name as the table is not executed 2011-09-26 12:25:31 -04:00
Rouslan Placella
2c9b0b2675 Added myself to the credits section in Documentation.html 2011-09-14 23:47:51 +01:00
Isaac Bennetch
c38cf7eacc Language fixes in documentation 2011-09-13 09:48:06 +02:00
Marc Delisle
e2864a383e Merge branch 'QA_3_4' 2011-09-04 08:27:20 -04:00
Marc Delisle
2694b3dae0 Missing UserprefsDeveloperTab doc 2011-09-04 08:26:21 -04:00
Marc Delisle
1b5461dc75 3.4.6-dev 2011-09-02 12:42:55 -04:00
Michal Čihař
169d42242e Fix html 2011-08-26 09:05:25 +02:00
Dieter Adriaenssens
04772d6d8f fix link 2011-08-25 19:35:25 +02:00
Piotr Przybylski
3986ec730e Docs 2011-08-24 21:51:35 +02: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
Marc Delisle
4adf3478e6 Typo, English improvements 2011-08-20 07:35:38 -04:00
Ammar Yasir
b441555d68 Added FAQ in Documentation.html about 'How to use Zoom search feature?' (FAQ 6.32) 2011-08-20 10:58:33 +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ř
3fe234a029 Move PMD help to documentation 2011-08-19 12:55:49 +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
Piotr Przybylski
bcce8b2767 Credits in docs 2011-08-16 16:13:52 +02:00
Madhura Jayaratne
5e11e88a14 Mention the use of TempDir for ESRI Shapefile imports 2011-08-13 17:31:38 +05:30
Madhura Jayaratne
5744b9622d Documentation about importing ESRI Shapefiles 2011-08-13 17:24:39 +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
fcb28593e8 In this context, field is really a column 2011-08-12 08:21:05 -04:00
Marc Delisle
98773d5542 Typo 2011-08-12 08:17:39 -04:00
Marc Delisle
19b475694a Row is a better term for record 2011-08-12 08:16:33 -04:00
Marc Delisle
f45075db92 Reword some doc 2011-08-12 08:12:51 -04:00
Aris Feryanto
3f10465d71 Fix merge conflict with origin/master 2011-08-12 15:56:26 +08:00
Aris Feryanto
fe7eadab72 Add configuration for maximum tbl_uiprefs records, as suggested by Piotr 2011-08-12 15:49:53 +08:00
Dieter Adriaenssens
435c147aeb Merge branch 'QA_3_4' 2011-08-11 20:53:21 +02:00
Dieter Adriaenssens
f7d3a72af0 remove another mention of Excel export 2011-08-11 20:50:14 +02:00
Dieter Adriaenssens
fd383934af Merge branch 'QA_3_4' 2011-08-10 20:58:45 +02:00
Dieter Adriaenssens
556636457a Remove library PHPExcel, due to license issues
Remove native Excel exportand import modules (xls and xlsx formats)
2011-08-10 20:53:51 +02:00
Aris Feryanto
a9cd487f0f Fix merge conflict with origin/master 2011-08-10 21:27:31 +08:00
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
Madhura Jayaratne
969c59e8a6 Merge branch 'QA_3_4'
Conflicts:
	server_status.php
2011-08-07 18:21:34 +05:30
Madhura Jayaratne
7b13b6f864 Documentation about suhosin.get.max_value_length limitation 2011-08-07 18:08:25 +05:30
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
Aris Feryanto
11e1ead21c Merge remote-tracking branch 'origin/master' into aris 2011-08-01 17:22:44 +08:00
Piotr Przybylski
d7bea4d4ee Merge remote-tracking branch 'origin/master' into drizzle 2011-07-31 17:26:18 +02:00
Piotr Przybylski
43bd03562d mysqli is the recommended extension, not mysql 2011-07-31 15:11:00 +02:00
Piotr Przybylski
06365982c5 Withdraw FAQ 1.33
It concerns PHP 5.0.4 only, minimal supported version is now 5.2
2011-07-31 15:10:01 +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
49a4ee05c9 Merge remote-tracking branch 'origin/master' into aris 2011-07-29 18:12:41 +08:00
Piotr Przybylski
0eca09ffff Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/dbi/mysqli.dbi.lib.php
2011-07-27 20:10:38 +02:00
Piotr Przybylski
b9ff7b7ce2 Support persistent connections with mysqli extension (only PHP 5.3.0 and newer) 2011-07-27 19:59:49 +02:00
Aris Feryanto
b81acce4c9 Merge remote-tracking branch 'origin/master' into grid 2011-07-27 10:16:53 +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
Marc Delisle
871aaa9b64 3.4.5-dev 2011-07-25 10:12:37 -04:00
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ř
d55306252b Replace tabs with spaces, cleanup identation 2011-07-22 10:15:08 +02:00