Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
107,259 Commits 36 Branches 189 Tags
a06b51e06c69f7c63e1a941ae68698cb997ae28d
Commit Graph

2828 Commits

Author SHA1 Message Date
Laurent Destailleur
5709f168a8 NEW: MAIN_MAIL_AUTOCOPY_TO can accept several email and special keys 2022-03-17 12:55:12 +01:00
Laurent Destailleur
ac22b1ce81 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-16 21:31:08 +01:00
Laurent Destailleur
600657223b Update functions.lib.php 2022-03-16 20:12:01 +01:00
Gauthier PC portable 024
4731ce9f1d FIX : allow all maths classical operators in custom groups accountancy report 2022-03-16 16:40:08 +01:00
Laurent Destailleur
149f3e6517 Fix for #20372 2022-03-16 16:01:03 +01:00
lmarcouiller
133721904d add pre-commit changes 2022-03-16 15:57:04 +01:00
lmarcouiller
43c39d833a Fix bug preview on closed status page 2022-03-16 15:56:39 +01:00
Laurent Destailleur
32711e5f1f Merge pull request #20145 from atm-GregM/Fix_dolGetButtonAction 
FIX: function dolGetButtonAction change title if html not set
 2022-03-07 17:14:33 +01:00
Laurent Destailleur
88944656be Doc 2022-03-03 02:05:13 +01:00
Laurent Destailleur
0fed4dae13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2022-03-03 01:59:31 +01:00
Laurent Destailleur
3c3d6ab0da Fix regression. Add unit test to detect it. 2022-03-03 01:17:44 +01:00
Laurent Destailleur
72965fdb2e # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
 2022-03-01 19:13:28 +01:00
Laurent Destailleur
3e1580475c Fix phpunit 2022-03-01 19:05:33 +01:00
Laurent Destailleur
e5fd841fe3 Make verifCond more robust against RCE 2022-03-01 18:21:30 +01:00
Laurent Destailleur
12b2a10865 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-01 18:15:13 +01:00
Laurent Destailleur
883f13b388 Fix regression verifCond 2022-03-01 18:14:24 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
Laurent Destailleur
0d024147bf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-28 22:36:31 +01:00
Laurent Destailleur
dfba29b3c6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/api/class/api.class.php
	htdocs/compta/facture/card.php
	htdocs/reception/list.php
 2022-02-28 22:30:17 +01:00
Laurent Destailleur
118b211807 Fix error on null 2022-02-24 12:37:20 +01:00
GregM
cf470c2306 Add auto tooltip 2022-02-23 16:01:07 +01:00
GregM
3edd478a46 Fix empty url : dont add token 2022-02-23 15:36:43 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
8a99bc3b04 Try a more complete sanitization 2022-02-22 18:41:14 +01:00
GregM
e107423c21 fix : change title if html not set 2022-02-22 12:25:30 +01:00
Laurent Destailleur
82250fae62 Fix #yogosha8963 2022-02-21 21:45:28 +01:00
Laurent Destailleur
9dfdce03aa Work on generic reporting tool. 2022-02-21 19:09:26 +01:00
Laurent Destailleur
00e6d2786d Do not use dol_hash anymore for the name of cookies. 2022-02-21 12:21:43 +01:00
Laurent Destailleur
3b6f7bff66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 16:32:51 +01:00
Laurent Destailleur
3d9cdbf136 FIX Debug v15 2022-02-18 16:24:11 +01:00
Laurent Destailleur
6b8312aab0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-17 20:51:25 +01:00
Laurent Destailleur
b013c9a15f Fix duplicate div 2022-02-17 20:37:39 +01:00
Laurent Destailleur
3697cb9ca4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/class/reception.class.php
 2022-02-17 11:34:54 +01:00
Laurent Destailleur
1b53ed09f9 Work on custom report feature 2022-02-15 11:03:48 +01:00
Laurent Destailleur
5d90a00728 Debug v15 2022-02-14 12:27:35 +01:00
Laurent Destailleur
27b94ceea1 Debug v15 2022-02-13 19:26:16 +01:00
Laurent Destailleur
27df3cc02c FIX events on several days may missing the last day in calendar view. 
FIX the drag and drop was not available on some events
 2022-02-11 11:27:50 +01:00
Laurent Destailleur
47800aebfa Fix phpunit and mode save after opening a ref 2022-02-09 15:21:25 +01:00
Laurent Destailleur
7cc06a0ef9 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-02-04 15:40:28 +01:00
Laurent Destailleur
5249840402 FIX #yogosha8628 2022-02-04 15:14:10 +01:00
Laurent Destailleur
a81b437d04 Merge pull request #19971 from atm-quentin/NEW_exclude_natural_search 
NEW Can use ! to make a search that exclude a string
 2022-02-04 12:51:26 +01:00
Laurent Destailleur
ba77700619 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-02 17:58:09 +01:00
Laurent Destailleur
73474a1cea Fix css 2022-02-02 17:57:20 +01:00
Quentin VIAL-GOUTEYRON
f36a513a10 fix sticler 2022-02-01 16:18:02 +01:00
Quentin VIAL-GOUTEYRON
e17d3b029e FIX delete criteria 2022-02-01 12:24:04 +01:00
Quentin VIAL-GOUTEYRON
e086d5a5f2 NEW Exclude filter 2022-02-01 12:21:06 +01:00
Laurent Destailleur
a9737a91e7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-30 16:31:42 +01:00
Laurent Destailleur
87de9a8a23 Fix #yogosha8590 2022-01-30 16:30:19 +01:00
Laurent Destailleur
d9691e16d5 Merge pull request #18081 from lmag/fix_ticket_substitution 
fix: #19428 ticket substitution
 2022-01-28 20:01:10 +01:00