lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
88,659 Commits 43 Branches 150 Tags 886 MiB
12.0
Commit Graph

1806 Commits

Author SHA1 Message Date
Laurent Destailleur
fbdbb6343c Enhance changelog builder tool 2019-02-15 16:04:29 +01:00
Laurent Destailleur
38d4284638 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/db/pgsql.class.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/filefunc.inc.php
	htdocs/imports/import.php
	htdocs/supplier_proposal/card.php
 2019-02-08 11:26:08 +01:00
Laurent Destailleur
3a5fc8f0c3 NEW Add protection to avoid packaging if files non indexed exists into 
dir.
 2019-02-08 10:41:11 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
Laurent Destailleur
eb3621839a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/members.lang
	htdocs/langs/fr_FR/members.lang
 2019-02-01 15:14:19 +01:00
Laurent Destailleur
fd67253e40 Clean package 2019-01-31 13:16:54 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
ecc30b8ffe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2019-01-27 18:27:58 +01:00
Laurent Destailleur
97545af1fd Translation 2019-01-27 18:26:18 +01:00
Frédéric FRANCE
13f37204f6
wip 2019-01-27 13:23:32 +01:00
Laurent Destailleur
6867a8a88a Typo 2019-01-26 13:46:59 +01:00
Laurent Destailleur
43694f9384 FIX Compatibility with windows 10 2019-01-26 13:32:36 +01:00
Laurent Destailleur
97cc414b29 Update doliwamp 2019-01-26 12:35:02 +01:00
Laurent Destailleur
61290013dd Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-26 01:46:41 +01:00
Laurent Destailleur
89420dde62 Fix translation 2019-01-26 01:44:28 +01:00
Philippe GRAND
35ceb805dd update with html5 compliant code 2019-01-21 21:06:36 +01:00
Laurent Destailleur
3ddfcbe3bb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	dev/setup/codesniffer/ruleset.xml
 2019-01-20 20:36:45 +01:00
Laurent Destailleur
9a6517a3bd Try to trap apache log 2019-01-19 17:38:05 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime 
Fix
 2019-01-19 13:22:38 +01:00
Laurent Destailleur
92eeff7a26 Fix packager and doc 2019-01-18 13:12:09 +01:00
Laurent Destailleur
5b037d87cb Update doc 2019-01-17 20:04:44 +01:00
Laurent Destailleur
2e55bdf087 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-17 19:11:18 +01:00
Laurent Destailleur
16220891f2 Clean package 2019-01-17 01:16:03 +01:00
Laurent Destailleur
b79aafc6e0 Add missing command 2019-01-16 20:57:41 +01:00
Laurent Destailleur
1345a63c8c Update doc 2019-01-16 20:56:11 +01:00
Philippe Grand
dfceecc04f
Update index.php.install 2019-01-16 19:14:24 +01:00
Philippe GRAND
ab23fe044a update with html5 compliant code 2019-01-16 17:34:36 +01:00
Laurent Destailleur
ae834416e9 Fix add include for binary 2018-12-04 17:35:22 +01:00
Regis Houssin
dcbb7c49fc FIX wrong value for instal lock 2018-12-03 13:31:28 +01:00
Regis Houssin
a2f514d4a1 FIX possibility to force install lock with GET/POST or script 2018-12-03 13:12:42 +01:00
Laurent De Coninck
0f45ed0a8c fix docker image creation + xdebug 
Fix the PHP image creation + adding xdebug

[see: X]
 2018-11-30 13:04:06 +01:00
Laurent Destailleur
0ce17e0617 Fix packager 2018-11-19 10:05:09 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
67fbb3dbb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/notify.class.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-11-03 19:15:52 +01:00
Laurent Destailleur
6c4a2728ca Fix build 2018-10-31 12:33:08 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Laurent Destailleur
d8bf635530 Prepare module 2018-10-29 11:21:57 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
2ce7429735 Remove Google advert 2018-10-26 12:09:52 +02:00
Laurent Destailleur
96fce2828e Prepare 9.0 2018-10-16 17:02:36 +02:00
Laurent Destailleur
b8eaeb7c62 Clean build files 2018-10-11 09:22:09 +02:00
Laurent Destailleur
a8385c0255 Translation 2018-10-01 11:30:20 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing 2018-08-16 00:47:09 +02:00
Laurent Destailleur
ec56ad752c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-15 14:26:38 +02:00
Laurent Destailleur
a866f94716 Fix package 2018-08-13 23:25:27 +02:00
Frédéric FRANCE
6cb0fb10d6
trim trailing 2018-07-26 19:05:34 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Laurent Destailleur
db59fca9ac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-05 18:23:09 +02:00
Laurent Destailleur
8400614c3d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-06-05 18:22:47 +02:00
Laurent Destailleur
426eb178f2 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-06-05 18:22:28 +02:00
Laurent Destailleur
8785d69548 Do not load database handler 2018-06-05 18:21:56 +02:00
Laurent Destailleur
2e2cc55350 Backport fix of file checker generation 2018-05-29 12:15:28 +02:00
Laurent Destailleur
95e3c5a4b1 Backport fix of file list check generation 2018-05-29 12:13:58 +02:00
Alexandre SPANGARO
675ae97f99 Update module assets (Add asset directory & langs) 2018-05-13 21:52:11 +02:00
Laurent Destailleur
5fe8249706 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2018-05-05 23:22:04 +02:00
Laurent Destailleur
8e729c2021 Add param autostable into generate_filelist_xml.php 2018-05-05 23:12:31 +02:00
Laurent Destailleur
fd53788d2f Add param autostable into generate_filelist_xml.php 2018-05-05 22:54:22 +02:00
Laurent Destailleur
4f0e053463 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	ChangeLog
 2018-05-05 21:58:17 +02:00
