Commit Graph

368 Commits

Author SHA1 Message Date
Laurent Destailleur
c891196b5b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-04-25 21:02:01 +02:00
Laurent Destailleur
8cd8b5f401 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-04-23 22:12:06 +02:00
Laurent Destailleur
db0b6b0fd5 Fix label 2023-04-23 22:07:14 +02:00
John Veness
d0e1e16567 Improve English in DoliWamp installer 2023-02-05 18:51:32 +00:00
Laurent Destailleur
f5e5de1eba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-09-25 17:12:03 +02:00
Laurent Destailleur
4dd3b48a75 Fix detection of Edge 2022-09-24 16:03:03 +02:00
Laurent Destailleur
7aa8fa98ec Update doc 2022-09-13 13:43:44 +02:00
Frédéric France
835441d437 remove blank line 2022-09-07 20:14:49 +02:00
Laurent Destailleur
f6d54ca101 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	ChangeLog
	build/exe/doliwamp/doliwamp.iss
	htdocs/comm/action/index.php
	htdocs/comm/action/peruser.php
2022-07-28 02:36:57 +02:00
Laurent Destailleur
e50a5fd81c Update doliwamp package script 2022-07-27 02:31:55 +02:00
Laurent Destailleur
577ccf69bf Clean packager 2022-07-27 01:37:49 +02:00
Laurent Destailleur
d212209b4b Fix packaging for windows 2022-07-27 01:24:04 +02:00
Laurent Destailleur
f1d41a0807 Ignore 2022-07-27 00:58:08 +02:00
Laurent Destailleur
07f2b78758 Clean code of doliwamp. Remove phpmyadmin 2022-05-17 07:51:45 +02:00
Laurent Destailleur
8410f4a9c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/societe/consumption.php
	htdocs/user/class/user.class.php
2021-05-06 16:57:49 +02:00
Laurent Destailleur
f6f4968af6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/societe/consumption.php
2021-05-06 16:52:36 +02:00
Marc de Lima Lucio
139ae3db00 FIX: pgsql: prevent 'WHERE 1' 2021-05-05 11:49:11 +02:00
Laurent Destailleur
acb73966f7 Clean code. Removed phpexcel library. 2020-12-13 16:27:44 +01:00
Laurent Destailleur
cb3e204281 Fix use of dolibarr_main_distrib 2020-10-30 13:06:55 +01:00
Laurent Destailleur
76fc8330a3 Fix for wampserver3_64
Conflicts:
	build/exe/doliwamp/doliwamp.iss
2020-09-13 13:47:46 +02:00
Laurent Destailleur
ca4716dfb7 Fix for wampserver3_64 2020-09-13 13:45:28 +02:00
Laurent Destailleur
8a561c644f Doc 2020-09-13 13:03:33 +02:00
Laurent Destailleur
a8c91069b2 Fix doliwamp installer 2020-06-22 15:24:42 +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
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
db17a08144 Fix distrib in ping 2020-01-15 12:52:04 +01:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
e7beadb58a Remove duplicate 2019-09-28 10:42:58 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
6df36866e1 Remove mentions to register_globals 2019-08-14 15:30:03 +02:00
Laurent Destailleur
0259cde0da Typo 2019-07-01 13:26:45 +02:00
Laurent Destailleur
511b21ca9c Fix for doliwamp 2019-07-01 00:22:28 +02:00
Laurent Destailleur
46ced373be Fix for doliwamp 2019-06-30 23:52:28 +02:00
Laurent Destailleur
8f5b575b19 Fix missing php-intl is not blocking (not working on windows) 2019-06-30 16:19:26 +02:00
Laurent Destailleur
a992690c43 Fix missing php-intl 2019-06-30 14:49:51 +02:00
Laurent Destailleur
b31297b712 Add comment for microsoft edge 2019-06-30 14:45:36 +02:00
Laurent Destailleur
fcf3ec3f0e Fix software is uncountable noun 2019-06-30 14:01:02 +02: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
Laurent Destailleur
6867a8a88a Typo 2019-01-26 13:46:59 +01:00