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

299 Commits

Author SHA1 Message Date
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
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
82acbb2ba3 fix merge conflicts 2010-08-21 07:46:57 -04:00
Crack
a5417a0ce7 add custom-no-form to Export/method 2010-08-19 20:35:49 +02:00
Crack
e344696016 account for changes introduced when merging lori/gsoc branch 2010-08-19 16:36:41 +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
Michal Čihař
6aefc832ad Fixes for JSON plugin. 2010-08-19 14:05:04 +02:00
lorilee
955df80a30 Set properties to be text and icons by default 2010-08-14 11:47:44 -07:00
lorilee
5dafeb467f Added Quick export options 2010-08-10 22:12:46 -07: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
lorilee
f1686d5172 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 
Conflicts:
	libraries/display_export.lib.php
 2010-07-29 14:12:36 -07:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
lorilee
8120a00af7 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-28 15:03:28 -07:00
Marc Delisle
d0fc397fe1 new database format string 2010-07-28 13:05:24 -04:00
Michal Čihař
39aa4355a9 Convert default queries to unified expansion. 2010-07-27 10:01:58 +02:00
lorilee
428053bef5 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-26 13:44:30 -07:00
lorilee
2a59451ac5 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	server_export.php
 2010-07-26 13:42:42 -07: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ř
