Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-14 08:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,151 Commits 39 Branches 191 Tags
07166f44ef8d85f73fc174b18179ea45a0109367
Commit Graph

72151 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
07166f44ef Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-27 06:09:53 +01:00
Laurent Destailleur
64de31ef67 Clean log 2018-12-27 06:09:27 +01:00
Laurent Destailleur
deba3249f8 FIX Bad trigger name 2018-12-27 06:09:03 +01:00
Laurent Destailleur
8ab2ef0cf0 Add log 2018-12-27 06:08:48 +01:00
Laurent Destailleur
2b0240a1e2 Add log 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2018-12-27 06:08:24 +01:00
Laurent Destailleur
fb813fcfb1 Clean log 2018-12-27 06:06:32 +01:00
Laurent Destailleur
88ad059f25 FIX Bad trigger name 2018-12-27 06:04:55 +01:00
Laurent Destailleur
0ffefd71f3 Add log 2018-12-27 05:58:27 +01:00
Laurent Destailleur
ac7e759c17 Add log 2018-12-27 05:48:10 +01:00
Laurent Destailleur
eda3a5bc8c FIX Init of email topic when using a template 2018-12-27 05:18:16 +01:00
Laurent Destailleur
294107bba0 FIX vars for substitution must be null if not applicable (and not '') 2018-12-27 05:07:11 +01:00
Laurent Destailleur
6a708666b2 FIX vars for substitution must be null if not applicable (and not '') 2018-12-27 05:06:37 +01:00
Laurent Destailleur
0f76279a03 FIX Missing token and style 2018-12-27 03:46:14 +01:00
Laurent Destailleur
791b2f485a FIX Missing token and style 2018-12-27 03:45:30 +01:00
Laurent Destailleur
5c516fdae2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-12-26 19:43:01 +01:00
Laurent Destailleur
def732246d Clean dump 2018-12-26 19:16:05 +01:00
Laurent Destailleur
e7b3c91645 Fix dump file 2018-12-26 19:10:22 +01:00
Laurent Destailleur
7b61fc8fd1 Fix setup of dav module 2018-12-23 14:03:19 +01:00
Laurent Destailleur
35debd06fb List of events show user firstname by default 2018-12-23 01:28:36 +01:00
Laurent Destailleur
6557dcfb81 CSS 2018-12-23 00:49:26 +01:00
Laurent Destailleur
da3d1ab8b8 CSS 2018-12-23 00:24:10 +01:00
Laurent Destailleur
af6a7446ee Merge pull request #9871 from laudeco/feature/fontawesome_migration 
migrate font awesome to 5.4.1
 2018-12-22 19:52:39 +01:00
Laurent Destailleur
e6f47717b5 Fix phpunit 2018-12-22 19:48:14 +01:00
Laurent Destailleur
fccd76aeae Fix phpcs 2018-12-22 19:25:08 +01:00
Laurent Destailleur
85375495e5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/public/notice.php
	htdocs/user/card.php
 2018-12-22 19:06:58 +01:00
Laurent Destailleur
94ee18a20a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-22 19:00:15 +01:00
Laurent Destailleur
8d39edf430 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/price.php
 2018-12-22 18:59:49 +01:00
Laurent Destailleur
b3b7a12a16 FIX Look and feel v9 2018-12-22 18:56:29 +01:00
Laurent Destailleur
afac151793 Merge pull request #10261 from torvista/import 
Changes for csv import of Third Parties and Products
 2018-12-22 18:40:37 +01:00
Laurent Destailleur
20f6f8887a Fix typo 2018-12-22 18:40:00 +01:00
Laurent Destailleur
4ae88642ec Fix typo 2018-12-22 18:35:51 +01:00
Laurent Destailleur
a997001dbf Fix typo 2018-12-22 18:34:48 +01:00
Laurent Destailleur
78460d2f60 Merge pull request #10257 from torvista/langs-en_US 
langs-en_US
 2018-12-22 18:33:37 +01:00
Laurent Destailleur
21a20cbd2f Merge pull request #10260 from joseplluis/patch-4 
FIX search by fax field
 2018-12-22 18:25:15 +01:00
Laurent Destailleur
0646d4ab7a Merge pull request #10262 from hregis/8.0_mc 
FIX check if "entity" is already defined in "$param"
 2018-12-22 18:25:00 +01:00
Laurent Destailleur
d928274c74 Merge pull request #10258 from andreubisquerra/master 
Temporary ticket improvement in TakePOS
 2018-12-22 18:24:30 +01:00
Laurent Destailleur
3d509910dd Merge branch 'develop' into master 2018-12-22 18:24:23 +01:00
Laurent Destailleur
6007ada026 Merge pull request #10259 from grandoc/new_branch_20_12_2018 
fix typo and add translation
 2018-12-22 18:23:52 +01:00
Laurent Destailleur
ecb790ad8f Merge branch 'develop' into new_branch_20_12_2018 2018-12-22 18:23:44 +01:00
Laurent Destailleur
ccc7f2e206 Merge pull request #10256 from grandoc/new_branch_19_12_2018 
add comments
 2018-12-22 18:22:57 +01:00
Laurent Destailleur
b8d0e6ed8b Update index.php 2018-12-22 18:22:12 +01:00
Laurent Destailleur
b76c45e8d0 Merge pull request #10264 from hregis/7.0_price 
FIX avoid Class 'AdherentType' not found
 2018-12-22 18:16:40 +01:00
Laurent Destailleur
2b3fbecd49 Fix when random_int is not available 2018-12-22 18:15:49 +01:00
Laurent Destailleur
415fbc19af Fix param 2018-12-22 18:12:29 +01:00
Laurent Destailleur
a5dccd1cc3 Enable by default the test on anti CSRF token 2018-12-22 18:09:26 +01:00
Laurent Destailleur
6c54ea925b Add token into confirm link so we will be able to check we accept the 
confirmation on interface for critical actions
 2018-12-22 17:42:33 +01:00
Laurent Destailleur
91f63f025b Add rolling token into confirm url 2018-12-22 17:34:57 +01:00
Laurent Destailleur
3fee4c3309 The delete of a user need the parameter $user 2018-12-22 17:34:27 +01:00
Laurent Destailleur
f8b0e535fa Code comment 2018-12-22 17:30:22 +01:00
Laurent Destailleur
2b088a73c1 FIX CVE-2018-19998 2018-12-22 17:16:08 +01:00