Commit Graph

1660 Commits

Author SHA1 Message Date
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
f1466e64af Fix: Build for obs 2014-04-01 09:12:49 +02:00
Laurent Destailleur
d452624ebc Fix: Building on obs 2014-04-01 09:08:52 +02:00
Laurent Destailleur
d3dc68d8a7 Prepare script to publish to foundation storage 2014-03-30 19:33:29 +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
Laurent Destailleur
12e2909564 Merge pull request #1490 from GPCsolutions/release
Makepack improvements
2014-03-16 20:32:26 +01:00
Raphaël Doursenaud
0d511f9659 Readme: default to markdown version 2014-03-16 15:01:06 +01:00
Raphaël Doursenaud
991d0e2a30 Makepack: clean git artifacts 2014-03-16 14:26:14 +01:00
Laurent Destailleur
291d546c30 Qual: Removed useless code 2014-03-16 14:21:23 +01:00
Laurent Destailleur
c8f63d6160 Fix: Prepare for 3.5.2 2014-03-14 00:17:39 +01:00
Laurent Destailleur
07ac9d3922 Add example for basic authent 2014-03-12 15:19:49 +01:00
Laurent Destailleur
38423b9ec9 Fix: bad version 2014-03-09 03:29:58 +01:00
Laurent Destailleur
271ef07c7d Packager works with beta versions 2014-03-09 03:04:47 +01:00
Laurent Destailleur
fad9ba6130 Merge remote-tracking branch 'origin/3.5' into develop 2014-03-09 02:49:39 +01:00
Laurent Destailleur
b8d816b208 Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
	build/debian/dolibarr.install
	build/makepack-dolibarr.pl
2014-03-09 02:48:37 +01:00
Laurent Destailleur
7a741e0691 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	build/makepack-dolibarr.pl
2014-03-09 02:14:00 +01:00
Laurent Destailleur
f652a4d807 Script to prepare 3.3.5 2014-03-09 02:08:13 +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
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
2014-03-03 19:38:02 +01:00
Laurent Destailleur
ba90565982 Removed hard coded value of version from makepack-dolibarr.pl script. 2014-03-03 19:08:13 +01:00
Laurent Destailleur
908c39098d Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/comm/action/fiche.php
2014-02-16 19:47:51 +01:00
Laurent Destailleur
295f0fd9e7 Makepack is for version 3.5 2014-02-15 15:23:21 +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
3906aaee8f Work on pdf doc generator 2014-02-10 00:25:16 +01:00
Laurent Destailleur
6a84a7f935 Prepare version 3.5.1 2014-02-08 13:56:28 +01:00
Laurent Destailleur
fc1600b97c Script to test htmldoc 2014-02-05 12:56:32 +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
873d44e2c0 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-02-02 14:18:43 +01:00
Laurent Destailleur
18f8c80b98 Fix: lintian warning in date 2014-02-02 13:59:38 +01:00
Laurent Destailleur
8e8fb27286 No more error for version in module file name. Version is taken from
descriptor files.
2014-01-26 01:06:47 +01:00
Laurent Destailleur
b6c2e7be05 No more error for version in module file name. Version is taken from
descriptor files.
2014-01-26 01:05:56 +01:00
Laurent Destailleur
1fd67807ce Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 01:13:29 +01:00
Laurent Destailleur
9aacb0e7ed Fix: bad permissions on files 2014-01-15 03:15:31 +01:00
Laurent Destailleur
923ff008c2 Update doc 2014-01-07 19:16:44 +01:00
Laurent Destailleur
4e2bce1600 Fix: No hard coded data 2014-01-02 10:55:41 +01:00
Laurent Destailleur
165f9617e9 Fix: No hard coded data 2014-01-02 10:55:11 +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
808abb6b4e Restore correct date 2013-12-31 16:03:58 +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
7fc052ce19 More prerequisites to check to run makepack-dolibarr to build debian
package (check on dpatch too).
2013-12-31 15:27:15 +01:00