Marc Delisle
8a153086a1
revert to previous value and add a comment in default configuration file
2010-07-07 06:13:06 -04:00
Martynas Mickevicius
d387343ee0
removed debug info
...
added check for gd library
2010-07-07 09:29:29 +03: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
Martynas Mickevicius
7958e84fff
debug on the demo server
2010-07-06 23:26:36 +03:00
Martynas Mickevicius
45fd079c9c
debug on the demo server
2010-07-06 22:23:34 +03:00
Martynas Mickevicius
c1ed3e2291
debug on the demo server
2010-07-06 21:23:03 +03: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
Martynas Mickevicius
c9a785cf03
debug on the demo server
2010-07-06 19:22:41 +03: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
Martynas Mickevicius
14ab690286
debug on the demo server
2010-07-06 18:23:05 +03:00
Martynas Mickevicius
c342ad07e0
debug on the demo server
2010-07-06 17:30:32 +03:00
Martynas Mickevicius
f1e30fea1e
debug on the demo server
2010-07-06 17:02:48 +03:00
lorilee
0e0ce976ee
ENUM/SET editor support for no javascript; Added feature that allows users to add more than one new field at a time
2010-07-05 16:28:40 -07:00
lorilee
2e3fad7456
Support for no javascript
2010-07-05 16:19:03 -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
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
Adnan
39db171819
because of changes in User Schema etc PDF Schema wasn't working, It is fixed now
2010-07-03 23:50:13 +05:00
Crack
9130ebb7b6
allow to group fields in forms
2010-07-03 19:02:54 +02:00
ninadsp
e049c1d158
Merge remote branch 'origin/master'
...
Conflicts:
po/fr.po
po/sl.po
2010-07-03 21:00:08 +05:30
Crack
49c2562eae
more flexible <select> declaration
...
fix array export in ConfigFile
2010-07-03 13:45:48 +02:00
Adnan
737fb9df27
Merge remote branch 'origin/master' into export_branch
2010-07-03 13:54:41 +05:00
Adnan
ba9924054b
export_relation_schema.php: commenting improved
2010-07-03 13:52:43 +05:00
ninadsp
6e9e3836e5
We don't need to buffer the output in PMA_showMessage() when making an SQL query. Added a global variable which is set in sql.php during an ajax request.
2010-07-03 02:51:02 +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
Adnan
188c7b8d38
User_Schema class : removed tabs + commented code + organized structure, Delete listing of schema classes in process relation schema file
2010-07-02 16:31:32 +05:00
Adnan
1ef5f8564e
Merge remote branch 'origin/master' into export_branch
2010-07-02 16:23:58 +05: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
ninadsp
466d3f7ae5
Discarded the unused PMA_ajaxOutputBuffelHandler() function.
2010-06-30 21:00:45 +05:30
ninadsp
bcbf327139
Merge remote branch 'origin/master'
2010-06-29 23:54:01 +05:30
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
lorilee
9bd658ae03
Removed inline Javascript, ENUM/SET editor message remains visible when Javascript is disabled
2010-06-28 22:28:25 -04:00
lorilee
301e3c43e3
Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
2010-06-28 20:50:26 -04:00
lorilee
f1a5ae3a9f
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
2010-06-28 20:49:56 -04:00