Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
119,231 Commits 36 Branches 189 Tags
8b7eaf360e58693a9365544cb1520f28ced7e626
Commit Graph

11706 Commits

Author SHA1 Message Date
Laurent Destailleur
0abfaf6bd7 Fix regression in online signature 2022-08-14 20:45:04 +02:00
Laurent Destailleur
61739cc338 FIX online signature, better error management. 2022-08-14 20:03:13 +02:00
Laurent Destailleur
6a61c495b3 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-08-14 19:22:58 +02:00
Laurent Destailleur
b3656c21bc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-14 19:12:28 +02:00
Laurent Destailleur
4d682aef1f Merge pull request #21727 from fboitel/smtp-by-oauth-refresh-token 
smtp by oauth2: token now refresh before it expires
 2022-08-14 15:41:04 +02:00
Laurent Destailleur
24b1085639 Clean code. Prepare for inputing prices with taxes 2022-08-13 19:30:26 +02:00
Laurent Destailleur
baaa72c80d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-13 12:05:16 +02:00
Laurent Destailleur
498ed449e9 Fix label of invoice status 2022-08-13 12:03:41 +02:00
Laurent Destailleur
326686794a Fix when log handler has been removed 2022-08-12 17:09:14 +02:00
Laurent Destailleur
533e4f2424 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/accountancy.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/products.lang
 2022-08-12 16:03:09 +02:00
Laurent Destailleur
059d0073ff FIX Maxi debug v16 2022-08-12 15:54:50 +02:00
Laurent Destailleur
3c65841e19 Debug v16 2022-08-12 14:41:44 +02:00
Laurent Destailleur
98b5247b27 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-08-12 12:20:23 +02:00
Laurent Destailleur
2d8b544ace Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2022-08-12 12:19:20 +02:00
Laurent Destailleur
110f7a4736 Debug v16 2022-08-12 12:17:49 +02:00
Faustin
6dd17ead60 expire was initiated as true instead of false 2022-08-12 11:42:23 +02:00
Faustin
0898a99314 Token now refresh before it expire 2022-08-12 11:00:02 +02:00
Laurent Destailleur
26b28419fb Merge pull request #21714 from frederic34/outh2forswiftmailer 
token was not refreshing
 2022-08-12 00:05:58 +02:00
Laurent Destailleur
c7aa3b81f2 Merge pull request #21721 from frederic34/patch-4 
doc
 2022-08-12 00:00:22 +02:00
Laurent Destailleur
9bc6c41ca7 Clean code: No more fetch to clone 2022-08-11 23:59:25 +02:00
Laurent Destailleur
8c903bf935 Clean deprecated code. Fix go back to mode1 in supplier invoice 2022-08-11 20:23:44 +02:00
Laurent Destailleur
24b0ae85ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-11 16:55:47 +02:00
Frédéric FRANCE
95878e13a7 doc 2022-08-11 16:51:41 +02:00
Laurent Destailleur
983a530251 Log 2022-08-11 14:36:50 +02:00
atm-lena
2fbba30e2a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-08-11 12:11:41 +02:00
Frédéric FRANCE
d7bccaa70c token was not refreshing 2022-08-11 10:53:15 +02:00
Frédéric FRANCE
b748665296 token was not refreshing 2022-08-11 10:16:20 +02:00
Frédéric FRANCE
75fbebbcb6 token was not refreshing 2022-08-11 10:03:44 +02:00
Laurent Destailleur
febc1b8600 Merge pull request #21470 from thomas-Ngr/develop_fix_formconfirm_send_as_post 
send formconfirm as a POST
 2022-08-11 02:09:15 +02:00
Laurent Destailleur
a5282af145 Merge pull request #21601 from FranckInfans/modifTicket 
Module Tickets - modification select
 2022-08-11 01:41:48 +02:00
Laurent Destailleur
9ad1c845ef Merge pull request #21706 from frederic34/patch-8 
fix php8 warning
 2022-08-11 01:30:17 +02:00
Laurent Destailleur
abfaefbe41 Merge pull request #21700 from frederic34/outh2forswiftmailer 
add oauth2 for swiftmailer
 2022-08-11 01:27:53 +02:00
Laurent Destailleur
6eac066d50 Merge pull request #21705 from frederic34/patch-7 
fix php8 warning
 2022-08-11 01:25:37 +02:00
Laurent Destailleur
698c1ea493 Merge pull request #21707 from frederic34/patch-9 
fix php8 warning
 2022-08-11 01:25:18 +02:00
Laurent Destailleur
cc9c0ae115 Merge pull request #21708 from frederic34/patch-10 
fix php8 warning
 2022-08-11 01:24:59 +02:00
Laurent Destailleur
d997dfc96e Fix scrutinizer 2022-08-11 01:09:56 +02:00
Laurent Destailleur
796274ad65 Doc 2022-08-11 00:47:37 +02:00
Frédéric FRANCE
3efcd5f618 fix log 2022-08-10 16:29:37 +02:00
Frédéric FRANCE
a465aa8f58 fix php8 warning 2022-08-10 14:47:04 +02:00
Frédéric FRANCE
78c5521d80 fix php8 warning 2022-08-10 14:42:07 +02:00
Frédéric FRANCE
5377c6c055 fix php8 warning 2022-08-10 14:38:38 +02:00
Frédéric FRANCE
cded29f684 fix php8 warning 2022-08-10 14:36:29 +02:00
Frédéric FRANCE
af8abecbd6 wip 2022-08-10 13:50:42 +02:00
Frédéric FRANCE
917ab403ff wip 2022-08-10 13:38:18 +02:00
Frédéric FRANCE
f704d1feb2 Merge remote-tracking branch 'upstream/develop' into outh2forswiftmailer 2022-08-10 13:27:18 +02:00
Laurent Destailleur
95b1b3f990 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/emailcollector/class/emailcollector.class.php
	htdocs/index.php
	htdocs/website/index.php
 2022-08-10 13:16:02 +02:00
Frédéric FRANCE
8581156402 add oauth2 for swiftmailer 2022-08-10 10:59:57 +02:00
Frédéric FRANCE
4237f902a3 add oauth2 for swiftmailer 2022-08-10 10:09:52 +02:00
Frédéric FRANCE
32c617b786 add oauth2 for swiftmailer 2022-08-10 09:54:14 +02:00
Laurent Destailleur
3f62cd27eb Merge pull request #21632 from fboitel/NEW-smtp-by-oauth2 
NEW smtp by oauth2
 2022-08-10 05:26:31 +02:00