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

1245 Commits

Author SHA1 Message Date
Marc Delisle
b2d8e0b60f Clarify directive name: ShowDisplayDir -> ShowDisplayDirection 2011-07-13 09:19:38 -04: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
87a539aea7 Remove *Operators configuration variables 2011-07-06 17:00:33 +02:00
Aris Feryanto
c4ee218fb5 Navigation bar: more compact, display horizontal/vertical mode only when configured 2011-07-01 11:31:30 +08:00
Piotr Przybylski
e38b5cd4ff Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_structure.php
	libraries/common.lib.php
	libraries/database_interface.lib.php
	tbl_structure.php
 2011-06-23 14:02:58 +02:00
Piotr Przybylski
9365825f52 Hide connection collation select on home page when connected to Drizzle server 2011-06-22 23:58:02 +02:00
Marc Delisle
7ecb1abaa4 3.4.4-dev 2011-06-20 12:21:11 -04:00
Rouslan Placella
a0504f47d6 Merge branch 'master' into rte 2011-06-17 17:12:36 +01:00
Aris Feryanto
169686bccf Merge branch 'colresize' into aris 2011-06-11 10:23:11 +07:00
Rouslan Placella
a07a1d997c Merge branch 'master' into rte 2011-06-09 21:26:26 +01:00
Yuichiro
412bb22b39 Fix typo in documentation 2011-06-09 09:09:49 +02:00
Aris Feryanto
c991a19ceb Merge remote-tracking branch 'origin/master' into aris 2011-06-07 18:26:18 +07:00
Rouslan Placella
0189a62776 Merge branch 'master' into rte 2011-06-06 17:18:35 +01:00
Michal Čihař
72886c3c8a Add option to call extenal script from signon method 2011-06-06 17:13:15 +02:00
Rouslan Placella
c27b2e776b Merge branch 'master' into rte 2011-06-06 12:44:15 +01:00
Aris Feryanto
1a66a483cf Merge remote-tracking branch 'origin/master' into aris 2011-06-06 14:58:24 +07:00
Marc Delisle
47528c2048 Document DisableMultiTableMaintenance 2011-06-05 07:02:19 -04:00
Aris Feryanto
0e73a2e1b3 Merge branch 'colresize' into aris 2011-06-03 09:59:56 +07:00
Marc Delisle
8feecf6647 3.4.3-dev 2011-06-02 12:16:51 -04:00
Rouslan Placella
255d7dcf00 Merge remote-tracking branch 'origin/master' into rte 2011-06-02 11:07:24 +01:00
Michal Čihař
d5f18d4e7f Merge branch 'integration' 
Conflicts:
	libraries/config/setup.forms.php
	libraries/config/user_preferences.forms.php
 2011-06-02 11:41:31 +02:00
