Laurent Destailleur
211d217f8c
Merge remote-tracking branch 'origin/3.6' into 3.7
2016-04-29 15:13:27 +02:00
Laurent Destailleur
2a27fe02eb
Fix detection if tag already exists
2016-04-29 15:12:58 +02:00
Laurent Destailleur
0076512d5b
Merge remote-tracking branch 'origin/3.6' into 3.7
2016-01-31 21:26:52 +01:00
Laurent Destailleur
1b23ede857
Merge remote-tracking branch 'origin/3.5' into 3.6
2016-01-31 21:26:28 +01:00
Laurent Destailleur
d9e089256e
Fix path to copyrighted files
2016-01-31 16:16:46 +01:00
Laurent Destailleur
06754068ff
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/debian/changelog
build/makepack-dolibarr.pl
build/makepack-howto.txt
htdocs/filefunc.inc.php
2015-12-27 19:02:19 +01:00
Laurent Destailleur
96bc2023f3
Prepare package 3.6.6
2015-12-27 18:56:15 +01:00
Laurent Destailleur
c1c0fa88c2
Fix for new travis setup
2015-12-18 20:56:27 +01:00
Laurent Destailleur
b47dc8a394
Fix to use new travis setup
2015-12-18 20:10:11 +01:00
Laurent Destailleur
4a88c9ea9f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/product/class/product.class.php
2015-12-13 15:53:57 +01:00
Raphaël Doursenaud
4e9b339439
[Qual] Removed PHP closing tag
2015-12-09 13:28:45 +01:00
Raphaël Doursenaud
c0862762a5
Fix #3930 Removed executable bit
...
These files doesn't contain executable code and may pose a security
threat.
2015-12-09 13:28:36 +01:00
Laurent Destailleur
350345ecca
Prepare 3.6.5
2015-11-08 15:18:26 +01:00
Laurent Destailleur
722a133b31
FIX Add a protection to not make release if ChangeLog was not generated.
...
Prepare package 3.6.5
Conflicts:
ChangeLog
Conflicts:
ChangeLog
2015-11-08 15:09:57 +01:00
Laurent Destailleur
d4aeb8b3bc
Abandon package APS. Was never used.
2015-11-08 14:57:26 +01:00
Laurent Destailleur
04aba8ce96
Abandon package APS. Was never used.
2015-11-08 14:56:36 +01:00
Laurent Destailleur
9b8bb114cd
FIX Add a protection to not make release if ChangeLog was not generated.
...
Prepare package 3.7.2
Conflicts:
ChangeLog
2015-11-08 14:55:12 +01:00
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
Laurent Destailleur
001f1b4c31
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/filefunc.inc.php
2015-09-03 10:41:44 +02:00
Laurent Destailleur
8d18507d5f
Bad help
2015-08-14 15:35:25 +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
