Laurent Destailleur
b1ea05e0d1
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/pad/pad_dolibarr.xml
build/pad/pad_doliwamp.xml
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/filefunc.inc.php
2013-12-31 15:55:10 +01:00
Laurent Destailleur
0e54780377
Fix: Update doc and packager for doliwamp
...
Conflicts:
build/exe/doliwamp/doliwamp.iss
Conflicts:
build/exe/doliwamp/doliwamp.iss
Conflicts:
build/exe/doliwamp/doliwamp.iss
2013-12-31 15:41:25 +01:00
Laurent Destailleur
247c49e094
Prepare 3.5.0 release
2013-12-31 15:17:10 +01:00
Laurent Destailleur
b8141ef2db
Prepare 3.6 dev
2013-11-22 19:32:36 +01:00
Laurent Destailleur
db9e9a3372
Prepare 3.5.0 beta
2013-11-07 00:41:27 +01:00
Laurent Destailleur
84b36d1230
Prepare for 3.4.2
2013-11-01 17:24:09 +01:00
Laurent Destailleur
8203971614
Try to fix bug [ bug #1072 ] Wrong DOL_URL_ROOT value calculated
...
Conflicts:
htdocs/filefunc.inc.php
2013-10-23 18:33:56 +02:00
Laurent Destailleur
2dad13a5c4
Try to fix bug [ bug #1072 ] Wrong DOL_URL_ROOT value calculated
2013-10-23 17:47:46 +02:00
Laurent Destailleur
04752dbfbe
Doxygen: More comments
2013-09-18 17:59:57 +02:00
Laurent Destailleur
f45be6a2a7
Prepare for 3.4.1
...
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
build/debian/changelog
2013-09-06 01:37:07 +02:00
Laurent Destailleur
afae841ae4
Fix: Permissions on files
2013-08-06 00:36:21 +02:00
Laurent Destailleur
ae9c3cd780
Prepare 3.3.4
2013-07-26 16:43:06 +02:00
Laurent Destailleur
b5820315f9
Fix: Correct permissions on files
2013-07-13 10:34:19 +02:00
Laurent Destailleur
f94f516a12
Clean code for managing alternate root dirs.
2013-07-09 23:46:31 +02:00
Laurent Destailleur
0de1fe893a
Prepare 3.4
2013-07-07 13:30:30 +02:00
Laurent Destailleur
7b5e0678db
New: Make some changes to allow usage of alternative
...
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
2013-07-07 03:26:51 +02:00
Laurent Destailleur
187feff7d5
Prepare 3.3.3
2013-06-25 20:40:22 +02:00
Laurent Destailleur
701d8485ef
Merge remote-tracking branch 'origin/3.4' into develop
2013-05-24 19:00:16 +02:00
Laurent Destailleur
961ce6e3e2
Fix: Removed error blocking redirect
2013-05-21 19:53:10 +02:00
Laurent Destailleur
6c4e47514d
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/holiday/fiche.php
2013-05-11 15:26:24 +02:00
Laurent Destailleur
9e847884d1
Prepare dev branch
2013-05-03 18:41:14 +02:00
Laurent Destailleur
0b228b3a87
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/user/perms.php
2013-05-03 18:33:05 +02:00
Laurent Destailleur
723bd6f750
Fix: [ bug #872 ] Erreur sur page Accueil Commerciale avec pgsql
...
(3.4-beta).
Fix: Permission tab was not visible for external users.
2013-05-03 16:10:28 +02:00
Laurent Destailleur
97de97de9d
Prepare branch 3.4
2013-05-03 10:17:46 +02:00
Laurent Destailleur
7dce8d2306
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/launchpad/README
build/makepack-dolibarr.pl
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/core/modules/syslog/mod_syslog_file.php
htdocs/filefunc.inc.php
htdocs/product/class/product.class.php
2013-04-23 14:04:56 +02:00
Laurent Destailleur
dbc2eddcba
Prepare for 3.3.2
2013-04-23 12:09:21 +02:00
Laurent Destailleur
89365786a8
New: enhance tool fixdosfiles.sh
...
Convert DOS files to unix
2013-03-30 14:27:13 +01:00
Laurent Destailleur
3e5ee3b00a
Fix: PHPUnit tests are back.
2013-03-09 18:55:57 +01:00
Laurent Destailleur
924d01249c
Prepare 3.3.1 maintenance release
2013-03-02 16:12:06 +01:00
Laurent Destailleur
df2fde3a68
Prepare 3.3 release
2013-02-17 17:17:19 +01:00
Laurent Destailleur
935f2d9bd8
Add TODO
2013-02-11 21:23:25 +01:00
Laurent Destailleur
abb6daf2dc
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/boxes/box_activity.php
2013-01-19 16:29:16 +01:00
Laurent Destailleur
a5b174eccc
Fix: Architecture of getCurrency was wrong. Cache was not stored
...
correctly and dict file loaded several times. There was also bug on PHP
without mb_string function.
Now function is a method of $langs object. All bug fixes.
2013-01-18 15:57:11 +01:00
Laurent Destailleur
d11cee399a
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
COPYRIGHT
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Laurent Destailleur
db923b9814
Fix: Removed warning
2013-01-15 15:44:42 +01:00
Laurent Destailleur
0c6c2eca8a
Fix: Removed warning
2013-01-15 13:11:36 +01:00
Laurent Destailleur
ec8b260bf6
New: Prepare 3.4 branch
...
New: Add hook for agenda, info and category tabs
2013-01-12 14:34:16 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694
Fix: change for a neutral email
2012-12-30 15:11:07 +01:00
Laurent Destailleur
11ab579639
Fix: Several fixes to avoid PDF lib conflicts.
2012-12-19 13:06:45 +01:00
Laurent Destailleur
19d5458ded
Prepare freeze of 3.3
2012-12-18 14:21:56 +01:00
Laurent Destailleur
38b1c540ef
Fix: Bad url forging
2012-12-12 00:49:32 +01:00
Laurent Destailleur
e3d07621eb
Fuck git. Restore another lost commit.
2012-12-04 20:51:45 +01:00
Laurent Destailleur
4136c27516
RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
...
commits !
2012-12-01 15:45:05 +01:00
Laurent Destailleur
624c0fa040
Fix: Restore compatibility with FPDF.
2012-11-30 20:31:43 +01:00
Laurent Destailleur
f9ceb78f58
Beautify instal pg.
...
Fix: Debian package
2012-10-07 20:04:07 +02:00
Regis Houssin
9d67b04076
New: add possibility to force entity in login page
2012-09-05 19:22:03 +02:00
Laurent Destailleur
92fb64d112
Fix: PHP 5.2 compatibility
2012-09-05 10:11:18 +02:00
Regis Houssin
f4d75e87d3
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
...
into task498_objectline
Conflicts:
htdocs/core/class/commonobject.class.php
2012-08-23 07:53:48 +02:00