ed34bb9054 Adjust documentation to gettext. 2010-07-26 16:41:49 +02:00
Crack
b39567f381 revert disable/* options 2010-07-25 22:58:14 +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
lorilee
89b0a3082e Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 
Conflicts:
	libraries/display_export.lib.php
 2010-07-23 21:06:46 -07:00
lorilee
723a71c014 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/export/latex.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php
 2010-07-23 20:43:35 -07:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Crack
2e55d85ab5 Developers tab no longer depends on UserprefsDisallow, introduced UserprefsDeveloperTab setting 2010-07-22 20:04:16 +02:00
Marc Delisle
ec9a60f8e0 undefined variables; unneeded config variables 2010-07-22 13:22:30 -04:00
Crack
7ac7e24d8c more styling for disabled options 
new "Developer" tab (by default all options are disabled, users can't modify them)
fixed UserprefsDisallow export in setup script
 2010-07-22 01:29:36 +02:00
Michal Čihař
906d7bc632 By default use new format strings. 2010-07-21 10:06:16 +02:00
Crack
cc9b5c9028 mark fields that user can disable in setup script 2010-07-21 01:21:32 +02:00
lorilee
aa49b85fad Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 
Conflicts:
	libraries/display_export.lib.php
 2010-07-20 15:23:12 -07:00
lorilee
2ebf96d242 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/display_export.lib.php
	libraries/display_import.lib.php
 2010-07-20 13:04:03 -07:00
Crack
43a7629da9 Users can disable: AllowUserDropDatabase, UseDbSearch, QueryHistoryDB, ShowPhpInfo, ShowChgPassword 
Users can change: QueryHistoryMax (must be lower than value from file config)
 2010-07-20 21:57:05 +02:00
Michal Čihař
0b86b981bb This comment looks totally irellevant. 2010-07-20 15:29:06 +02:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +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
lorilee
7786d9421e Changed the default CSV column separator from a comma to a semi-colon 2010-07-16 00:12:13 -07:00
lorilee
27bc09c939 Merge branch 'master' of http://repo.or.cz/r/phpmyadmin 2010-07-12 12:40:27 -07:00
ninadsp
f06bb69bb8 Merge remote branch 'origin/master' 2010-07-12 22:47:17 +05:30
Crack
74eb921e68 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-12 14:04:16 +02:00
lorilee
edc8846de8 Changed the default CSV column separator from a comma to a semi-colon 2010-07-08 13:41:15 -07:00
ninadsp
020dac8c89 Merge remote branch 'origin/master' 2010-07-07 18:53:41 +05:30
Marc Delisle
d4f6b5c4ba Merge branch 'QA_3_3' 2010-07-07 06:13:38 -04:00
Marc Delisle
8a153086a1 revert to previous value and add a comment in default configuration file 2010-07-07 06:13:06 -04:00
Marc Delisle
bd09ef50ff Merge branch 'QA_3_3' 2010-07-06 16:58:50 -04:00
Marc Delisle
9903c5f3d0 bug #3025975 [auth] Odd LoginCookieValidity default value 2010-07-06 16:58:13 -04:00
lorilee
3c1e06a3e6 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-06 11:04:06 -07:00
lorilee
f06363811c Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-06 10:58:17 -07:00
Crack
93d49e8ca8 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-05 19:37:03 +02:00
Crack
2fab9fbf28 Export options 2010-07-03 22:45:14 +02:00
ninadsp
e049c1d158 Merge remote branch 'origin/master' 
Conflicts:
	po/fr.po
	po/sl.po
 2010-07-03 21:00:08 +05:30
Marc Delisle
9e857f9f84 fix merge conflicts 2010-07-02 12:32:00 -04:00
Marc Delisle
6ea9467949 bug #3024344 [setup] Setup forces numeric MemoryLimit 2010-07-02 12:26:54 -04:00
Crack
b13dee72f3 Import settings 2010-07-01 22:24:18 +02:00
Crack
e5238f3845 add $cfg['UserprefsDisallow'] and allow setting it in setup script 
correct IE opacity issue for "restore default value" button
fix regressions introduced in previous commit
 2010-06-21 19:12:25 +02:00
Crack
b2e232b582 Added pmadb table for preferences storage 
Removed some messages from messages.inc.php
 2010-06-18 17:53:53 +02:00
lorilee
d5ba4231ec SQL export option "CREATE PROCEDURE / FUNCTION / EVENT" default set to true 2010-06-15 23:37:25 -04:00
Crack
a90b0a21f2 removed some messages from messages.inc.php (validation, some other error messages) 
User preferences:
added translations and values for some fields
validation for DefaultPropDisplay
 2010-06-13 15:01:37 +02:00
lorilee
56ee880bbf Added default for XML structure/data 2010-06-11 01:26:35 -04:00
lorilee
d6bb5ad2b5 Updated defaults for structure/data for several plugins 2010-06-11 01:26:33 -04:00
lorilee
737cc1a5c6 Added new variables to reflect new form fields in export page 
Updated variable names and values to reflect form field name changes in new export page
 2010-06-11 01:26:33 -04:00
lorilee
0f96d078fd Added default for XML structure/data 2010-06-11 01:10:53 -04:00
lorilee
676cc83520 Updated defaults for structure/data for several plugins 2010-06-09 20:23:21 -04:00
lorilee
f91bcdbdbe Added new variables to reflect new form fields in export page 
Updated variable names and values to reflect form field name changes in new export page
 2010-06-08 22:43:25 -04:00
ninadsp
38ac78e3ba merging changes from origin 2010-05-24 18:32:42 +05:30
Michal Čihař
e0129770dc Get rid of strDocu. 2010-05-24 11:29:35 +02:00
ninadsp
bed1948d04 testing git setup - no major change made in code yet 
only added a few comments
 2010-05-23 01:22:01 +05:30
Marc Delisle
c78ee96697 gettext conversion 2010-05-20 07:49:15 -04:00
Michal Čihař
87d19393b3 rfe #2972969 [interface] Fix flipping of headers in non-IE browsers. 2010-04-16 15:41:13 +02:00
Michal Čihař
84d25c0c00 rfe #2981999 [interface] Default sort order is now SMART. 2010-04-16 15:13:43 +02:00
Michal Čihař
f9ccd69538 Remove no longer needed language file names. 2010-04-09 13:57:36 +02:00
Brian Douglass
6e68e2d149 Patch #2981165 Optionally disable the Type column 2010-04-05 10:06:36 -04:00
Marc Delisle
3ca82375d5 continue removing author names in code 2010-04-05 09:16:36 -04:00
Michal Čihař
5ac73aff21 This option does nothing. 2010-04-02 10:01:49 +02:00
Martynas Mickevičius
dbd83fa123 Patch #2975533 New search operators 2010-03-29 17:26:27 -04:00
Marc Delisle
775d2ce264 clarify the effect of the Confirm directive 2010-03-28 07:26:05 -04:00
Marc Delisle
8b221f354b typos 2010-03-16 12:49:07 -04:00
Marc Delisle
e2aaeaf1d6 typos 2010-03-16 12:47:42 -04:00
Marc Delisle
819324ede6 remove author names, as discussed at the 2010 developer meeting and according to the book Producing Open Source Software 2010-03-06 18:04:17 +00:00
Marc Delisle
4ad6f11561 patch #2948421 HTTP Basic auth realm name 2010-02-24 16:48:52 +00:00
Michal Čihař
8ef8f753cb Better documentation. 2010-01-25 12:45:21 +00:00
Michal Čihař
7f9126fde9 rfe #1379201 [core] Add option to configure session_save_path. 2010-01-22 17:46:55 +00:00
Michal Čihař
1243d870e7 rfe #2420684 [export] Allow export of timestamps in UTC. 2010-01-21 11:10:33 +00:00
Marc Delisle
a04da7df12 new option DisplayBinaryAsHex (was used but no default had been defined) 2010-01-19 12:49:06 +00:00
Marc Delisle
3c449953a2 new option DisplayBinaryAsHex (was used but no default had been defined) 2010-01-19 12:49:06 +00:00
Michal Čihař
2c5f033a0d rfe #2816943 [interface] Add REGEXP ^...$ to select dialog. 2010-01-13 13:31:33 +00:00
Marc Delisle
526dce65cb 3.3 2009-12-31 13:11:19 +00:00
Marc Delisle
f3833884e4 3.3 2009-12-31 13:09:18 +00:00
Marc Delisle
20208dceb2 better to set tracking to false by default to avoid overhead 2009-12-27 13:17:37 +00:00
Marc Delisle
e9777b1261 bug #2910000 [gui] ShowServerInfo should hide all server info from main page 2009-12-09 17:53:48 +00:00
Marc Delisle
8c2c7f0b99 better default for Export "asfile" 2009-11-03 13:10:44 +00:00
Marc Delisle
b95bffb1b5 rfe #2823686 [interface] Increase default height of query window 2009-11-01 12:37:55 +00:00
Marc Delisle
df80bf5a3b group related directives 2009-09-20 10:41:28 +00:00
Michal Čihař
87eaa7d3d4 Add some missing defatults for tracker. 2009-08-25 13:13:32 +00:00
Marc Delisle
15441ded5d do not try to display a tab that was not built 2009-08-22 11:22:50 +00:00
Marc Delisle
b61a1cb71f rfe #2822190 [structure] BOOLEAN is standard SQL 2009-07-16 08:33:23 +00:00
Marc Delisle
8fab915129 these are not default values but suggested values 2009-07-13 17:21:02 +00:00
Marc Delisle
a422f9a129 bug [display] handle NavigationBarIconic as documented for navi buttons 2009-06-06 16:01:05 +00:00
Michal Čihař
4a2bff1aed rfe #2726479 [core] configurable maximal length of URL 2009-06-02 11:08:16 +00:00
Marc Delisle
2e8bff71ea bug #2650776 [import] SQL_MODE not saved during Partial Import 2009-04-08 11:47:25 +00:00
Herman van Rink
2b0fbdd588 improved comment 2009-03-10 13:31:35 +00:00
Michal Čihař
a09b9c2bb2 rfe #2123386 Added option to disable mcrypt warning. 2009-03-03 11:07:04 +00:00
Marc Delisle
4b67c7483f [auth] New setting AllowNoPassword (supercedes AllowNoPasswordRoot) that applies to all accounts (even the anonymous user) 2009-03-02 16:19:36 +00:00
Marc Delisle
683bfba6c2 document that a feature is not implemented yet 2008-12-22 17:32:17 +00:00
Marc Delisle
9b5b648e65 patch #1821619 [privileges] Extra back reference when editing table-specific privileges 2008-12-08 17:39:30 +00:00
Michal Čihař
7676f7e1b5 rfe #2100910 configurable default charset for import 2008-11-30 13:53:40 +00:00
Michal Čihař
4a42835160 Default LoginCookieValidity is now same value as default for session.gc_maxlifetime. 2008-11-30 13:36:58 +00:00
Marc Delisle
c9d622af42 typos 2008-11-29 19:28:18 +00:00
Michal Čihař
ebeb0c319f Adding @package, first part. 2008-11-24 10:32:56 +00:00
Michal Čihař
9561f56875 Fix some phpdoc errors. 2008-11-24 09:55:30 +00:00
Marc Delisle
c3c3d86216 bug #2187193 [interface] ShowChgPassword setting not respected 2008-10-22 17:03:22 +00:00
Piotr Przybylski
0c378ef487 fix comment 2008-10-06 16:55:22 +00:00
Marc Delisle
9aac630f6b rfe #1276463 [search] Search empty/not empty values 2008-10-04 12:05:00 +00:00
Michal Čihař
04570f5eb7 rfe #1612724 [export] add option to export without comments 2008-09-03 16:08:14 +00:00
Michal Čihař
e0987bfbc8 do not allow root user without password unless explicitly enabled by AllowEmptyRoot 2008-09-03 13:45:12 +00:00
Michal Čihař
c2489bc131 cookie authentication is now default 2008-09-03 13:33:02 +00:00
Marc Delisle
e77938bb20 BLOBstreaming support (Google Summer of Code 2008, Raj Kissu Rajandran) -- work in progress 2008-08-20 17:04:37 +00:00
Marc Delisle
1bd7ec70e2 bug #2046883 [core] Notices about deprecated dl() (so stop using it) 2008-08-16 14:06:27 +00:00
Marc Delisle
2be085f774 typos and comment improvements, thanks to Piotr Przybylski 2008-08-16 11:39:49 +00:00
Marc Delisle
152a7342fd protection against cross-frame scripting 2008-07-24 17:12:32 +00:00
Marc Delisle
fdff4d6b71 patch #1972915 version 3 + Luc modifs + Marc modifs (link in contrib/swekey.sample.conf 2008-06-17 17:20:53 +00:00
Michal Čihař
d328affeef This is a number. 2008-06-17 12:16:57 +00:00
Marc Delisle
f5a76baa0c [auth] support Feebee hardware authentication 2008-06-12 12:36:10 +00:00
Michal Čihař
1e29fc466e Complete docs for controuser/controlpass. 2008-06-02 13:21:47 +00:00
Marc Delisle
b9baa825c1 display options (work in progress) 2008-05-21 15:49:57 +00:00
Sebastian Mendel
5cfa78a087 added permanently ON UPDATE CURRENT_TIMESTAMP to column attributes (use case like in the MySQL manual) 2008-05-07 08:41:15 +00:00
Sebastian Mendel
c4948d0e76 added permanently ON UPDATE CURRENT_TIMESTAMP to column attributes 2008-05-07 08:35:46 +00:00
Marc Delisle
47445e0699 bug #1863326 [GUI] Wrong error message / no edit (Suhosin) 2008-02-09 16:09:54 +00:00
Marc Delisle
71763eb71b status should be state 2008-02-02 11:38:29 +00:00
Marc Delisle
c8283e68d4 typos 2008-01-30 17:43:58 +00:00
Sebastian Mendel
10cf3d2c7d [config] new parameter $cfg['Servers'][$i]['CountTables'] = true; set to false for speed improvements with many databases 2008-01-29 13:46:05 +00:00
Sebastian Mendel
d80d5ee2f3 [config] new parameter $cfg['Servers'][$i]['ShowDatabasesCommand'] 2008-01-29 13:17:07 +00:00
Sebastian Mendel
6207216296 differ between PHP and SQL debugging 2008-01-22 08:19:52 +00:00
Marc Delisle
2a6119d393 start to use Mootools for slider effects 2008-01-17 13:48:22 +00:00
Michal Čihař
83606fda0b Fix typo. 2008-01-16 02:17:22 +00:00
Michal Čihař
1e7c368ae6 Add Texy! export defaults. 2008-01-16 02:16:28 +00:00
Sebastian Mendel
bb70f2d7b6 rfe #1741101, patch #1798184 UUID default for CHAR(36) PRIMARY KEY, thanks to Gert Palok - gert_p 2007-12-13 17:25:59 +00:00
Sebastian Mendel
45fb839b19 added spatial functions for 'insert new row' function select box; 
updated all other functions in list;
 2007-12-13 16:42:27 +00:00
Sebastian Mendel
c77f3bd21f group data types 2007-12-13 12:49:31 +00:00
Sebastian Mendel
8eaf437123 updated MySQL data types 2007-12-13 12:00:00 +00:00
Sebastian Mendel
560c6d4f6f config option to disable use of information_schema (if ok backport to QA_2_11) 2007-12-13 10:07:01 +00:00
Marc Delisle
ffc9a28eaf bug #1806236 Make the world write check on config.inc.php optional 2007-12-10 18:02:20 +00:00
Marc Delisle
ad8dc8e189 bug #1805102, TextareaAutoSelect issues 2007-10-20 17:54:15 +00:00
Sebastian Mendel
980f2f0f1e utf-8 is the default ... now 2007-10-18 11:37:05 +00:00
Sebastian Mendel
e623dc42cf new error handler - needs some more work, but works already: 
- errors are gathered through all pages till displayed
 - errors are displayed in main footer
 - configurable error gathering
 - configurable error displaying
 - configurable error logging
 2007-10-08 14:58:18 +00:00
Marc Delisle
6a1e18b52e new parameter LeftDefaultTabTable and new default value for DefaultTabTable 2007-09-30 12:04:16 +00:00