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

8917 Commits

Author SHA1 Message Date
Florian HENRY
fa65956801 Merge branch 'develop' into dev_EventOrganisation_draft 2021-02-22 21:02:22 +01:00
Laurent Destailleur
7677edf41d Merge pull request #16357 from bb2a/ADD_SUBSTITUTION_DELIVRY_DATE 
Add substitution for delivry date
 2021-02-22 14:23:37 +01:00
Laurent Destailleur
38465ea591 Fix website editor 2021-02-22 11:51:43 +01:00
Anthony Berton
566c3ada55 Update functions.lib.php 2021-02-22 11:30:00 +01:00
Gauthier PC portable 024
939d406ab1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-22 09:10:24 +01:00
Anthony Berton
3256a17280 Update functions.lib.php 2021-02-21 23:52:22 +01:00
Laurent Destailleur
97ce13bf84 Merge pull request #16369 from frederic34/doltrunc 
replace ... by one char in dol_trunc
 2021-02-21 20:16:07 +01:00
Laurent Destailleur
c9f67b27b2 Merge pull request #16364 from frederic34/memcacheexpire 
memcached can set expire
 2021-02-21 20:14:09 +01:00
Frédéric FRANCE
71d32a7422 fix tests 2021-02-21 15:59:19 +01:00
Frédéric FRANCE
5ceb8163de fix tests 2021-02-21 15:40:03 +01:00
Laurent Destailleur
0a7e692fbf Wip website module 2021-02-21 14:46:52 +01:00
Frédéric FRANCE
548820011a fix tests 2021-02-21 13:39:59 +01:00
Frédéric FRANCE
6e3a1a1d41 fix tests 2021-02-21 13:32:54 +01:00
Frédéric FRANCE
d3a98c7680 replace ... by one char in dol_trunc 2021-02-21 13:00:31 +01:00
Florian HENRY
be34fb4541 tab event ok 2021-02-21 12:32:16 +01:00
Frédéric FRANCE
5096c5bf2d cache socialnetworks array 2021-02-21 10:18:05 +01:00
Frédéric FRANCE
41b89ae677 add files and links 2021-02-21 09:50:58 +01:00
Florian HENRY
556ba2b369 statart card 2021-02-20 23:17:48 +01:00
Frédéric FRANCE
518826ad3d add project 2021-02-20 22:03:11 +01:00
Frédéric FRANCE
65925e60b9 memcached can set expire 2021-02-20 20:48:59 +01:00
Frédéric FRANCE
da37497a38 memcached can set expire 2021-02-20 20:47:01 +01:00
Laurent Destailleur
91d0652476 Clean code of cache 2021-02-20 18:32:16 +01:00
Laurent Destailleur
1dd1dcefc5 Rename cache keys 2021-02-20 18:25:48 +01:00
Laurent Destailleur
341cd06252 Clean code for cache feature 2021-02-20 18:21:10 +01:00
Laurent Destailleur
07578fc518 Merge branch 'develop' into countactioncomm 2021-02-20 17:24:22 +01:00
Laurent Destailleur
cfccc49235 Code comment 2021-02-20 17:23:03 +01:00
Frédéric FRANCE
57e15eb46d try to apply the advice 2021-02-20 17:12:06 +01:00
Laurent Destailleur
ade5d98d56 Rename script to run cron by url to avoid confusion with script from cli 2021-02-20 17:03:27 +01:00
Frédéric FRANCE
ec1dd40a8a enhance caching 2021-02-20 15:52:45 +01:00
Frédéric FRANCE
99fa13cbad enhance caching 2021-02-20 15:41:57 +01:00
Frédéric FRANCE
a63daaa8e1 Merge remote-tracking branch 'upstream/develop' into countactioncomm 2021-02-19 23:31:09 +01:00
Frédéric FRANCE
3238dbec92 Merge remote-tracking branch 'upstream/develop' into countactioncomm 2021-02-19 23:24:53 +01:00
Frédéric FRANCE
1e3ae8348a use cache 2021-02-19 23:16:56 +01:00
Laurent Destailleur
581d137aa8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-19 22:06:56 +01:00
Laurent Destailleur
712c2f20df Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-02-19 22:06:48 +01:00
Laurent Destailleur
b167a4a0c7 FIX date selector when using reduced year (like on smartphone) 2021-02-19 22:00:44 +01:00
Laurent Destailleur
eeedbccc71 Merge pull request #16351 from aspangaro/14a16 
NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD
 2021-02-19 18:20:17 +01:00
Laurent Destailleur
3ab80469ae Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-19 16:11:36 +01:00
Laurent Destailleur
574c0df427 Merge pull request #16338 from aspangaro/13p5 
Fix module asset in development
 2021-02-19 16:05:35 +01:00
Laurent Destailleur
efb32c7d0b Fix test pages 2021-02-19 15:06:36 +01:00
Laurent Destailleur
b6211a7990 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-19 14:12:00 +01:00
Laurent Destailleur
8265f7a07e Code comment 2021-02-19 14:05:46 +01:00
Laurent Destailleur
5340c30db3 FIX missing security test on payment page 
FIX sql error on group by on payment list
 2021-02-19 12:35:26 +01:00
Anthony Berton
a858666b15 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into ADD_SUBSTITUTION_DELIVRY_DATE 2021-02-19 09:13:37 +01:00
Laurent Destailleur
485dd07f67 NEW Can show the holidays on the agenda view. 2021-02-18 23:13:55 +01:00
Alexandre SPANGARO
f462455e89 NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD 2021-02-18 21:39:25 +01:00
Frédéric FRANCE
354872b47c Merge remote-tracking branch 'upstream/develop' into countactioncomm 2021-02-18 18:40:16 +01:00
Anthony Berton
bacafd326e Update functions.lib.php 2021-02-18 16:13:40 +01:00
Laurent Destailleur
2904cc803f Fix selection in combo 2021-02-18 13:56:13 +01:00
Frédéric FRANCE
45e947ee2b count actioncomm for thirdparty tab agenda 2021-02-17 22:16:07 +01:00