Rouslan Placella
860250f020 Fix bug #3302961 - Row check boxes missing when table row links are disabled 2011-06-02 11:39:57 +02:00
Rouslan Placella
054fd49a04 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into rte 2011-05-30 13:34:18 +01:00
Aris Feryanto
518638fa87 Merge branch 'tablesorting' into aris 2011-05-27 19:09:35 +07:00
Aris Feryanto
c40fed887e Merge branch 'recent' into aris 2011-05-27 19:09:30 +07:00
Aris Feryanto
ad6e109e0e Fix RecentTable class -> PMA_RecentTable, some fix on documentation 2011-05-27 19:03:47 +07:00
Aris Feryanto
e4ba1dc066 Add table pma_ui_prefs for remembering table sorting persistently 2011-05-27 18:52:00 +07:00
Rouslan Placella
0659c39435 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into rte 2011-05-24 22:33:51 +01:00
Marc Delisle
8f2a040f41 Merge commit 'ab6d16ed2f4728c9f066353a851621a352ef969f' 2011-05-24 08:18:25 -04:00
Aris Feryanto
81f9537778 Add new configuration field for RememberSorting 2011-05-24 14:50:47 +07:00
Aris Feryanto
8f99ac7a28 Merge remote-tracking branch 'origin/master' into browsemode 2011-05-24 08:42:32 +07:00
Rouslan
ebce205059 Updated documentation 2011-05-21 18:10:46 +01:00
Michal Čihař
4e706c3aa0 Document that naming sigon session phpMyAdmin is not a good idea 2011-05-19 10:07:12 +02:00
Marc Delisle
9a8407e5ce 3.4.2-dev 2011-05-17 07:43:15 -04:00
Aris Feryanto
fadd8994cc Documentation for cfg_LeftRecentTable updated 2011-05-11 11:27:47 +07:00
Aris Feryanto
4ab5d6aded Update documentation and string for the pma_recent 2011-05-10 20:42:48 +07:00
Aris Feryanto
b8c654d748 Updated target release 3.5.0 for 'recent' feature in Documentation.html 2011-05-10 09:56:24 +07:00
Aris Feryanto
c468705538 Add PMA_addRecentTable function, jQuery for recent tables 'onchange' event 2011-05-10 01:55:02 +07:00
Marc Delisle
9d42dfc1c4 3.4.1-dev 2011-05-07 11:06:15 -04:00
Marc Delisle
fd1ac3cdac 3.5.0-dev 2011-05-06 06:13:40 -04:00
Marc Delisle
7af7e26cfb 3.4.0-rc3-dev 2011-04-26 12:25:54 -04:00
Marc Delisle
032b3a193f 3.4.0-rc2 2011-04-26 12:03:49 -04:00
Marc Delisle
57e3aba8ff Bug #3168733 Synchronization does not honor AllowArbitraryServer 2011-04-20 06:32:00 -04:00
Marc Delisle
5381b2f600 3.4.0-rc2-dev 2011-04-16 13:40:46 -04:00
Marc Delisle
c13f25d491 3.4.0-rc1 2011-04-16 13:10:24 -04:00
Michal Čihař
6c85df23d4 Fix markup 2011-04-06 10:04:42 +02:00
Michal Čihař
26a4a09c11 Display warning about incomplete translations 2011-04-06 09:48:20 +02:00
Dieter Adriaenssens
fecfe761f9 drop Devel: prefix in links to wiki 2011-03-29 10:02:02 +02:00
Marc Delisle
269981cbd7 Mention JSON support requirement (needed for Inline edit and user preferences) 2011-03-19 17:17:11 -04:00
Marc Delisle
09605e2d81 3.4.0-rc1-dev 2011-03-12 08:01:26 -05:00
Marc Delisle
65a72fbeec 3.4.0-beta4 2011-03-12 07:22:05 -05:00
Michal Čihař
8149492cbe rfe #1640812 [auth] Add example for OpenID authentication using signon method. 2011-03-02 13:46:43 +01:00
Isaac Bennetch
29eca5a894 Re-order two documentation items for consistency. 2011-02-16 09:18:03 +01:00
Marc Delisle
1e1b92af40 3.4.0-beta4-dev 2011-02-12 13:16:33 -05:00
Marc Delisle
8219dbdf41 3.4.0-beta3 2011-02-12 13:01:58 -05:00
Marc Delisle
67d23c0c16 Clarify the meaning of these directives 2011-02-09 07:55:38 -05:00
Marc Delisle
56776dd0ed Clarify FAQ 6.18 2011-02-06 16:44:23 -05:00
Michal Čihař
42c8e65139 Make version check configurable. 2011-02-02 14:32:46 +01:00
Michal Čihař
775abf7392 No longer used variable. 
As the database name from the navigation frame was dropped, this is
useless.
 2011-02-02 14:21:12 +01:00
Marc Delisle
1e84e0b7bc Typo in FAQ number 2011-01-31 12:26:42 -05:00
Marc Delisle
82d6f8bfd8 Clarify which MariaDB versions were tested 2011-01-31 06:41:44 -05:00
Marc Delisle
534d93fa46 MariaDB support explicitely stated 
Fixed minor typos
 2011-01-30 08:45:50 -05:00
