Crack
74eb921e68
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
2010-07-12 14:04:16 +02:00
Marc Delisle
ce2cad2886
fix merge conflicts
2010-07-11 08:05:50 -04:00
Marc Delisle
b55ba34d43
bug #3023507 [core] No result set display from stored procedure SELECT
2010-07-11 08:00:42 -04:00
Crack
956315e0b2
bugfix: show warning only when pmadb is unavailable
2010-07-10 21:51:54 +02:00
Marc Delisle
b2616ac46d
bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from master, todo: update PHP excel?)
2010-07-10 08:01:07 -04:00
Crack
e6b551dc71
bugfixes: allow to work with multiple servers, fix boolean values in select fields
2010-07-10 12:09:34 +02:00
Crack
3137cc2f1d
add date information when importing from localStorage
2010-07-10 00:06:50 +02:00
Crack
bcaecbf10a
allow user preferences to work without pmadb, but warn users about that
2010-07-09 20:37:04 +02:00
Crack
104ac11c1d
import and export for user preferences (currently JSON file only)
...
add preferences reset
2010-07-08 19:01:09 +02:00
Marc Delisle
90ce4c77b3
clarify code
2010-07-08 08:29:27 -04:00
Marc Delisle
c1be602a1e
fix merge conflicts
2010-07-08 07:52:47 -04:00
Marc Delisle
20d4c3a894
bug #3026400 [PHP] ereg functions are deprecated
2010-07-08 07:49:11 -04:00
Crack
104b40cb11
rename file
2010-07-08 12:36:09 +02: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
Crack
54c322544c
move user preferences to top level server menu
2010-07-07 01:27:05 +02: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
Crack
a9f39a92e7
saving of theme and font size
2010-07-06 18:20:33 +02:00
Piotr Przybylski
573edc0329
patch #3025161 [core] Prevent sending of unnecessary cookies
2010-07-06 11:43:02 -04:00
Crack
93d49e8ca8
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
2010-07-05 19:37:03 +02:00
Crack
68d9c40113
moved Import by LOAD DATA settings to CSV category
...
moved PMA_array_* functions to core.lib.php
moved PMA_read_userprefs_fieldnames() to user_preferences.lib.php
server/database/table filename templates are saved to pmadb when "remember template" is checked
2010-07-04 21:56:46 +02:00
Crack
d63fa35c0f
finished messages.inc.php cleanup
2010-07-04 00:18:04 +02:00
Crack
9dc47ecc41
rename $strSetup* variables to $strConfig*
2010-07-04 00:04:55 +02:00
Crack
7c5a298f27
moved validate.lib.php
2010-07-03 23:27:02 +02:00
Crack
47cd7c9a20
styling
...
moved some options (SQL Queries and SQL Box forms)
2010-07-03 23:22:20 +02:00
Crack
a3d46e16e2
sort messages
2010-07-03 22:50:06 +02:00
Crack
2fab9fbf28
Export options
2010-07-03 22:45:14 +02:00
Crack
9130ebb7b6
allow to group fields in forms
2010-07-03 19:02:54 +02:00
Crack
49c2562eae
more flexible <select> declaration
...
fix array export in ConfigFile
2010-07-03 13:45:48 +02: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
Crack
b13dee72f3
Import settings
2010-07-01 22:24:18 +02:00
Marc Delisle
01d6fed4e2
fix merge conflicts
2010-06-30 11:37:53 -04:00
Marc Delisle
108f3305e9
bug: avoid loading twice a js file
2010-06-30 11:35:46 -04:00
Marc Delisle
116d1297af
solve merge conflicts
2010-06-29 08:23:47 -04:00
Marc Delisle
852ed51c27
bug [replication] Do not offer information_schema in the list of databases
2010-06-29 08:14:31 -04:00
Marc Delisle
f368184a12
fix typo; remove Id
2010-06-29 07:57:45 -04:00
Marc Delisle
90ac3d39a0
bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible
2010-06-29 07:56:10 -04:00
Marc Delisle
f463b1cc7a
bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible
2010-06-29 07:48:28 -04:00
Dieter Adriaenssens
16ed06531a
remove author names
2010-06-28 20:36:12 +02:00
Crack
83f1397f0f
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
2010-06-28 16:42:29 +02:00
Marc Delisle
4986ee0174
lang directory no longer exists; I guess this mechanism is no longer needed
2010-06-28 09:25:45 -04:00
Crack
c91c105da8
added missing file
2010-06-27 12:43:54 +02:00
Crack
e842432c7e
User preferences:
...
- add icons to category tabs
- user overrides were unavailable in CSS files
- apply saved configuration immediately after save, reload navigation frame if it's affected
- disabled overrides marked in user preferences forms
2010-06-26 01:04:17 +02:00
Marc Delisle
1be2d538df
fix merge conflicts
2010-06-24 10:09:19 -04:00
Stéphane Pontier
4c0e653de0
patch #2932113 Slow export when having lots of databases
2010-06-24 10:01:21 -04: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
d09c35f5a8
setup script - better config file generation
2010-06-21 18:46:23 +02:00
Crack
0dc5d2e2b1
markers for field errors
2010-06-21 16:24:34 +02:00