Commit Graph

1075 Commits

Author SHA1 Message Date
Marc Delisle
e71b21b684 English mistake 2010-12-14 09:43:19 -05:00
Marc Delisle
887764266a Clarify hide_db 2010-12-14 09:36:54 -05:00
Marc Delisle
e66884f576 3.4.0-beta1 2010-12-11 06:33:56 -05:00
Herman van Rink
8017a61253 patch #3055886 [config] update, changed boolean to integer for more precise control 2010-12-02 16:31:49 +01:00
Marc Delisle
a93399b8a4 the goal of master is currently to stabilize 3.4.0 2010-12-02 07:37:12 -05:00
Marc Delisle
9c8514fb97 3.5.0-dev 2010-11-22 13:23:08 -05:00
Marc Delisle
3b74d9ba01 credits 2010-11-19 13:07:49 -05:00
Marc Delisle
265f4a74f3 Document column highlighting/marking 2010-11-19 05:58:51 -05:00
Marc Delisle
fff8f28a53 Merge branch 'QA_3_3' 2010-10-29 05:39:02 -04:00
Marc Delisle
540cd447a3 bug [doc] Fix references to MySQL doc 2010-10-29 05:38:12 -04:00
Marc Delisle
266b8e3aaf 3.3.9-dev 2010-10-18 06:09:38 -04:00
Marc Delisle
9cbd454fce Credit for Charts project 2010-10-14 06:17:57 -04:00
Marc Delisle
38334e4f91 CtrlArrowsMoving not really needed as an option, now always active 2010-10-04 08:07:48 -04:00
Crack
1d8c5cbf3c fix docs 2010-09-21 13:43:56 +02:00
Michal Čihař
0431042bd0 Drop $Id$ expansion, nobody complained so far it not working. 2010-09-07 15:00:44 +02:00
Herman van Rink
223d8850cf patch #3055886 [config] Add Left frame table filter visibility config option, thanks to eesau 2010-09-02 14:35:30 +02:00
Michal Čihař
92313cbbae Merge branch 'MAINT_3_3_7' into QA_3_3 2010-09-01 11:49:20 +02:00
Michal Čihař
1468940b78 Adjust year. 2010-09-01 11:49:04 +02:00
Marc Delisle
9b846d65a8 3.3.8-dev 2010-08-31 12:11:49 -04:00
Marc Delisle
c39c407bb5 3.3.7-rc1 release 2010-08-31 12:09:07 -04:00
Michal Čihař
7f1b1df69f [core] Remove last remaining parts of profiling code which was removed in 2006. 2010-08-30 11:01:31 +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
Marc Delisle
9a9399e07a Credits for Ninad Pundalik 2010-08-27 17:50:20 -04:00
ninadsp
9c34a0eec9 Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches 2010-08-28 01:53:52 +05:30
Herman van Rink
b477c4cb1a Merge branch 'blinky/master' into gsoc2010-blinky
Conflicts:
	Documentation.html - renumbered 6.28 to 6.29
2010-08-25 16:59:54 +02:00
Michal Čihař
0b015eeb5d These refer to no longer existing error message. 2010-08-23 13:39:14 +02:00
Michal Čihař
e1c7efb807 This FAQ is describing some ancient versions. 2010-08-23 13:33:51 +02:00
Michal Čihař
a750fc2fdb Fix html. 2010-08-23 13:28:50 +02:00
Michal Čihař
cde7019f3c Better anchor. 2010-08-23 13:28:36 +02:00
Michal Čihař
132884f394 Fix html. 2010-08-23 13:28:09 +02:00
Michal Čihař
209019efef Advanced authentication is gone for ages. 2010-08-23 13:27:23 +02:00
Michal Čihař
03d3062a65 Credits and changelog for Lori. 2010-08-23 11:17:15 +02:00
Michal Čihař
4a75c9b26e Changelog and credits for schema export. 2010-08-23 11:14:30 +02:00
Michal Čihař
5a51858352 [relations] Dropped WYSIWYG-PDF configuration variable. 2010-08-23 11:05:12 +02:00
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Marc Delisle
2c345d1087 credit for user preferences; new terminology (configuration storage) 2010-08-21 08:09:24 -04:00
Marc Delisle
82acbb2ba3 fix merge conflicts 2010-08-21 07:46:57 -04:00
Marc Delisle
9036ac09e3 3.3.7-dev 2010-08-20 13:03:13 -04:00
Michal Čihař
5f837f08c9 Merge branch 'QA_3_3' 2010-08-20 11:02:50 +02:00
Michal Čihař
a29323a1a6 bug #3044189 [doc] Cleared documentation for hide_db. 2010-08-20 11:02:38 +02:00
Crack
b8cee3086b Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
	js/functions.js
	js/tooltip.js
	libraries/config.default.php
	libraries/config.values.php
	libraries/display_export.lib.php
	setup/lib/forms.inc.php
	setup/lib/messages.inc.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php
2010-08-19 14:45:18 +02:00
ninadsp
c0ee037c59 Resolved a Merge Conflict 2010-08-17 18:25:03 +05:30
Martynas Mickevicius
b32e5879fd Merge commit 'origin/master' into local 2010-08-16 01:01:30 +03:00
Martynas Mickevicius
6c9f949613 added entry in the faq 2010-08-15 15:10:32 +03:00
lorilee
c424dbee38 Added documentation for quick/custom export 2010-08-14 14:52:12 -07:00
Michal Čihař
b51a217c36 Use html entities for utf-8. 2010-08-14 21:53:48 +02:00
Michal Čihař
a918991d86 Add closing HTML tags. 2010-08-14 21:52:38 +02:00
ninadsp
95a8521f11 Merge remote branch 'origin/master' 2010-08-10 00:55:22 +05:30
Marc Delisle
ba038ed6e1 fix merge conflict 2010-08-07 07:10:18 -04:00
Marc Delisle
789d3a4131 Withdraw or edit FAQ entries related to older MySQL or PHP 2010-08-07 07:08:11 -04:00