Commit Graph

3882 Commits

Author SHA1 Message Date
Dieter Adriaenssens
e31dcc11ef Merge branch 'QA_3_3'
Conflicts:

	libraries/import.lib.php
2010-07-14 22:32:10 +02:00
Dieter Adriaenssens
dbe5daaad3 Converting number of Excel column names no longer limited 2010-07-14 22:29:26 +02:00
Crack
7a5fd62810 allow users to easily work with preferences stored in session (when pmadb is disabled): after logging in, user is presented with a message asking whether settings from localStorage should be loaded 2010-07-14 21:28:24 +02:00
Crack
60285cd665 add missing string escapes
don't create <a> tag if LeftLogoLink is empty
2010-07-14 17:07:19 +02:00
Michal Čihař
a038d59f7a Add Uyghur description. 2010-07-14 13:29:25 +02:00
Dieter Adriaenssens
17fc1370f3 Merge branch 'QA_3_3'
Conflicts:

	ChangeLog
	libraries/import.lib.php
2010-07-13 23:27:15 +02:00
Dieter Adriaenssens
6648c620d9 Convert Excel column name correctly 2010-07-13 23:23:51 +02:00
Crack
030abc5114 add missing validation for TextareaRows
fix warning in FormDisplay while importing settings
2010-07-13 23:15:22 +02:00
Crack
57a8d902f4 fix ThemeDefault and fontsize export 2010-07-13 22:17:19 +02:00
Dieter Adriaenssens
8b8562b435 cleanup (re)moved files 2010-07-13 20:35:14 +02:00
Dieter Adriaenssens
64a2832ac8 Update library PHPExcel to version 1.7.3c 2010-07-13 20:07:41 +02:00
Dieter Adriaenssens
ee0b2895ce Update library PHPExcel to version 1.7.3 2010-07-13 20:02:18 +02:00
Dieter Adriaenssens
b90a1b496b upgrade to PHPExcel 1.7.2 2010-07-13 19:42:07 +02:00
Dieter Adriaenssens
798def6e45 upgrade to PHPExcel 1.7.0 2010-07-13 19:39:40 +02:00
Marc Delisle
6ea41018b2 Merge branch 'QA_3_3' 2010-07-12 09:01:05 -04:00
Marc Delisle
768de14815 typo 2010-07-12 09:00:39 -04:00
Marc Delisle
f6ef0c87a8 Merge branch 'QA_3_3' 2010-07-12 08:57:05 -04:00
Marc Delisle
cda9df7101 bug [export] CSV for MS Excel (Windows) should have semi-colon as separator 2010-07-12 08:56:30 -04:00
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