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
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
289a2c6312
Maj readme
2014-07-26 13:23:22 +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
Laurent Destailleur
70c262a99f
Avoid duplicate a2en.
...
No pass into log.
2014-02-02 19:19:41 +01:00
Laurent Destailleur
ad0e78a56a
Fix: debian and ubuntu package
2014-02-02 16:29:56 +01:00
Laurent Destailleur
8768ece9f7
Fix for ubuntu compatibility
2014-02-02 15:46:22 +01:00
Laurent Destailleur
4c60873d06
Fix: not dependencies by default to be compatible with all distrib.
2014-02-02 14:57:55 +01:00
Laurent Destailleur
18f8c80b98
Fix: lintian warning in date
2014-02-02 13:59:38 +01:00
Laurent Destailleur
923ff008c2
Update doc
2014-01-07 19:16:44 +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
89f32bf46e
Update doc
2013-11-27 18:45:04 +01:00
Laurent Destailleur
8981f506dc
Fix: typo
2013-11-27 13:28:06 +01:00
Laurent Destailleur
01f3ba81af
Update doc
2013-11-25 21:19:57 +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
0f4ceca8ec
Fix: tons of bugs into ecm module
2013-11-17 02:59:01 +01:00