Marc Delisle
2f751fbf94 Document AjaxEnable directive 2011-01-28 12:30:47 -05:00
Marc Delisle
09707e0677 Credits for TCPDF 2011-01-19 12:54:52 -05:00
Marc Delisle
9f8c3c8e60 Update FAQ entry with MySQL 5.1 2011-01-10 13:57:54 -05:00
Marc Delisle
cc36378f08 Withdraw outdated FAQ entry 2011-01-10 13:52:00 -05:00
Marc Delisle
44f99c2f47 Working on 3.4.0-beta3 2011-01-07 11:16:29 -05:00
Marc Delisle
c46844e4ae 3.4.0-beta2 2011-01-07 10:41:07 -05:00
Michal Čihař
70bc1761c3 Drop translators.html and all references to it. 
The list is absolutely not up to date and it makes no sense in
maintaining it in addition to history of po files in git.
 2010-12-31 15:51:34 +01:00
Michal Čihař
bbca0565ce Unify terminology for CSS/HTML colors. 2010-12-31 15:23:53 +01:00
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
Crack
97c939f8df Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-08-06 15:24:15 +02:00
ninadsp
a458147969 Merge from upstream. Resolved a conflict in js/functions.js 2010-08-05 23:51:14 +05:30
Marc Delisle
d46bb6d877 remove custom MIME type change for BLOB streaming because in its current version it can be a very costly operation 2010-08-03 16:21:17 -04:00
Marc Delisle
b2a55f1ef2 For BLOB streaming, LONGBLOB colum must be nullable 2010-08-03 12:43:45 -04:00
Isaac Bennetch
6383f23035 patch #3038293 [doc] Language and grammar fixes 2010-08-03 12:39:02 -04:00
Crack
53e8d75c0f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/db_links.inc.php
	libraries/tbl_links.inc.php
 2010-08-01 23:19:21 +02:00
Marc Delisle
57f51bfda5 clarify the doc 2010-07-31 14:22:45 -04:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Michal Čihař
39aa4355a9 Convert default queries to unified expansion. 2010-07-27 10:01:58 +02:00
Crack
7db978de3f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/config.values.php
 2010-07-26 20:24:57 +02:00
Michal Čihař
cfc7fd7a2d The linked-tables infrastructure is now called phpMyAdmin configuration storage. 2010-07-26 17:16:55 +02:00
Crack
2d67cb58c4 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/relation.lib.php
 2010-07-24 18:34:52 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Marc Delisle
aec1adb0e0 credit for new BLOB streaming support 2010-07-23 10:13:49 -04:00
Marc Delisle
9232e02372 BLOB streaming doc 2010-07-23 09:10:24 -04:00
Crack
7b0135ed6a fix port number validation 
correct naming mistake (authentication != authorization)
setup script: move server authentication settings to new tab
 2010-07-21 16:11:02 +02:00
Michal Čihař
a1e1e44149 Cleanup SQL validator documentation. 2010-07-21 13:50:33 +02:00
Michal Čihař
1faec011d0 SQL validator works also with SOAP PHP extension. 2010-07-21 13:17:15 +02:00
Michal Čihař
dba7151245 Document new format strings. 2010-07-21 10:05:55 +02:00
Michal Čihař
5908ab72bc Clarify database upgrade instructions. 
We don't want to maintain all new tables in upgrade script as well.
 2010-07-21 09:07:59 +02:00
Crack
fab6eb09ea Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-20 12:30:03 +02:00
Crack
52550eff13 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Resolved conflicts:
	setup/lib/forms.inc.php
	setup/lib/messages.inc.php
 2010-07-20 12:19:21 +02:00
Michal Čihař
11e53fb141 [core] Dropped AllowAnywhereRecoding configuration variable. 
It really does not make sense these days, now the recoding of
export/import is available when the necessary extensions are loaded and
it is possible to disable it using RecodingEngine directive.
 2010-07-20 12:05:07 +02:00
Michal Čihař
a4055b4773 [core] RecodingEngine now accepts none as valid option. 2010-07-20 11:56:21 +02:00
Michal Čihař
d7192b3a95 DefaultCharset is not used anywhere. 2010-07-20 11:52:33 +02:00
ninadsp
e7b130baf7 Merge remote branch 'origin/master' 2010-07-19 21:54:37 +05:30
Crack
4376f6ce14 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-19 16:04:50 +02:00
Marc Delisle
828d008838 3.3.6-dev 2010-07-18 14:34:32 -04:00
Marc Delisle
04fc2f62b0 fix merge conflict 2010-07-17 09:56:24 -04:00
Marc Delisle
0b9cf14f75 typo 2010-07-17 09:54:54 -04:00