Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-04 08:02:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,293 Commits 37 Branches 191 Tags
cad2fedf70a54dee93551a6be7807a2a3f9f2018
Commit Graph

1624 Commits

Author SHA1 Message Date
Laurent Destailleur
e760568a78 Test prerequisite in DLL before unzip files 2017-11-15 13:21:56 +01:00
Laurent Destailleur
a329f7dc75 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/list.php
 2017-11-05 18:50:14 +01:00
Laurent Destailleur
52421406ce FIX #7751 2017-11-05 18:25:33 +01:00
Laurent Destailleur
eb4a5f6570 Fix link can't be a htm link in innosetup 2017-11-05 18:21:29 +01:00
Fabian Rodriguez
504219cedc Improved missing Windows component message, see #7751 2017-11-05 10:46:43 -05:00
Laurent Destailleur
5df4912324 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2017-11-02 09:45:13 +01:00
Laurent Destailleur
3db101ffdd Clean packager 2017-10-31 01:06:07 +01:00
Laurent Destailleur
052e025537 Better detection of log to include merge labels 2017-09-20 11:08:42 +02:00
Laurent Destailleur
230644070b Better detection of log to include merge labels 2017-09-18 11:42:05 +02:00
Laurent Destailleur
ad40d27324 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2017-09-16 12:22:18 +02:00
Inovea Conseil
9dfd4bb430 Accept the custom folder #7408 2017-09-15 14:40:51 +02:00
Laurent Destailleur
3e9679f273 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-04 10:20:17 +02:00
Laurent Destailleur
03bbb340f8 Fix rpm 2017-09-04 10:11:48 +02:00
Laurent Destailleur
869c8a4ead Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-04 09:30:08 +02:00
Laurent Destailleur
65b6b142bd Tag only whe publishing on sf 2017-09-04 09:29:44 +02:00
Laurent Destailleur
f92129dcdb Fix packager to avoid symlinks into custom 2017-09-03 00:55:49 +02:00
Laurent Destailleur
a60cd49fb0 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
	htdocs/core/class/CMailFile.class.php
	htdocs/filefunc.inc.php
 2017-08-28 12:53:02 +02:00
Laurent Destailleur
7916a2a648 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/filefunc.inc.php
 2017-08-27 00:38:46 +02:00
Laurent Destailleur
5cc02ac97f Fix deletion of signatures 2017-08-26 22:07:29 +02:00
Laurent Destailleur
30c39d246b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-22 11:18:56 +02:00
Regis Houssin
a17e4434be Fix: wrong app name 2017-08-22 10:46:06 +02:00
Regis Houssin
d2955cb32f Fix: virtualmin script update 2017-08-22 10:46:02 +02:00
Laurent Destailleur
c16cb15ce3 Merge pull request #7102 from tuxgasy/develop_docker 
Add docker-compose.yml file to build development environment based on Docker
 2017-08-17 22:36:58 +02:00
TuxGasy
700da4308e update README for docker 2017-08-11 19:01:01 +02:00
TuxGasy
d09ca6f3da Move all docker files into build/docker 2017-07-26 11:41:12 +02:00
Laurent Destailleur
ddbf841514 Fix packager must ignore symbolic links in custom 2017-07-24 23:57:55 +02:00
Laurent Destailleur
25b107defb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fichinter/list.php
 2017-07-23 19:09:00 +02:00
Laurent Destailleur
d5d95c31a6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-07-23 19:07:14 +02:00
Laurent Destailleur
585dde6cf5 Fix url 2017-07-23 19:06:47 +02:00
Laurent Destailleur
4803f2d29a Fix package v6 2017-07-22 11:26:25 +02:00
Laurent Destailleur
e0f0769405 Fix packager 2017-07-22 02:31:33 +02:00
Laurent Destailleur
a0d9890c99 Fix packager 2017-07-22 02:31:06 +02:00
Laurent Destailleur
78ebffe4f1 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/install/fileconf.php
 2017-06-25 02:31:38 +02:00
Laurent Destailleur
ab9be29356 Fix installers 2017-06-24 21:36:51 +02:00
Laurent Destailleur
5f187f851f Fix doc 2017-06-19 10:34:22 +02:00
Laurent Destailleur
f0df9b8d23 Update package file 2017-06-19 05:06:50 +02:00
Laurent Destailleur
4cf862f033 Prepare package 6.0 2017-06-10 01:19:20 +02:00
Laurent Destailleur
660faac0f3 Prepare package 6.0 2017-06-10 01:17:48 +02:00
Laurent Destailleur
9e33baf0d6 Prepare package for 6.0beta 2017-06-10 01:09:11 +02:00
Laurent Destailleur
7f18dfee0d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/build_class_from_table.php
	dev/skeletons/skeleton_card.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/projet/card.php
 2017-06-03 01:55:05 +02:00
Laurent Destailleur
b4f1df03de Update doc 2017-06-01 19:18:57 +02:00
Laurent Destailleur
7139a2dd9d Update debian package 2017-05-31 13:09:25 +02:00
Laurent Destailleur
c9a09adf79 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/main.lang
 2017-05-31 12:50:29 +02:00
Laurent Destailleur
e41541ab79 Enhance detection of changelog not updated 2017-05-31 12:47:21 +02:00
Laurent Destailleur
bd891ea56a Deploy to server works even when cloudflare is active. 2017-05-30 00:26:02 +02:00
Laurent Destailleur
a057cfec91 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-29 21:17:54 +02:00
Laurent Destailleur
f21ec76bc0 Exclude dir 2017-05-29 21:16:37 +02:00
Laurent Destailleur
ab444ce730 Prepare for module collab/pad 2017-05-16 03:02:00 +02:00
Laurent Destailleur
57ba598b15 Merge pull request #6771 from aspangaro/6.0-stripe 
New : Module Stripe
 2017-05-13 19:55:29 +02:00
Laurent Destailleur
e5c898e0d6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/fichinter/list.php
	htdocs/product/list.php
	htdocs/projet/tasks/list.php
 2017-05-10 00:48:27 +02:00