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

12304 Commits

Author SHA1 Message Date
Laurent Destailleur
6cf47d0ed1 Fix trans 2022-08-15 02:35:17 +02:00
Laurent Destailleur
826b9a6d62 Fix trans 2022-08-15 02:27:07 +02:00
Laurent Destailleur
5b74f1d3dc Fix duplicate string 
Conflicts:
	htdocs/public/members/new.php
 2022-08-13 12:35:07 +02:00
Laurent Destailleur
d510e3ffcc Fix duplicate string 2022-08-13 12:33:00 +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
5fa110ce74 Fix trans 2022-08-12 15:58:29 +02:00
Laurent Destailleur
0d68c0ba14 Debug v16 2022-08-12 15:07:15 +02:00
Laurent Destailleur
79a5a2b3ab Transifex sync 2022-08-12 14:02:18 +02:00
Laurent Destailleur
bdd9c16401 Fix trans 2022-08-12 12:17:21 +02:00
Laurent Destailleur
c3d5d99044 Fix lang 2022-08-11 23:28:13 +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
Laurent Destailleur
abfaefbe41 Merge pull request #21700 from frederic34/outh2forswiftmailer 
add oauth2 for swiftmailer
 2022-08-11 01:27:53 +02:00
Frédéric FRANCE
bf704ec360 remove duplicate 2022-08-10 13:41:30 +02:00
Frédéric FRANCE
b1814a45ce add oauth2 for swiftmailer 2022-08-10 09:33:58 +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
Laurent Destailleur
f50f8e682d Merge branch 'develop' into 14.0-add_account_number_on_invoices_for_debit 2022-08-10 05:20:12 +02:00
Anthony Berton
9955e51956 NEW - FTP Function mkdir 2022-08-05 09:39:31 +02:00
lmarcouiller
bcd5aacb4c Fix : Spam db public page 2022-08-04 16:53:58 +02:00
Laurent Destailleur
0a623ab068 Fix yogosha#11976 2022-08-04 16:19:41 +02:00
Laurent Destailleur
f56abb1e5f Fix limit on nb of stickers 2022-08-04 16:17:07 +02:00
Laurent Destailleur
4a9c9a97e5 WIP Implement a generic handler for OAuth. 2022-08-04 15:58:00 +02:00
Laurent Destailleur
1093084e9b Better doc 2022-08-04 14:00:04 +02:00
Eric Seigne
6e6982d365 new #21654: add bank account number used on invoices for debit 2022-08-04 09:49:44 +02:00
Faustin
29bb03a25b Conflict 2022-08-03 20:07:16 +02:00
Faustin
868d07ae96 New prop : select auth type with radio box 2022-08-03 20:01:13 +02:00
Laurent Destailleur
514b216864 Merge pull request #21588 from altairisfr/termname 
NEW : TAKEPOS - setup terminal name
 2022-08-03 18:34:16 +02:00
Laurent Destailleur
b63197fe4a Merge pull request #21646 from Hystepik/develop#2 
New : Add DoS security on GETPOST with img Yogosha report 11963
 2022-08-03 17:54:13 +02:00
Laurent Destailleur
c545756b6e Revert "FIX : VAT rate recalculation" 2022-08-03 17:06:19 +02:00
Laurent Destailleur
0c23ed1e80 Merge pull request #21648 from bb2a/NEW---add-function-ftp-put 
NEW - Add function ftp put
 2022-08-03 16:53:48 +02:00
Anthony Berton
985d9b3624 Function 2022-08-03 15:59:53 +02:00
lmarcouiller
c7652af3bc New : Add DoS security on GETPOST with img 2022-08-03 14:24:27 +02:00
Laurent Destailleur
e17c00b4d8 Debug v16 2022-08-02 22:40:21 +02:00
Laurent Destailleur
3fc0478293 Debug v16 2022-08-02 22:39:18 +02:00
Laurent Destailleur
528d54ba79 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-02 20:28:07 +02:00
Laurent Destailleur
a57c96f6d9 Merge branch 'develop' into dev_add_IMAPport_email_collector 2022-08-02 19:12:44 +02:00
Philippe GRAND
a42e0a8892 add translation 2022-08-02 11:57:53 +02:00
jpb
cec9725ced FIX : VAT rate recalculation 
set a checkbox on clone formquestion
 2022-08-01 16:28:44 +02:00
Faustin
a990480ba6 Use of oauth for smtp is available (tested only with google) 2022-08-01 11:31:32 +02:00
Florian HENRY
454fb6b0f5 new: Add IMAP port setting on email collector module 2022-07-31 13:10:38 +02:00
Laurent Destailleur
fe2a0e0340 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/hr_HR/errors.lang
	htdocs/langs/hu_HU/errors.lang
	htdocs/langs/nb_NO/errors.lang
	htdocs/langs/uk_UA/errors.lang
 2022-07-29 18:12:38 +02:00
Laurent Destailleur
629689b13f Fix bad trans %n instead of %s 2022-07-29 18:06:49 +02:00
Laurent Destailleur
77389b3855 Fix trans 2022-07-29 17:35:39 +02:00
Laurent Destailleur
ab2afd772b Merge pull request #21600 from ymollard/eventorg-fixes 
FIX: EventOrganization Missing databases entries and labels
 2022-07-29 15:40:21 +02:00
Laurent Destailleur
9796ec22bf Merge pull request #21615 from bb2a/NEW---FTP-lib-and-lang-file 
NEW - FTP lib
 2022-07-29 15:05:52 +02:00
Laurent Destailleur
f0c8523713 Debug v16 2022-07-29 14:57:11 +02:00
Laurent Destailleur
7404e8fb75 Debug v16 2022-07-29 14:50:21 +02:00
atm-lena
462352b957 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-29 12:06:43 +02:00
Anthony Berton
8e7fa102b8 Clean 2022-07-29 11:14:28 +02:00
Anthony Berton
f10dd33440 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW---FTP-lib 2022-07-29 09:40:18 +02:00
Anthony Berton
77b3e511be Del file lang 2022-07-29 08:51:57 +02:00