ninadsp
|
e7b130baf7
|
Merge remote branch 'origin/master'
|
2010-07-19 21:54:37 +05:30 |
|
Marc Delisle
|
0c9cbf6c6e
|
3.3.6-dev
|
2010-07-18 14:35:21 -04: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 |
|
ninadsp
|
9dd93987ca
|
Reverted po files changes.
|
2010-07-15 00:17:49 +05:30 |
|
Dieter Adriaenssens
|
84b5a0af5b
|
Merge branch 'QA_3_3'
|
2010-07-13 23:40:34 +02:00 |
|
Dieter Adriaenssens
|
22b0ac9079
|
remove todo, after upgrade PHPExcel
|
2010-07-13 23:39:42 +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 |
|
Dieter Adriaenssens
|
d7b8248997
|
Update library PHPExcel 1.7.3c in QA_3_3 branch
|
2010-07-13 20:23:31 +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 |
|
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 |
|
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 |
|
ninadsp
|
020dac8c89
|
Merge remote branch 'origin/master'
|
2010-07-07 18:53:41 +05:30 |
|
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 |
|
Piotr Przybylski
|
573edc0329
|
patch #3025161 [core] Prevent sending of unnecessary cookies
|
2010-07-06 11:43:02 -04: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 |
|
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
|
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
|
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 |
|
Marc Delisle
|
af6c9cf8a8
|
3.3.4 release
|
2010-06-28 07:38:57 -04:00 |
|
Marc Delisle
|
c699af70e9
|
3.3.4 release
|
2010-06-28 07:37:55 -04:00 |
|
ninadsp
|
ac7cab7160
|
Revert "Revert "Merge remote branch 'origin/master'""
This reverts commit 4214d83e12.
|
2010-06-26 15:45:27 +05:30 |
|
ninadsp
|
4214d83e12
|
Revert "Merge remote branch 'origin/master'"
This reverts commit c850b8be8b, reversing
changes made to dcdde2f99f.
|
2010-06-26 15:43:52 +05:30 |
|
ninadsp
|
c850b8be8b
|
Merge remote branch 'origin/master'
Conflicts:
po/tr.po
|
2010-06-26 15:38:12 +05:30 |
|
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 |
|
Marc Delisle
|
3efb889d61
|
3.3.5-dev
|
2010-06-20 06:27:15 -04:00 |
|
Marc Delisle
|
12edc03e2f
|
3.3.5-dev
|
2010-06-20 06:25:07 -04:00 |
|
ninadsp
|
a8d6f9ff4c
|
Merge remote branch 'origin/master'
|
2010-06-15 15:39:51 +05:30 |
|
Marc Delisle
|
f1d8953670
|
fix conflicts
|
2010-06-13 08:59:05 -04:00 |
|
Marc Delisle
|
ae8ddbf15b
|
bug #2986422 [import] Results for query are not displayed
|
2010-06-13 08:42:24 -04:00 |
|
Michal Čihař
|
8dfdcca68b
|
Merge branch 'QA_3_3'
|
2010-06-11 12:41:33 +02:00 |
|
Michal Čihař
|
1e2731dc96
|
[engines] Fix getting InnoDB status.
|
2010-06-11 12:41:18 +02:00 |
|
ninadsp
|
834b36bd6a
|
Merge remote branch 'origin/master'
|
2010-06-09 22:49:38 +05:30 |
|
Marc Delisle
|
e05ced2a21
|
Merge branch 'QA_3_3'
|
2010-06-08 12:41:56 -04:00 |
|
Isaac Bennetch
|
122d86c1c5
|
patch #3013264 FAQ 1.40 correction
|
2010-06-08 12:41:26 -04:00 |
|
