Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-17 23:11:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
71,061 Commits 36 Branches 190 Tags
01e7b5747d3ece7bb4623c8889ffa98ebb39bc7c
Commit Graph

1674 Commits

Author SHA1 Message Date
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