Laurent Destailleur
19008531bb Fix packager 2018-05-05 21:56:34 +02:00
Laurent Destailleur
f76df85aec compatibility with ubuntu 14.04 2018-05-05 21:53:02 +02:00
Laurent Destailleur
58fa42b347 Try to use trusty fro travis 2018-04-22 18:34:33 +02:00
Laurent Destailleur
49fcd70c5b Try fix travis 2018-04-22 13:15:35 +02:00
Laurent Destailleur
3eee68c404 NEW Prototype of a module DAV 2018-03-27 16:18:12 +02:00
Laurent Destailleur
9980a5fbd0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2018-03-22 14:08:43 +01:00
Laurent Destailleur
4c1dcc37d1 Fix packager 2018-03-22 13:38:28 +01:00
Laurent Destailleur
2ee0e68d67 Fic packaging tools 2018-03-22 13:22:33 +01:00
Laurent Destailleur
45c7437875
Merge pull request #8396 from hregis/develop_dict 
Fix: update virtualmin script
 2018-03-16 09:42:02 +01:00
Laurent Destailleur
545bfeedcc Minimum PHP version for 8.0 is PHP 5.4 2018-03-16 01:25:34 +01:00
Regis Houssin
4f5918cda6 Fix: wrong name 2018-03-15 18:58:30 +01:00
Regis Houssin
111ab3befc Fix: update virtualmin script 2018-03-15 18:54:40 +01:00
Laurent Destailleur
9bed2ce8e2 Fix ignore file integrity check on filefunc.inc.php for deb/rpm package 2018-02-16 22:03:13 +01:00
Laurent Destailleur
b3e567c310 Fix rpm package for apache 2.4, selinux and php packages 2018-02-16 20:47:28 +01:00
Laurent Destailleur
c513ffe1f7 Fix debian package 2018-02-16 18:21:18 +01:00
Laurent Destailleur
8db6b1ecc0 Fix package for debian 2018-02-16 17:19:04 +01:00
Laurent Destailleur
b298cec7d3 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-26 01:42:09 +01:00
Laurent Destailleur
40b63be4b9 Fix package 2018-01-26 01:40:32 +01:00
Laurent Destailleur
47d0b6583e Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2018-01-26 01:40:04 +01:00
Laurent Destailleur
c0e719e3d8 Fix package scripts 2018-01-26 01:39:42 +01:00
Laurent Destailleur
90e579b884 Update doxygen 2018-01-17 11:49:06 +01:00
Laurent Destailleur
bb7c03906e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/societe/list.php
 2017-12-11 15:25:09 +01:00
Laurent Destailleur
f2e429e28f Fix file integrity checker (exclude files excluded from package) 2017-12-11 15:03:34 +01:00
Laurent Destailleur
55b9921661 Fix package rpm 2017-12-09 13:45:06 +01:00
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
Alexandre SPANGARO
16a41242d3 Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-05-08 06:39:14 +02:00
Laurent Destailleur
ab8dcbd366 Use virtual name 2017-05-06 16:36:05 +02:00
Laurent Destailleur
880e2d0f72 Fix packaging 5.0.2 2017-05-06 15:05:24 +02:00
Laurent Destailleur
c4475ca946 Add a protection to avoid to take modules into custom dir. 2017-05-06 14:56:16 +02:00
Laurent Destailleur
9b90e7aa09 Minor fix 2017-05-06 02:24:52 +02:00
Laurent Destailleur
56140ae572 Work on default focus 2017-05-06 01:09:22 +02:00
Laurent Destailleur
8730add15f Better message for api key return 2017-05-01 16:38:15 +02:00
Alexandre SPANGARO
586ea54bfc Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-29 07:05:02 +02:00
Laurent Destailleur
cfde27820e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
	htdocs/comm/card.php
	htdocs/core/menus/standard/eldy.lib.php
 2017-04-27 17:20:40 +02:00
Laurent Destailleur
65fec95458 Fix debian package 2017-04-24 04:17:59 +02:00
Alexandre SPANGARO
fed6d71d8a Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-17 06:51:02 +02:00
Laurent Destailleur
4c056d68d8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/commande/list.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/bills.lang
	htdocs/societe/list.php
 2017-04-15 17:02:05 +02:00
Laurent Destailleur
1cffa8c9fc Fix for debian 8 2017-04-13 15:03:12 +02:00
Laurent Destailleur
17bd393965 Fix typo 2017-04-03 12:48:09 +02:00
Laurent Destailleur
e8767122b0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/societe/list.php
 2017-04-03 11:05:19 +02:00
Laurent Destailleur
f942ba543e Fix php dependencies 2017-04-01 01:06:23 +02:00
Laurent Destailleur
9a85e5ef00 Enhance the file checker 2017-03-26 01:45:09 +01:00
Laurent Destailleur
3c9d336148 Fix error message 2017-03-25 17:05:27 +01:00