nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,822 Commits 1 Branch 0 Tags
09b43c7cb1f377075a71448e966fca971057dcaf
Commit Graph

3834 Commits

Author SHA1 Message Date
lorilee
09b43c7cb1 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-16 16:56:38 -07:00
lorilee
8397112a67 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee 2010-07-16 16:54:59 -07:00
lorilee
60f95aa432 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-16 16:54:36 -07: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
7b46075360 Fixed bug where non-footnote notices were being hidden; footnotes given their own div classes 2010-07-16 00:09:58 -07:00
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
lorilee
8adaaf548f Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-14 11:34:35 -07:00
lorilee
5fab0e993c Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-14 11:33:45 -07:00
Michal Čihař
a038d59f7a Add Uyghur description. 2010-07-14 13:29:25 +02:00
lorilee
ecb4cdc764 Added option in config.inc.php to set the default export method to quick, custom, or custom-no-form 2010-07-13 18:21:34 -07:00
lorilee
5ad3a70718 Improved tooltip for JavaScript-enabled browsers (superscripts changed to icons) 2010-07-13 17:44:05 -07: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
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
lorilee
27bc09c939 Merge branch 'master' of http://repo.or.cz/r/phpmyadmin 2010-07-12 12:40:27 -07: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
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
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
lorilee
0900dc1b0b Fixed a formatting bug 2010-07-08 14:07:36 -07:00
lorilee
8b6e179bd9 Changed the Import form's 'Browse the server' label to 'Browse your computer' 2010-07-08 13:50:46 -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
lorilee
a62cc4d464 Changed "columns terminated with" to "columns separated with" 2010-07-08 13:40:50 -07:00
lorilee
c05038e847 Added a title to the import page to show the current import mode (server/database/table) 2010-07-08 12:37:10 -07:00
lorilee
e90f8e4d89 Added a title to the export page to show the current export mode (server/database/table) 2010-07-08 12:30:50 -07:00
lorilee
2a046d7b08 Removed inline css, added labels to form elements, modified file template message to make it less confusing 2010-07-08 11:57:59 -07: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
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
Piotr Przybylski
573edc0329 patch #3025161 [core] Prevent sending of unnecessary cookies 2010-07-06 11:43:02 -04: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
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
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