Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
74,307 Commits 36 Branches 189 Tags
4495f0a755c52c76456b51a3347ea42f4fc101a1
Commit Graph

1707 Commits

Author SHA1 Message Date
Laurent Destailleur
b8b55fb748 WIP Add IFTTT module 2019-02-28 10:30:27 +01:00
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