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
a518a7256c
maj copyright
2014-08-29 11:17:38 +02:00
Laurent Destailleur
e4dbf6a9e4
Removed useless file
2014-08-29 11:02:21 +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
42d992b009
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/lib/project.lib.php
htdocs/fourn/facture/fiche.php
htdocs/projet/class/project.class.php
2014-08-08 01:26:53 +02:00
Laurent Destailleur
6d49259999
Exclude nltechno dir
2014-08-06 23:57:25 +02:00
Laurent Destailleur
f1ca5b3eea
Exclude vagrant dir
2014-08-06 23:55:07 +02:00
Laurent Destailleur
f91e847562
Qual: Removed had coded value for version.
2014-08-06 09:23:37 +02:00
Laurent Destailleur
c2be3364e0
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-04 22:19:53 +02:00
Laurent Destailleur
8167f30833
Fix: Exclude dev dir from bin package.
2014-08-04 01:25:38 +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
9681b9abad
No need to close php
2014-07-27 14:14:34 +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
10e677d2d9
Prepare script for 3.6 version
2014-07-26 17:28:06 +02:00
Laurent Destailleur
289a2c6312
Maj readme
2014-07-26 13:23:22 +02:00
Laurent Destailleur
a2760aeacb
Typo
2014-07-23 10:26:43 +02:00
Laurent Destailleur
2cf9a7511b
Add date of file so we know if file was correctly build before
...
publishing it.
2014-07-14 23:47:46 +02:00
Laurent Destailleur
9acf60d7c5
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
.travis.yml
ChangeLog
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/core/class/html.formfile.class.php
2014-07-14 23:36:10 +02:00
Laurent Destailleur
ff5ea31452
Fix: Date error
2014-07-11 12:40:30 +02:00
Laurent Destailleur
5fd6bb94b9
Version beta
2014-06-20 20:31:57 +02:00
Laurent Destailleur
9706e23281
Fix changelog
2014-06-20 17:26:58 +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
baa573435b
Fix: Exclude files from package with missing sources.
2014-05-27 00:58:00 +02:00
Raphaël Doursenaud
c48c3a9d91
Qual: remove PHP closing tag (again)
...
These were reintroduced by careless merge
2014-05-26 13:51:25 +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
b7f55ea99c
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/modules/modAgenda.class.php
htdocs/core/modules/modProduct.class.php
htdocs/fourn/commande/liste.php
2014-05-18 11:52:52 +02:00
Laurent Destailleur
1012595ff2
Fix for 3.6 beta
2014-05-18 11:33:07 +02:00
Laurent Destailleur
fd271d7c92
Fix: Missing to set version to beta
2014-05-14 14:09:57 +02:00
Laurent Destailleur
8ab09d63a2
Fix: Rss features
2014-05-14 11:16:12 +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
53a1e7d09a
Fix: Script can be ran from non root user, even from a directory with no
...
write permissions.
2014-05-06 16:26:58 +02:00
Laurent Destailleur
1c6c79811d
Prepare version 3.5.3
2014-05-06 16:09:13 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +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
ecc6bdf4aa
Exclude system file from packages
2014-04-28 03:08:28 +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
cb2393e663
Fix: Solve problem of _source directory.
2014-04-13 01:28:44 +02:00
