Commit Graph

1804 Commits

Author SHA1 Message Date
Laurent Destailleur
76fc8330a3 Fix for wampserver3_64
Conflicts:
	build/exe/doliwamp/doliwamp.iss
2020-09-13 13:47:46 +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
Laurent Destailleur
e99ab329fd Remove bans 2020-06-25 22:22:54 +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
1ce3991d81 FIX #14036 2020-06-19 23:17:22 +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
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
Laurent De Coninck
dc364af635 make the docker supports ZipArchive 2020-01-09 09:53:39 +01:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
2019-12-14 14:53:49 +01:00
Laurent Destailleur
17b9964678 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	build/generate_filelist_xml.php
	htdocs/core/class/utils.class.php
	htdocs/core/lib/files.lib.php
2019-12-14 14:43:14 +01:00
Laurent Destailleur
a8de7b850a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/admin/system/filecheck.php
2019-12-14 14:33:46 +01:00
Laurent Destailleur
835d22f556 Merge branch 'develop' into doxygen_todo 2019-12-14 13:46:40 +01:00
Laurent Destailleur
9f2a628c3b Remove bak file 2019-12-14 13:25:21 +01:00
Frédéric FRANCE
18e3a4bcbb Update generate_filelist_xml.php 2019-12-13 12:56:02 +01:00
Frédéric FRANCE
030b78d79f Update generate_filelist_xml.php 2019-12-13 11:16:04 +01:00
Frédéric FRANCE
cad54c6d7a Update generate_filelist_xml.php 2019-12-13 10:42:49 +01:00
Frédéric FRANCE
66805a502a doxygen 2019-12-11 22:53:57 +01:00
Frédéric FRANCE
069e39ead8 Update dolibarr-doxygen-build.pl 2019-12-11 21:09:47 +01:00
Frédéric FRANCE
4309601ffb typo 2019-12-11 20:40:18 +01:00
Arunas Ruksnaitis
5572102ae5 Docker corrections 2019-12-10 00:30:47 +00:00
Daniel Seichter
c2eba28f36 Merge remote-tracking branch 'upstream/develop' into develop 2019-11-14 00:18:03 +01:00
Laurent Destailleur
e79ac7081a Look and feel v11 2019-11-12 17:37:05 +01:00
Laurent Destailleur
c07f1f8246 Try exakat 2019-11-12 16:26:42 +01:00
Daniel Seichter
0e450b2acf remove duplicate entries 2019-11-12 16:17:23 +01:00