Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
142,956 Commits 35 Branches 179 Tags 1.7 GiB
develop
Commit Graph

4612 Commits

Author SHA1 Message Date
André Schild
ca10e82436 Fix for issue #25828 wrong style numbering 2023-12-29 10:47:45 +01:00
Laurent Destailleur
f6acd6dfe1
Update tcpdf.php 2023-12-28 19:04:23 +01:00
iznomip
459f6eb529
fix(tcpdf): implicit conversion from float 2023-12-28 16:51:58 +01:00
Frédéric FRANCE
00f5a7bc4c
Update PclZipProxy.php 2023-12-22 15:22:40 +01:00
Laurent Destailleur
63c38da901 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-21 19:44:25 +01:00
Eric Seigne
40329db2b2 next fix for #17665 : autoloader collision 2023-12-21 18:20:05 +01:00
atm-adrien
2ad52d9fc9 FIX : Adding the $encode parrameter to recursive _replaceHtmlWithOdtTag() utilisation 2023-12-20 14:22:37 +01:00
Laurent Destailleur
d4f61dcf59 Fix nusoap bug 2023-12-17 13:23:06 +01:00
Laurent Destailleur
78d5e71a8f FIX #yogosha19506 2023-12-16 19:24:41 +01:00
Laurent Destailleur
6201c15d91
Update odf.php 2023-12-11 14:25:20 +01:00
Charlène Benke
486bb3bc65
php V8 Warning 2023-12-11 12:36:54 +01:00
MDW
b0414dd078 Fix utf8_encoding/decoding (rather than creating new function replacements) 2023-12-07 03:37:05 +01:00
Laurent Destailleur
c920428d84 Fix bug in ckeditor when used in mode readonly 2023-11-14 01:48:44 +01:00
Laurent Destailleur
fb65ad919e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-31 13:03:04 +01:00
Laurent Destailleur
70640428dd Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-31 13:02:23 +01:00
atm-adrien
eeca89c75b
FIX : HTML in ODT templates (#26181) 
* FIX : HTML does not work on ODT template

* FIX : add replace

* FIX : Backport V18

* FIX : Modif regexp

* FIX : Add encode parameter

* FIX : PR returns
 2023-10-31 12:20:43 +01:00
ATM-Nicolas
9ef5d4ae2c
NEW : Library including math and financial functions (#25035) 2023-10-12 18:01:16 +02:00
Laurent Destailleur
f1330e5998 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-12 15:01:26 +02:00
Laurent Destailleur
422be6a026 Code comment 2023-10-12 11:30:43 +02:00
Laurent Destailleur
2e431468a0 FIX #25996 FIX #25997 2023-10-01 17:24:25 +02:00
Laurent Destailleur
5ce6b1850f Fix warning 2023-09-10 16:52:43 +02:00
Laurent Destailleur
23876058a1 Update doc for tcpdf patch to do 2023-09-10 14:49:39 +02:00
Laurent Destailleur
329473c3cb Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-21 14:14:44 +02:00
Laurent Destailleur
126634229f Fix debian package 2023-08-18 00:41:54 +02:00
Laurent Destailleur
21559be84d Upgrade ckeditor 4.22.1 2023-07-31 15:36:55 +02:00
Laurent Destailleur
9fd651ee5c FIX warnings 2023-07-30 19:46:23 +02:00
Laurent Destailleur
7cbc8728a5 FIX warnings 2023-07-30 19:44:04 +02:00
Laurent Destailleur
f2db1c406a Remove not used lib 2023-07-20 00:33:50 +02:00
Laurent Destailleur
5a752493fb Revert "Fix tcpdi" 
This reverts commit 7f866cb65f.
 2023-07-03 15:40:48 +02:00
Laurent Destailleur
21624863bd Fix tcpdf 2023-07-03 15:38:02 +02:00
Laurent Destailleur
7f866cb65f Fix tcpdi 2023-07-03 15:37:24 +02:00
Laurent Destailleur
4e3cf0548f Fix phpunit 2023-06-22 21:25:00 +02:00
Laurent Destailleur
9a55b924e1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-19 19:28:52 +02:00
Laurent Destailleur
fdea0bb375 Fix phpunit 2023-06-19 19:17:57 +02:00
Laurent Destailleur
cf8813a93c Fix phpunit 2023-06-19 19:11:36 +02:00
Laurent Destailleur
1c582aeb5f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-19 03:22:40 +02:00
Laurent Destailleur
0bba7e2ed8 FIX OAUth2 module for Google with scopes for people and calendar 2023-06-16 15:00:28 +02:00
Laurent Destailleur
e411807331 FIX OAUth2 module for Google with scopes for people and calendar 2023-06-16 14:31:37 +02:00
Laurent Destailleur
f1beb265ac Fix compatibility with PHP 7.0 2023-06-15 21:44:54 +02:00
Florian HENRY
eee16c3e1b feat: update sabre vobject to 4.5.1 2023-05-27 11:55:48 +02:00
Laurent Destailleur
e0acd9bff2
Merge pull request #24888 from FHenry/dev_upgrade_sabredav 
feat: upgrade to sabre project with last version comptabile with php 7.1 (like dolibarr 18.0)
 2023-05-26 20:19:16 +02:00
Laurent Destailleur
2c4e50195a
Merge pull request #24252 from Raksha-ch/real-swissqr 
Invoices - Add valid SwissQR code on Crabe & Sponge
 2023-05-26 17:45:04 +02:00
Florian HENRY
580f803f73 feat: upgrade to sabre project with last version comptabile with php 7.1 2023-05-26 11:09:51 +02:00
Florian HENRY
0cc761dccd feat: upgrade to sabre/vobject 4.2.2 (last version comptabile with php 7.1) 2023-05-26 10:59:48 +02:00
Florian HENRY
0dc34e3abb feat: upgrade to sabre/vobject 4.2.2 (last version comptabile with php 7.1) 2023-05-26 10:44:44 +02:00
Florian HENRY
27cc40fd07 fix: php warning on sabre lib with same as sabre 4.2.2 2023-05-26 10:27:58 +02:00
Florian HENRY
c66a8d6bc1 fix: php warning on sabre lib 2023-05-26 10:16:56 +02:00
Laurent Destailleur
c3126375af Fix composer - add rector conf 2023-05-17 15:44:26 +02:00
Laurent Destailleur
03f02a95d9 Update lib to ESCPOS v3.0 2023-05-02 05:45:54 +02:00
Laurent Destailleur
936512d0bb Update Stripe lib to 10.7.0 2023-04-24 18:42:04 +02:00
Laurent Destailleur
bf89d61686 NEW Update lib parsedownto 1.7.4 2023-04-22 01:01:08 +02:00
Didier 'OdyX' Raboud
7f609e0839
SwissQR: drop more files from Symfony/Intl 2023-04-16 16:17:46 +02:00
Didier 'OdyX' Raboud
feea77bf59
SwissQR: drop more files from sprain/php-swiss-qr-bill 2023-04-16 16:17:46 +02:00
Didier 'OdyX' Raboud
b6a23fc54c
SwissQR: drop unused dependencies' paths 
Also rename the composer json to .disabled to avoid CI issues
 2023-04-16 16:17:46 +02:00
Didier 'OdyX' Raboud
c254c7b5a1
SwissQR: Add SwissQR invoice at bottom of crabe/sponge invoice models 2023-04-16 16:17:45 +02:00
Didier 'OdyX' Raboud
f53120c915
SwissQR: add Sprain\SwissQrBill and dependencies 2023-04-16 16:17:44 +02:00
Laurent Destailleur
bb0d7c59e6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-12 00:19:17 +02:00
Laurent Destailleur
66923ccf8c Code comment 2023-04-11 18:47:54 +02:00
Laurent Destailleur
a1e6fe7f50 Revert "Try fix MS OAuth2 Imap (from feedback at dolibarr.org/forum/t/emailcollectors-with-microsoft-365-oauth2)" 
This reverts commit 976c2d76f2.
 2023-04-11 10:34:03 +02:00
Laurent Destailleur
ab037cb5e9 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-10 17:15:26 +02:00
Laurent Destailleur
976c2d76f2 Try fix MS OAuth2 Imap (from feedback at 
dolibarr.org/forum/t/emailcollectors-with-microsoft-365-oauth2)
 2023-04-09 22:10:56 +02:00
Laurent Destailleur
301de5b3df Upgrade to JQuery 3.6.4 - Remove patches required by 3.6.0 2023-04-04 20:12:59 +02:00
Laurent Destailleur
777b451316 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-30 12:37:36 +02:00
Laurent Destailleur
b2722e79dc Doc 2023-03-29 14:27:28 +02:00
Laurent Destailleur
83565ec0a7 Fu... composer 2023-03-29 00:06:33 +02:00
Laurent Destailleur
a0bd389f71 Update MobileDetect lib to 2.8.41 2023-03-28 23:54:43 +02:00
Laurent Destailleur
2663c8f2f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-03-28 23:30:26 +02:00
Laurent Destailleur
46a8b5d9cb
Update odf.php 2023-03-26 15:22:12 +02:00
tnegre
e1c56650eb ODF line generation : compat php < 7.4 2023-03-24 12:11:39 +01:00
tnegre
06c64eea98 Update copyright 2023-03-23 11:10:47 +01:00
tnegre
a50e74a86a Merge remote-tracking branch 'tnegre/14.0_fix_odt_generation' into develop_fix_odt_generation 2023-03-23 10:46:36 +01:00
Frédéric FRANCE
cdefdfe610 remove not needed vendor 2023-03-15 00:16:33 +01:00
Frédéric FRANCE
7df3b849d2 upgrade debugbar to avoid php 8.1 warnings 2023-03-14 23:58:03 +01:00
Laurent Destailleur
2b4f4e9e4a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-04 15:25:58 +01:00
Laurent Destailleur
6992fec6c5 Fix php 7.0 compatibility 2023-03-03 16:38:34 +01:00
Laurent Destailleur
54d1250887 Merge + Clean duplicate trigger code. We must use the context. 2023-03-02 02:19:24 +01:00
Laurent Destailleur
14a59483f5 Debug v17 2023-03-01 23:50:02 +01:00
Laurent Destailleur
a64ed59e18 Merge 2023-02-23 22:25:56 +01:00
Anthony Berton
076ffaa15b FIX - error datamatrix 2023-02-21 09:43:35 +01:00
Sylvain Legrand
12cd6c0ddf Fix tcpdi_parser infinite loop 
When mergin some old PDF we may have an infinite loop with this warning : "PHP Warning:  Illegal string offset 'Type' in ./htdocs/includes/tcpdi/tcpdi_parser.php on line 706"
 2023-02-20 18:44:36 +01:00
Laurent Destailleur
0b4cacd291 Use dolChmod 2023-02-17 20:01:53 +01:00
Laurent Destailleur
2a83487c46 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-09 19:37:33 +01:00
Laurent Destailleur
04c0272d05 Doc 2023-02-09 15:58:28 +01:00
Laurent Destailleur
47128f2ccc Debug v17 2023-02-08 04:40:13 +01:00
Laurent Destailleur
310fd4e369 Debug IMAP-PHP for MS 2023-02-08 01:28:14 +01:00
Laurent Destailleur
411fbc1a04 FIX Bug in php-imap library. Fatal error if imap connet fails 2023-02-08 00:13:42 +01:00
Laurent Destailleur
e71ad2e23b Maxi debug of OAuth module 2023-02-07 20:12:53 +01:00
Laurent Destailleur
fe35f5ec28 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-06 14:21:25 +01:00
Philippe GRAND
6c61b80778 fix : Warning: Trying to access array offset on value of type bool in /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/includes/tcpdi/tcpdi_parser.php on line 1376 2023-02-05 14:57:36 +01:00
Laurent Destailleur
9fb08b5a0a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-31 21:28:59 +01:00
Laurent Destailleur
89ce31b840 Debug IMAP with PHP_IMAP 2023-01-31 04:14:39 +01:00
Philippe GRAND
3de3b421b9 fix : Warning: Trying to access array offset on value of type bool in /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/includes/tcpdi/tcpdi_parser.php on line 1377 2023-01-26 14:37:15 +01:00
Laurent Destailleur
66ee541f77 Fix class name collision 2023-01-02 15:18:25 +01:00
Laurent Destailleur
dbc5f5742f Clean code 2022-12-28 12:05:30 +01:00
Laurent Destailleur
685a7dbd59 Clean code. Add a phpunit test to avoid duplicate jquery. 2022-12-24 15:06:32 +01:00
Laurent Destailleur
f86939d332 Fix php warning 2022-12-17 12:55:05 +01:00
hystepik
9d566c41df Fix : api warning php 8.1 2022-11-24 22:52:05 +01:00
Thomas Negre
95781e39c2 Fix HTML tags regex: headings such as <h3> are also HTML tags 2022-11-23 11:56:51 +01:00
Thomas Negre
df761ceef7 Use a constant for HTML tags regex 2022-11-23 11:56:01 +01:00
Laurent Destailleur
0117e65651 Clean no more used files 2022-11-19 10:26:56 +01:00
Laurent Destailleur
0a9381f2d1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-11-16 20:35:29 +01:00
Laurent Destailleur
5b49021bb4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-16 20:20:34 +01:00
Laurent Destailleur
23feae3ee2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-16 20:07:51 +01:00
Laurent Destailleur
45e3f19bd7 Fix remove files not expected 2022-11-16 20:05:52 +01:00
Thomas Negre
00c62bf150 Consistent management of carriage returns 2022-11-16 14:08:41 +01:00
Thomas Negre
a00331c478 Inline comment 2022-11-16 12:07:07 +01:00
Thomas Negre
b0548213b9 copyright and doc 2022-11-16 11:44:46 +01:00
Thomas Negre
a0ef602297 Fix ODT generation : htmlspecialchars() was run too many times on some strings. 2022-11-16 11:25:08 +01:00
Laurent Destailleur
f4dc43914d Remove php8.1 warnings 2022-10-10 14:46:29 +02:00
Laurent Destailleur
b6dbdd6757 Work on php 8.1 compatibility and adodb removal 2022-10-10 14:23:02 +02:00
Frédéric France
cf0213e3e1 update php-iban lib to v4.1.1 2022-09-17 09:11:09 +02:00
Faustin
2ebba79735 Aborting changes on autoload because the problem have already been solved 2022-08-24 15:30:50 +02:00
Faustin
3e8b37cf21 Merge branch 'imap-by-oauth2-attachments' into imap-by-oauth2-attachment 2022-08-24 15:22:39 +02:00
Faustin
24925d0a0c Attachments management and cleaning php-imap lib 2022-08-24 13:04:12 +02:00
Laurent Destailleur
03d086f741 NEW Encrypt all sensitive constants in llx_const 2022-08-24 12:22:11 +02:00
Laurent Destailleur
b15a4e504e Merge IMAP with phpimap 2022-08-23 22:34:24 +02:00
Laurent Destailleur
4c13b08258 Move state into llx_oauth_token 2022-08-22 22:12:13 +02:00
Faustin
fe01577619 cleaning up php-imap lib 2022-08-18 17:01:30 +02:00
Faustin
7639ed81ac cleaning up php-imap lib 2022-08-18 16:42:33 +02:00
Faustin
3bd2e73653 vendor 2022-08-16 18:24:38 +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
6ed053e0d0 Clean v16 2022-08-12 12:48:49 +02:00
fboitel
6f05b20926
Merge branch 'Dolibarr:develop' into NEW-imap-by-oauth2 2022-08-12 11:38:20 +02:00
Faustin
b226f51ef4 Mail collection 2022-08-12 10:33:06 +02:00
Laurent Destailleur
bde596deb3 Upgrade to jquery-ui 1.13.2 #yogosha12015 2022-08-10 17:55:42 +02:00
Laurent Destailleur
8e572d605e Fix php8 2022-08-04 16:16:46 +02:00
fboitel
8cffa0989a
Merge branch 'Dolibarr:develop' into NEW-imap-by-oauth2 2022-08-04 15:34:40 +02:00
Faustin
d4a55e00e2 added Weklek/php-imap lib 2022-08-04 15:32:20 +02:00
Laurent Destailleur
a02c0f55fb Debug v16 2022-07-24 19:58:11 +02:00
Laurent Destailleur
e6e4017047 Fix debug for php 8.1 2022-07-03 14:29:59 +02:00
Laurent Destailleur
34464ac92b Maxi debug of OAuth module. Solve tons of problems. 2022-06-27 22:35:58 +02:00
Laurent Destailleur
866fc4d83e Merge 2022-06-14 16:21:12 +02:00
ptibogxiv
55afe1939d
Fix php8 compatibility 2022-06-12 21:33:08 +02:00
Laurent Destailleur
049799c2e6 Update to ckeditor 4.18 2022-05-16 20:28:00 +02:00
Laurent Destailleur
564382ec6c Upgrade ACE Editor from 1.4.7 to 1.4.14 2022-04-03 12:56:07 +02:00
Laurent Destailleur
45fca25408 NEW Upgrade chartjs library to 3.7.1 2022-04-03 11:52:25 +02:00
Laurent Destailleur
c8bd222c05 Upgrade jquery to 3.6 and jquery-ui to 1.13.1 2022-04-02 19:50:26 +02:00
Laurent Destailleur
fde856a243 Upgrade mobildetect 2.89.39 2022-04-02 19:27:48 +02:00
Laurent Destailleur
adb4af7099 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:39:34 +01:00
Sylvain Legrand
30d8174ac5 Debug TCPDF file name with spaces 2022-02-25 09:26:19 +01:00
Laurent Destailleur
59f749a65f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-09 18:11:09 +01:00
Laurent Destailleur
c7f99f140e Fix remove validator 2022-02-09 17:41:32 +01:00
Laurent Destailleur
9180e9a5c6 Clean code 2022-01-26 14:42:26 +01:00
Laurent Destailleur
6d04bac740 phpcs 2022-01-26 13:50:49 +01:00
Laurent Destailleur
4d2832e8a0
Merge pull request #19764 from FHenry/dev_BDD_19763 
NEW: #19763 DB change only - Can invoice task time per different services
 2022-01-24 12:28:11 +01:00
Laurent Destailleur
ef0a08ad1c
Merge pull request #19570 from Easya-Solutions/12.0 
FIX: Update swiftmailer librairies
 2022-01-23 12:15:43 +01:00
Florian HENRY
e0048c056a Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_BDD_19763 2022-01-21 19:01:42 +01:00
Laurent Destailleur
3ae63cb111 Clean code 2022-01-19 22:49:53 +01:00
Laurent Destailleur
b09cb42e25 Decode extra params of id_token 2022-01-19 22:26:31 +01:00
Laurent Destailleur
4f533c3f9d Merge 2022-01-19 16:54:00 +01:00