Laurent Destailleur
|
70c262a99f
|
Avoid duplicate a2en.
No pass into log.
|
2014-02-02 19:19:41 +01:00 |
|
Laurent Destailleur
|
ad0e78a56a
|
Fix: debian and ubuntu package
|
2014-02-02 16:29:56 +01:00 |
|
Laurent Destailleur
|
8768ece9f7
|
Fix for ubuntu compatibility
|
2014-02-02 15:46:22 +01:00 |
|
Laurent Destailleur
|
4c60873d06
|
Fix: not dependencies by default to be compatible with all distrib.
|
2014-02-02 14:57:55 +01:00 |
|
Laurent Destailleur
|
18f8c80b98
|
Fix: lintian warning in date
|
2014-02-02 13:59:38 +01:00 |
|
Laurent Destailleur
|
0bdcda50c6
|
Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
ChangeLog
build/exe/doliwamp/doliwamp.iss
build/pad/pad_dolibarr.xml
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
|
2013-12-31 16:13:12 +01:00 |
|
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
|
0e743d5024
|
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
ChangeLog
htdocs/adherents/admin/adherent.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/document.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/facture/list.php
htdocs/cron/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/commande/document.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cron.lang
htdocs/langs/fr_FR/projects.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/nl_NL/categories.lang
htdocs/langs/nl_NL/commercial.lang
htdocs/langs/nl_NL/companies.lang
htdocs/langs/nl_NL/dict.lang
htdocs/langs/nl_NL/main.lang
htdocs/langs/nl_NL/margins.lang
htdocs/langs/nl_NL/products.lang
htdocs/societe/class/societe.class.php
htdocs/societe/rib.php
|
2013-11-19 21:08:02 +01:00 |
|
Laurent Destailleur
|
0f4ceca8ec
|
Fix: tons of bugs into ecm module
|
2013-11-17 02:59:01 +01:00 |
|
Laurent Destailleur
|
1838d45197
|
Update doc
|
2013-11-06 23:58:36 +01:00 |
|
Laurent Destailleur
|
469dd03673
|
Merge remote-tracking branch 'origin/3.4' into develop
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/core/class/commonobject.class.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/filefunc.inc.php
htdocs/langs/nl_NL/margins.lang
|
2013-11-01 17:58:38 +01:00 |
|
Laurent Destailleur
|
e8a80e2365
|
Now comments in changelog are concatenated
|
2013-11-01 17:46:57 +01:00 |
|
Laurent Destailleur
|
84b36d1230
|
Prepare for 3.4.2
|
2013-11-01 17:24:09 +01:00 |
|
Laurent Destailleur
|
10cd9619f9
|
Update doc
|
2013-10-30 19:09:02 +01:00 |
|
Laurent Destailleur
|
f71b47b282
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
|
2013-10-29 23:46:15 +01:00 |
|
Laurent Destailleur
|
277fc1a274
|
Update doc
|
2013-10-29 23:38:39 +01:00 |
|
Laurent Destailleur
|
43fd4d0784
|
Complete debian packager tuto
|
2013-10-09 16:04:06 +02:00 |
|
Laurent Destailleur
|
44d2fbcb1a
|
A better tag command
|
2013-09-22 19:41:14 +02:00 |
|
Laurent Destailleur
|
0315cfdac6
|
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
build/debian/get-orig-source.sh
|
2013-09-20 11:51:01 +02:00 |
|
Laurent Destailleur
|
7a1efdbab6
|
Merge remote-tracking branch 'origin/3.3' into 3.4
|
2013-09-20 11:06:09 +02:00 |
|
Laurent Destailleur
|
bd0e328d5b
|
Use official package directly to build debian.
|
2013-09-19 23:51:47 +02:00 |
|
Laurent Destailleur
|
9ee9079d78
|
update doc
|
2013-09-19 23:05:48 +02:00 |
|
Laurent Destailleur
|
3d62303d59
|
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
ChangeLog
build/debian/get-orig-source.sh
build/debian/watch
htdocs/fourn/ajax/getSupplierPrices.php
|
2013-09-19 01:02:53 +02:00 |
|
Laurent Destailleur
|
a86e8f8fac
|
Merge remote-tracking branch 'origin/3.3' into 3.4
|
2013-09-19 01:00:05 +02:00 |
|
Laurent Destailleur
|
848c693822
|
Fix: Error in url
|
2013-09-19 00:59:02 +02:00 |
|
Laurent Destailleur
|
847b0234c7
|
Change for debian
|
2013-09-19 00:49:51 +02:00 |
|
Laurent Destailleur
|
30c4d5dedb
|
Fix for debian package
|
2013-09-19 00:39:13 +02:00 |
|
Laurent Destailleur
|
e0ec92c843
|
Merge remote-tracking branch 'origin/3.4' into develop
|
2013-09-14 20:54:33 +02:00 |
|
Laurent Destailleur
|
d7f9e91955
|
Merge remote-tracking branch 'origin/3.3' into 3.4
|
2013-09-14 20:53:39 +02:00 |
|
Laurent Destailleur
|
9adbb0e973
|
Fix: update copyright file
|
2013-09-14 20:51:21 +02:00 |
|
Laurent Destailleur
|
443eba900a
|
Fix: Bad translation
|
2013-09-14 12:52:04 +02:00 |
|
Laurent Destailleur
|
5344aadc2e
|
Fix: Bad translation
|
2013-09-14 12:51:01 +02:00 |
|
Laurent Destailleur
|
181f16543d
|
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
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/filefunc.inc.php
|
2013-09-06 01:42:40 +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
|
a9c14c80f0
|
Fix: debian files
|
2013-09-06 01:27:11 +02:00 |
|
Laurent Destailleur
|
c40f3df269
|
Update doc
|
2013-09-06 01:26:31 +02:00 |
|
Laurent Destailleur
|
38e4b0f9ac
|
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
build/debian/watch
|
2013-09-05 23:57:30 +02:00 |
|
Laurent Destailleur
|
10779baadd
|
Merge remote-tracking branch 'origin/3.3' into 3.4
|
2013-09-05 23:55:14 +02:00 |
|
Laurent Destailleur
|
c71c4e86f6
|
Fix: watch file for debian package.
|
2013-09-05 23:52:13 +02:00 |
|
Laurent Destailleur
|
556827c818
|
Fix: wash file
|
2013-09-05 22:58:11 +02:00 |
|
Laurent Destailleur
|
b1e8b9c02f
|
Merge remote-tracking branch 'origin/3.3' into 3.4
|
2013-09-05 17:56:23 +02:00 |
|
Laurent Destailleur
|
7afb1aef14
|
Fix: Image was not correctly generated. Bad licence into it.
|
2013-09-05 17:53:07 +02:00 |
|
Laurent Destailleur
|
7229b728a3
|
Update doc
|
2013-09-04 23:02:02 +02:00 |
|
Laurent Destailleur
|
4298e5466a
|
Removed nmu
|
2013-08-07 16:57:00 +02:00 |
|
Laurent Destailleur
|
386958c4d6
|
Update with last changes
|
2013-08-06 22:56:13 +02:00 |
|
Laurent Destailleur
|
521da839ba
|
Update doc
|
2013-08-06 16:21:37 +02:00 |
|
Laurent Destailleur
|
80e04e967c
|
Start to uniformize default debian package with current official
package on work.
|
2013-08-06 03:10:51 +02:00 |
|
Laurent Destailleur
|
827faed39b
|
Update doc
|
2013-08-05 23:27:51 +02:00 |
|