Laurent Destailleur
|
f9c1b590d0
|
Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
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/compta/facture.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/filefunc.inc.php
|
2014-03-19 22:29:18 +01:00 |
|
Laurent Destailleur
|
c8f63d6160
|
Fix: Prepare for 3.5.2
|
2014-03-14 00:17:39 +01:00 |
|
Laurent Destailleur
|
ce8d13ead0
|
Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
ChangeLog
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/comm/action/fiche.php
htdocs/filefunc.inc.php
htdocs/install/check.php
|
2014-02-10 00:38:10 +01:00 |
|
Laurent Destailleur
|
6a84a7f935
|
Prepare version 3.5.1
|
2014-02-08 13:56:28 +01:00 |
|
Laurent Destailleur
|
efcff80a28
|
Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
build/debian/control
htdocs/fourn/facture/paiement.php
|
2014-02-03 18:44:48 +01:00 |
|
Laurent Destailleur
|
ad0e78a56a
|
Fix: debian and ubuntu package
|
2014-02-02 16:29:56 +01:00 |
|
Laurent Destailleur
|
18f8c80b98
|
Fix: lintian warning in date
|
2014-02-02 13:59:38 +01:00 |
|
Laurent Destailleur
|
ddde3339f8
|
Merge remote-tracking branch 'origin/3.5' 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/filefunc.inc.php
|
2013-12-31 16:33:36 +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
|
b8141ef2db
|
Prepare 3.6 dev
|
2013-11-22 19:32:36 +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
|
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
|
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
|
4298e5466a
|
Removed nmu
|
2013-08-07 16:57:00 +02:00 |
|
Laurent Destailleur
|
ae9c3cd780
|
Prepare 3.3.4
|
2013-07-26 16:43:06 +02:00 |
|
Laurent Destailleur
|
187feff7d5
|
Prepare 3.3.3
|
2013-06-25 20:40:22 +02:00 |
|
Laurent Destailleur
|
9e847884d1
|
Prepare dev branch
|
2013-05-03 18:41:14 +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
|
e51c72f1e8
|
Merge
|
2013-03-04 00:10:09 +01:00 |
|
Laurent Destailleur
|
924d01249c
|
Prepare 3.3.1 maintenance release
|
2013-03-02 16:12:06 +01:00 |
|
Laurent Destailleur
|
5075e9c716
|
Update to 3.4
|
2013-03-01 09:55:04 +01:00 |
|
Laurent Destailleur
|
9106a74426
|
Fix: Package for launchpad
|
2013-03-01 09:48:03 +01:00 |
|
Laurent Destailleur
|
c222f39c76
|
Prepare 3.4
|
2013-01-17 10:22:26 +01:00 |
|
Laurent Destailleur
|
1ec9125ff9
|
Move to 3.3 alpha
|
2012-04-09 16:51:17 +02:00 |
|
Laurent Destailleur
|
e5d564b40f
|
Work on debian package
|
2012-01-30 00:42:47 +01:00 |
|
Laurent Destailleur
|
429ba54e3e
|
Work on debian package
|
2012-01-28 16:04:48 +01:00 |
|