nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,379 Commits 1 Branch 0 Tags
63f64fa0cf3d11f6f6895f8da1e6245f0e45b51a
Commit Graph

168 Commits

Author SHA1 Message Date
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
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
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
Michal Čihař
ed34bb9054 Adjust documentation to gettext. 2010-07-26 16:41:49 +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
Marc Delisle
ec9a60f8e0 undefined variables; unneeded config variables 2010-07-22 13:22:30 -04:00
Michal Čihař
906d7bc632 By default use new format strings. 2010-07-21 10:06:16 +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
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
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
lorilee
edc8846de8 Changed the default CSV column separator from a comma to a semi-colon 2010-07-08 13:41:15 -07:00
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
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
lorilee
d5ba4231ec SQL export option "CREATE PROCEDURE / FUNCTION / EVENT" default set to true 2010-06-15 23:37:25 -04: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
Michal Čihař
e0129770dc Get rid of strDocu. 2010-05-24 11:29:35 +02:00
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