nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,935 Commits 1 Branch 0 Tags
0b51a28da347e13f54c8026462ce3c8735542ac6
Commit Graph

213 Commits

Author SHA1 Message Date
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