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
96bc2023f3
Prepare package 3.6.6
2015-12-27 18:56:15 +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
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
b5690142aa
Prepare 3.6.3
2015-03-29 16:26:31 +02:00
Laurent Destailleur
953e736a97
Prepare version 3.6.2
2014-12-27 02:21:37 +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
41f0920656
Fix for debian
2014-10-24 23:50:10 +02:00
Laurent Destailleur
b8969edcc5
Prepare 3.6.1
2014-09-27 12:34:45 +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
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
ba70c1a08a
Fix: typo on debian files
2014-09-13 20:47:34 +02:00
Laurent Destailleur
1e28fd3541
Fix: syntax error
2014-08-26 15:24:32 +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
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
Laurent Destailleur
a8547e9c4d
Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne
...
s'appliquent pas
2014-07-26 17:30:10 +02:00
Laurent Destailleur
5fd6bb94b9
Version beta
2014-06-20 20:31:57 +02:00
Laurent Destailleur
47c982c506
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
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-06-10 08:45:08 +02:00
Laurent Destailleur
5853b9eb30
Merge branch 'bug-1416' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1416
Conflicts:
ChangeLog
2014-06-10 01:37:43 +02:00
Laurent Destailleur
c1431bdf93
Fix: Typo
2014-05-31 14:22:19 +02:00
Laurent Destailleur
cbd080f6cb
Fix: Typo
2014-05-31 14:02:36 +02:00
Laurent Destailleur
6137d7ed45
Update doc
2014-05-25 11:15:26 +02:00
Laurent Destailleur
936adfd0f5
Typo
2014-05-25 03:08:02 +02:00
Laurent Destailleur
3a29d7dac1
Update doc
2014-05-12 19:35:46 +02:00
Laurent Destailleur
801d99b947
Update doc
2014-05-10 02:10:13 +02:00
Laurent Destailleur
9f795331f5
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/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/paiement_charge.php
htdocs/compta/sociales/charges.php
htdocs/core/db/mysql.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
2014-05-06 23:58:17 +02:00
Laurent Destailleur
1c6c79811d
Prepare version 3.5.3
2014-05-06 16:09:13 +02:00
Laurent Destailleur
50c10d3d1e
Fix: Can disable features with PHPEXCEL (no DLSF compatible).
...
Fix: Can disable features with CKEDITOR.
2014-05-03 02:20:26 +02:00
Laurent Destailleur
bb2c829997
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
2014-04-18 12:34:32 +02:00
Laurent Destailleur
80f1100bf9
Fix: Removed warning
2014-04-12 01:32:46 +02:00
Laurent Destailleur
1b02cdd352
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
dev/initdata/mysqldump_dolibarr_3.5.0.sql
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/product/index.php
htdocs/user/fiche.php
2014-04-12 00:53:25 +02:00
Laurent Destailleur
89dca04720
Update doc
2014-04-08 23:06:58 +02:00
Laurent Destailleur
eb0d98d406
Comment
2014-04-07 20:41:33 +02:00
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
2bc63a86a9
Alignement of debian packaging files
2014-03-19 18:05:52 +01:00
Raphaël Doursenaud
0d511f9659
Readme: default to markdown version
2014-03-16 15:01:06 +01:00
Laurent Destailleur
c8f63d6160
Fix: Prepare for 3.5.2
2014-03-14 00:17:39 +01:00
Laurent Destailleur
fad9ba6130
Merge remote-tracking branch 'origin/3.5' into develop
2014-03-09 02:49:39 +01:00
Laurent Destailleur
b2116c37d8
Enhance packager:
...
- No need to be root to run script
- create git tag of version
- debian package do not use the deprecated dpatch command
- debian package is a quilt package (not native)
- debian package was missing file watch
- clean exclusion for zip and tgz package (exclusion must be done into
makepack-dolibarr.pl, not into specific package code)
- can publish files to sourceforge
2014-03-09 01:37:08 +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
