Laurent Destailleur
1a3bd97a55
Prepare 4.0 doliwamp
2016-06-28 02:07:39 +02:00
Laurent Destailleur
f9190b0940
Update doc
2016-06-08 18:32:42 +02:00
Laurent Destailleur
e5aa79364a
Update cache example
2016-06-08 18:21:05 +02:00
Laurent Destailleur
f7bd2d16db
Prepare upgrade of doliwamp
2016-05-04 20:48:49 +02:00
Laurent Destailleur
1af8ca458d
Better image
...
Conflicts:
build/exe/doliwamp/doliwamp.bmp
2016-05-04 20:34:25 +02:00
Laurent Destailleur
8b41970b2e
Prepare upgrade of doliwamp
2016-05-04 20:19:53 +02:00
Laurent Destailleur
a2a5fa6f4f
Update screenshots
2016-04-26 01:13:55 +02:00
Laurent Destailleur
8bb832d06b
Fix Natural english
2015-09-17 00:48:10 +02:00
Laurent Destailleur
11d4a945b0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/contact/list.php
htdocs/contrat/liste.php
htdocs/product/liste.php
2015-05-25 18:08:23 +02:00
Laurent Destailleur
a4df49f6c8
Prepare packaging
2015-05-16 17:04:36 +02:00
Laurent Destailleur
e4aaff1de9
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/debian/changelog
build/makepack-dolibarr.pl
build/makepack-howto.txt
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/filefunc.inc.php
htdocs/product/class/product.class.php
2015-05-16 17:01:40 +02:00
Laurent Destailleur
5b00ba11fd
Prepare packaging
2015-05-16 16:54:54 +02:00
Laurent Destailleur
cabbb9e421
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/filefunc.inc.php
2015-05-16 16:49:03 +02:00
Laurent Destailleur
e8fb89f89f
Prepare packaging 3.7
2015-05-16 16:38:47 +02:00
Laurent Destailleur
80943111cc
Prepare 3.5.7
2015-05-16 15:26:34 +02:00
aspangaro
467a274f76
Typo
2015-01-22 21:12:20 +01:00
Laurent Destailleur
953e736a97
Prepare version 3.6.2
2014-12-27 02:21:37 +01:00
Laurent Destailleur
9e1b0d1abc
Prepare 3.5.6
2014-12-04 15:09:47 +01:00
Laurent Destailleur
b8969edcc5
Prepare 3.6.1
2014-09-27 12:34:45 +02:00
Laurent Destailleur
a518a7256c
maj copyright
2014-08-29 11:17:38 +02:00
Laurent Destailleur
6d49259999
Exclude nltechno dir
2014-08-06 23:57:25 +02:00
Laurent Destailleur
f1ca5b3eea
Exclude vagrant dir
2014-08-06 23:55:07 +02:00
Laurent Destailleur
db091896a5
Prepare 3.6.
...
Use google adsense tag of foundation for doxygen doc pages.
Version is no more encoded int odoxygen.
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture/impayees.php
htdocs/filefunc.inc.php
2014-07-26 18:10:51 +02:00
Laurent Destailleur
a8547e9c4d
Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne
...
s'appliquent pas
2014-07-26 17:30:10 +02:00
Laurent Destailleur
5853b9eb30
Merge branch 'bug-1416' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1416
Conflicts:
ChangeLog
2014-06-10 01:37:43 +02:00
Laurent Destailleur
b7f55ea99c
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/modules/modAgenda.class.php
htdocs/core/modules/modProduct.class.php
htdocs/fourn/commande/liste.php
2014-05-18 11:52:52 +02:00
Laurent Destailleur
fd271d7c92
Fix: Missing to set version to beta
2014-05-14 14:09:57 +02:00
Laurent Destailleur
8ab09d63a2
Fix: Rss features
2014-05-14 11:16:12 +02:00
Laurent Destailleur
1c6c79811d
Prepare version 3.5.3
2014-05-06 16:09:13 +02:00
Laurent Destailleur
c8f63d6160
Fix: Prepare for 3.5.2
2014-03-14 00:17:39 +01:00
Laurent Destailleur
07ac9d3922
Add example for basic authent
2014-03-12 15:19:49 +01:00
Laurent Destailleur
38423b9ec9
Fix: bad version
2014-03-09 03:29:58 +01:00
Laurent Destailleur
6a84a7f935
Prepare version 3.5.1
2014-02-08 13:56:28 +01:00
Laurent Destailleur
247c49e094
Prepare 3.5.0 release
2013-12-31 15:17:10 +01:00
Laurent Destailleur
bec70d1f0e
Fix: Update doc and packager for doliwamp
...
Conflicts:
build/exe/doliwamp/doliwamp.iss
2013-12-31 15:09:38 +01:00
Laurent Destailleur
70ac6efcc2
Fix: Update doc and packager for doliwamp
2013-12-31 15:04:59 +01:00
Laurent Destailleur
436f585b69
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
build/exe/doliwamp/doliwamp.iss
2013-12-29 00:48:31 +01:00
Laurent Destailleur
3e39cd279d
Fix: avoid to include not desired directory
2013-12-29 00:42:53 +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
b1add3f9df
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
build/exe/doliwamp/doliwamp.iss
htdocs/comm/propal/class/propal.class.php
htdocs/contrat/class/contrat.class.php
2013-09-13 09:32:41 +02:00
Laurent Destailleur
54976951a1
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-09-13 09:24:09 +02:00
Laurent Destailleur
86e827e3f7
Fix: Missing sources
...
Fix: packager
2013-09-12 23:47:36 +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
ae9c3cd780
Prepare 3.3.4
2013-07-26 16:43:06 +02:00
Laurent Destailleur
82e8ac72a8
Fix: Bad url
2013-07-24 22:32:20 +02:00
Laurent Destailleur
58c3938fb0
Add link to cloud solutions
2013-07-24 17:31:03 +02:00
Laurent Destailleur
8f71e5fda2
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
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-07-07 23:25:03 +02:00
Laurent Destailleur
0de1fe893a
Prepare 3.4
2013-07-07 13:30:30 +02:00