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
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
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
4f75ab79db
Prepare 3.7.2
2015-06-01 16:32:33 +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
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
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
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
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
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
2f5c7e5f9d
Prepare version 3.7 beta
2014-10-30 19:28:22 +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
Laurent Destailleur
41f0920656
Fix for debian
2014-10-24 23:50:10 +02:00
Laurent Destailleur
14ab409ca9
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/stock.php
htdocs/admin/system/index.php
htdocs/comm/fiche.php
htdocs/core/lib/admin.lib.php
htdocs/core/lib/holiday.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/login/functions_forceuser.php
htdocs/core/login/functions_http.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/filefunc.inc.php
htdocs/holiday/define_holiday.php
htdocs/opensurvey/fonctions.php
htdocs/societe/canvas/actions_card_common.class.php
test/phpunit/CompanyBankAccountTest.php
test/phpunit/ExportTest.php
test/phpunit/FactureTest.php
test/phpunit/FunctionsLibTest.php
test/phpunit/PropalTest.php
test/phpunit/SocieteTest.php
test/phpunit/WebservicesInvoicesTest.php
test/phpunit/WebservicesThirdpartyTest.php
2014-09-28 02:14:32 +02:00
Laurent Destailleur
b8969edcc5
Prepare 3.6.1
2014-09-27 12:34:45 +02:00
Laurent Destailleur
2a9275d0de
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/societe/consumption.php
2014-09-19 11:09:51 +02:00
Laurent Destailleur
d288b19f4d
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-09-19 11:07:15 +02:00
Laurent Destailleur
3a38153889
Typo error
2014-09-18 22:42:43 +02:00
Laurent Destailleur
83447243ae
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
build/debian/get-orig-source.sh
htdocs/product/class/product.class.php
htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
build/debian/control
htdocs/compta/bank/account.php
htdocs/fourn/paiement/fiche.php
htdocs/product/class/product.class.php
htdocs/product/fiche.php
2014-09-15 22:52:59 +02:00
Laurent Destailleur
76ba3301c3
Fix: Syntax for license key
2014-09-14 22:34:17 +02:00
Laurent Destailleur
20bec865fd
Fix: checkstyle
2014-09-14 00:27:36 +02:00
Laurent Destailleur
ba70c1a08a
Fix: typo on debian files
2014-09-13 20:47:34 +02:00
Laurent Destailleur
2c46613f4a
New: View per user into agenda.
2014-09-07 19:56:17 +02:00
Laurent Destailleur
9d2d165cfc
Fix: debian key dfsg and not dsfg
2014-09-07 11:21:04 +02:00
Laurent Destailleur
f64cb085a7
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/fourn/class/fournisseur.commande.class.php
2014-08-30 18:27:34 +02:00
Laurent Destailleur
711e7e6fc6
Fix: phpunit test
...
Fix: debian readme to upgrade tcpdf lib.
2014-08-28 16:59:10 +02:00
Laurent Destailleur
4d506d29d9
Removed log output (log too long)
2014-08-28 16:14:35 +02:00
Laurent Destailleur
1e28fd3541
Fix: syntax error
2014-08-26 15:24:32 +02:00
Laurent Destailleur
7d3c266a1d
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/agenda_other.php
htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
htdocs/install/mysql/migration/repair.sql
2014-08-04 00:02:00 +02:00
Laurent Destailleur
a5a7fb4967
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-08-01 11:15:45 +02:00
Laurent Destailleur
cf72c05a99
Fix: debian package provided by dolibarr team use embedded libraries.
2014-08-01 02:11:37 +02:00
Laurent Destailleur
c895c892a5
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2014-07-29 01:17:00 +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
