Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-04 16:12:39 +01:00
Code Issues Packages Projects Releases Wiki Activity
122,559 Commits 37 Branches 191 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

1977 Commits

Author SHA1 Message Date
Florian HENRY
1dc84c5715 update docker to new standard 2020-09-07 16:04:06 +02:00
Florian HENRY
e9ff43ad44 ongoing 2020-09-01 14:31:54 +02:00
Florian HENRY
fba614632f working on docker image 2020-08-29 18:31:42 +02:00
Florian HENRY
b7f4162721 use new version docker file 2020-08-28 12:10:08 +02:00
Florian HENRY
08702a0d1a on going version 3 2020-08-26 14:16:49 +02:00
Alexandre SPANGARO
27c36713d3 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-08-16 22:10:02 +02:00
Laurent Destailleur
0381cf5665 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/modules/modPaymentByBankTransfer.class.php
	htdocs/filefunc.inc.php
 2020-08-14 11:08:53 +02:00
Laurent Destailleur
dde83c8fcc Fix debian package 2020-08-08 10:17:52 +02:00
Laurent Destailleur
ac48576b88 Add missing dependency in debian package #12785 2020-08-07 14:49:07 +02:00
Alexandre SPANGARO
59ee22537d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-07-06 03:24:27 +02:00
Laurent Destailleur
90d4458aab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2020-06-27 00:38:51 +02:00
Laurent Destailleur
e99ab329fd Remove bans 2020-06-25 22:22:54 +02:00
Laurent Destailleur
6d25b8630b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/prelevement.php
	htdocs/core/class/rssparser.class.php
 2020-06-23 11:38:20 +02:00
Laurent Destailleur
a8c91069b2 Fix doliwamp installer 2020-06-22 15:24:42 +02:00
Laurent Destailleur
984e3d112d Fix packager 2020-06-22 01:10:41 +02:00
Laurent Destailleur
119bf45177 Fix error in packaging 2020-06-22 00:41:21 +02:00
Laurent Destailleur
8ccaa0794e Update doc 2020-06-21 22:58:52 +02:00
Laurent Destailleur
0a22773eab Update doc 2020-06-21 22:58:08 +02:00
Laurent Destailleur
1ce3991d81 FIX #14036 2020-06-19 23:17:22 +02:00
Laurent Destailleur
5ac80844cb FIX #14036 2020-06-19 23:15:40 +02:00
Frédéric FRANCE
2085ac73e7 Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:34:58 +02:00
Laurent Destailleur
41664c1a0e Merge pull request #13941 from bsene/fixes-13807-issue 
Fix #13807 Docker: PHP installation does not support GD graphical functions
 2020-05-23 13:48:15 +02:00
Laurent De Coninck
0bf6b26117 add a mail server 2020-05-23 12:20:56 +02:00
Birame SENE
e6a5d4c8d9 Add PNG/JPEG packages to build GD extension 2020-05-21 17:01:27 +02:00
Frédéric FRANCE
def53338de add new rule 2020-05-21 09:07:10 +02:00
Laurent Destailleur
6c8d302dd9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/list.php
	htdocs/compta/prelevement/rejets.php
	htdocs/fourn/commande/index.php
 2020-05-07 12:03:49 +02:00
Laurent Destailleur
d9cef1c8d7 Fix packager to publish on new web site 2020-05-06 01:49:19 +02:00
Laurent Destailleur
80adf0fff1 Merge pull request #13700 from joseplluis/patch-7 
Update MySpanish.isl
 2020-04-22 18:05:55 +02:00
Josep Lluís
3f071462ab Update MySpanish.isl 2020-04-22 17:50:15 +02:00
Josep Lluís
8207d27d00 Update MyCatalan.isl 2020-04-22 17:36:10 +02:00
Laurent Destailleur
d54c093ae2 Fix file 2020-04-22 00:57:28 +02:00
UT from dolibit
758246c2a9 Update MyGerman.isl 2020-04-21 20:33:41 +02:00
Laurent Destailleur
64aa231e33 Avoid password in files 2020-04-04 23:32:02 +02:00
Laurent Destailleur
2b725ad5d5 Update year in demo data 2020-03-30 14:57:56 +02:00
Laurent Destailleur
221776d07d Migrate DoliWamp to use WampServer 3 2020-03-29 23:06:48 +02:00
Laurent Destailleur
0905b3a6b2 Fix function not found 2020-03-23 15:46:16 +01:00
Laurent Destailleur
01e60562b9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/takepos/takepos.php
 2020-03-23 15:38:10 +01:00
Laurent Destailleur
f7b4e48d59 Code comment 2020-03-20 10:51:26 +01:00
Laurent Destailleur
082da101e2 Merge pull request #13202 from dolibit-ut/patch-5 
Update README
 2020-02-26 05:15:01 +01:00
UT from dolibit
2543f3f21b Update README 2020-02-25 13:37:39 +01:00
UT from dolibit
e60a6ee13d add composer entry 
add entry of sub-directories:
* composer
To test an upgrade of a lib.
 2020-02-25 13:29:24 +01:00
Alexandre SPANGARO
d6d3fff9dc Merge branch 'develop' into 10.0_intracommreport 2020-02-03 21:15:07 +01:00
Laurent Destailleur
7b10c2440b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 23:08:42 +01:00
Laurent Destailleur
3823070d33 Fix package rpm 2020-01-29 20:11:18 +01:00
Laurent Destailleur
34829644ed Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/time.php
 2020-01-15 13:38:28 +01:00
Laurent Destailleur
db17a08144 Fix distrib in ping 2020-01-15 12:52:04 +01:00
Laurent Destailleur
5772dce460 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2020-01-15 12:09:21 +01:00
Laurent Destailleur
68169b6df0 Fix debian package 2020-01-13 14:43:27 +01:00
Laurent Destailleur
ab4e0fe99c FIX #12758 2020-01-13 14:38:01 +01:00
Laurent Destailleur
b7b87929d0 Merge branch 'develop' into hotfix/docker-ziparchive 2020-01-10 00:08:27 +01:00