Laurent Destailleur
c125ba0d66
Update ignore to secure
...
Conflicts:
htdocs/.gitignore
2015-09-22 15:42:59 +02:00
Raphaël Doursenaud
cb31ab3e2b
FIX Syntax error in Debian Apache configuration
...
This issue prevented Apache from starting after dolibarr deb package
installation with the following error:
Syntax error on line 30 of /etc/apache2/conf.d/dolibarr.conf:
order takes one argument, 'allow,deny', 'deny,allow', or 'mutual-failure'
2015-09-16 19:53:32 +02:00
Regis Houssin
94ac0f5305
Fix: remove custom dir creation
2015-08-09 13:25:09 +02:00
Laurent Destailleur
f0ed7dac09
Exclude tested module
2015-07-20 12:21:15 +02:00
Laurent Destailleur
c023c078ae
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-06-17 00:07:44 +02:00
Laurent Destailleur
844ca58096
Fix: custom dir is missing
2015-06-17 00:05:41 +02:00
Laurent Destailleur
4f75ab79db
Prepare 3.7.2
2015-06-01 16:32:33 +02:00
Laurent Destailleur
227f2842c2
Prepare version 3.7.1
2015-05-31 18:03:24 +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
4dcdea5219
Prepare package 3.5.7
...
Removed hardcoded version from rpm spec files, so it will not be
necessary to update this files when making a new release.
2015-05-16 16:08:05 +02:00
Laurent Destailleur
80943111cc
Prepare 3.5.7
2015-05-16 15:26:34 +02:00
Laurent Destailleur
92a25e3d4c
Prepare 3.7.1
2015-05-12 00:11:51 +02:00
Laurent Destailleur
c2b31a37ba
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/contrat/fiche.php
htdocs/core/modules/expedition/modules_expedition.php
htdocs/expedition/class/expedition.class.php
htdocs/expedition/fiche.php
htdocs/user/fiche.php
2015-05-11 23:53:38 +02:00
Laurent Destailleur
7419319c0f
Protection into packager
2015-04-29 22:39:42 +02:00
Laurent Destailleur
3d609d5fd0
Sync transifex
2015-04-22 14:58:06 +02:00
Laurent Destailleur
1272b03e5e
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/fourn/facture/fiche.php
htdocs/product/stock/mouvement.php
htdocs/projet/element.php
htdocs/societe/rib.php
htdocs/theme/bureau2crea/img/statut4.png
2015-04-12 12:03:59 +02:00
Laurent Destailleur
b5690142aa
Prepare 3.6.3
2015-03-29 16:26:31 +02:00
Laurent Destailleur
3cc4358e72
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/commande/liste.php
htdocs/product/stock/product.php
2015-03-29 15:24:17 +02:00
Laurent Destailleur
ffe1ee0d84
Target 98 to publish of dolibarr sevrer is now working
2015-03-28 17:12:31 +01:00
Laurent Destailleur
5e33068e29
Update doc
2015-03-28 16:51:25 +01:00
Laurent Destailleur
11ae661303
Merge remote-tracking branch 'origin/3.6' into 3.7
2015-02-14 14:01:18 +01:00
Laurent Destailleur
6189db677d
Fix package .exe
2015-02-14 11:25:26 +01:00
aspangaro
467a274f76
Typo
2015-01-22 21:12:20 +01:00
Laurent Destailleur
839f73d568
Update doc
2015-01-18 14:57:25 +01:00
Laurent Destailleur
6414f415a8
Files compatible with apache 2.4
2015-01-11 15:30:34 +01:00
Laurent Destailleur
c7b311349e
Files compatible with apache 2.4
2015-01-11 15:16:55 +01:00
Laurent Destailleur
9662879e52
Fixed: Permissions
2015-01-11 15:15:51 +01:00
Laurent Destailleur
3848daeab8
Merge remote-tracking branch 'origin/3.6' into 3.7
...
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
htdocs/product/stats/facture.php
2014-12-30 04:20:50 +01:00
Laurent Destailleur
953e736a97
Prepare version 3.6.2
2014-12-27 02:21:37 +01:00
Laurent Destailleur
f261e1736c
Update doc
2014-12-05 21:10:38 +01:00
Laurent Destailleur
8d405a147f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/debian/changelog
htdocs/core/tpl/objectline_create.tpl.php
2014-12-04 15:29:45 +01:00
Laurent Destailleur
a07852c699
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/filefunc.inc.php
2014-12-04 15:22:08 +01:00
Laurent Destailleur
9e1b0d1abc
Prepare 3.5.6
2014-12-04 15:09:47 +01:00
Laurent Destailleur
0559e29c92
Prepare freeze
2014-11-07 21:52:50 +01:00
Laurent Destailleur
24862d6314
Corrections launchpad
2014-10-30 22:51:06 +01:00
Laurent Destailleur
2f5c7e5f9d
Prepare version 3.7 beta
2014-10-30 19:28:22 +01:00
Laurent Destailleur
87901d07de
Merge pull request #1986 from jfefe/patch-7
...
Update makepack-dolibarr.pl : indentation
2014-10-30 17:47:21 +01:00
Laurent Destailleur
8821fbac76
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/product/fiche.php
htdocs/user/class/user.class.php
2014-10-30 11:19:29 +01:00
jfefe
a32817db9d
Update makepack-dolibarr.pl : indentation
2014-10-28 23:49:54 +01:00
Laurent Destailleur
41f0920656
Fix for debian
2014-10-24 23:50:10 +02:00
Laurent Destailleur
f498921715
Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into
...
GPCsolutions-droposcommerce
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/langs/vi_VN/admin.lang
htdocs/langs/vi_VN/shop.lang
2014-10-13 00:50:51 +02:00
Laurent Destailleur
9768550696
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/categories/fiche.php
htdocs/comm/action/index.php
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/fiche.php
htdocs/product/composition/fiche.php
htdocs/product/price.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
2014-10-12 02:54:34 +02:00
Laurent Destailleur
d518278166
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/fiche.php
htdocs/compta/facture/class/facture.class.php
2014-10-03 19:17:28 +02:00
Laurent Destailleur
05fe8e45b3
Exclude module dire from package
2014-10-03 19:07:49 +02:00
Raphaël Doursenaud
f01e76f686
Removed unmaintaned OScommerce module
2014-09-29 15:22:48 +02:00
