Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
72,072 Commits 36 Branches 189 Tags
afee39ea68ea5eaad940149d6bf0fad1294de229
Commit Graph

1552 Commits

Author SHA1 Message Date
Laurent Destailleur
2011afe6fb Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Inovea Conseil
9bfcabc8c9 NEW: Add note in tooltips 2018-12-10 16:09:56 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
florian HENRY
7a182c7880 fix #10069 2018-11-30 23:25:44 +01:00
Laurent Destailleur
3b66a2bf9c Fix missing email in popup 2018-11-28 14:20:55 +01:00
Laurent Destailleur
5bd9c14929 Update demo data for 8.0 and 9.0 2018-11-23 14:05:45 +01:00
Frédéric FRANCE
8f17ae8df5 GETPOSTISSET has only one parameter 2018-11-19 20:28:55 +01:00
Laurent Destailleur
39621ec686 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-11-19 20:07:51 +01:00
Laurent Destailleur
25ee999d27 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-19 20:05:32 +01:00
Laurent Destailleur
5f93315097 Clean code 2018-11-19 15:14:46 +01:00
Laurent Destailleur
0886928a64 FIX Link between action and project must use field not the link table 2018-11-19 14:38:30 +01:00
Laurent Destailleur
1e1ccd4c88 Fix pagination in action/event list 2018-11-19 14:25:34 +01:00
florian HENRY
dc2f1e9812 fix list agenda extrafield visibility 2018-11-19 11:25:48 +01:00
Frédéric FRANCE
731d19a29b add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Laurent Destailleur
84983140b6 Merge pull request #9896 from hregis/develop_email 
FIX change my deprecated email
 2018-11-11 17:35:35 +01:00
Laurent Destailleur
de259e9db6 Code comment 2018-11-11 14:36:35 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Laurent Destailleur
68ec172798 Fix setup to enable reminder b email 2018-11-03 12:37:52 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
23a9416c19 Fix deprecated field 2018-10-23 23:51:27 +02:00
Frédéric FRANCE
cab9c81ce2 Update actioncomm.class.php 2018-10-15 21:53:54 +02:00
Laurent Destailleur
1d04ce2185 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-10-09 17:07:32 +02:00
Laurent Destailleur
01c32525df Merge 2018-10-09 17:06:08 +02:00
Laurent Destailleur
bc4ddce314 Merge pull request #9713 from frederic34/patch-9 
Update index.php
 2018-10-09 12:43:32 +02:00
Frédéric FRANCE
b615d03b0b Update index.php 2018-10-09 12:17:51 +02:00
Philippe GRAND
ac214a7258 Standardize code 2018-10-09 08:53:08 +02:00
Philippe GRAND
da560289e3 Standardize code 2018-10-05 15:48:38 +02:00
atm-ph
bfaf25ca2a Fix wrong value for module part and return access denied 2018-10-04 16:55:16 +02:00
John BOTELLA
83d3e5ec39 NEW : can add project's task to agenda on create event card 2018-09-20 10:17:43 +02:00
Laurent Destailleur
a546ef7f2d FIX default day 2018-09-19 20:01:25 +02:00
Laurent Destailleur
92aa6929de Fix go back on agenda view on correct page 2018-09-19 17:03:13 +02:00
Laurent Destailleur
03928a914d Merge pull request #9537 from frederic34/patch-20 
reduce complexity of actioncomm reminder class
 2018-09-18 15:08:46 +02:00
Frédéric FRANCE
beb7a0609c reduce complexity of actioncomm reminder class 2018-09-16 19:06:21 +02:00
Frédéric FRANCE
7b37c41cfb reduce complexity of actioncomm class 2018-09-16 19:04:43 +02:00
Laurent Destailleur
80fb1e0657 NEW Each user can set its prefered default calendar 2018-09-14 11:23:15 +02:00
Frédéric FRANCE
987fdbe73c Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Frédéric FRANCE
f02b2f0239 Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-09 13:35:58 +02:00
Frédéric FRANCE
fa895b2c2d replace select_date 2018-09-09 11:30:40 +02:00
Frédéric FRANCE
a558c3bdac replace select_date 2018-09-09 11:25:59 +02:00
Frédéric FRANCE
8249756726 replace select_date 2018-09-09 10:40:00 +02:00
Frédéric FRANCE
2b62c4ca8f Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-08 10:50:27 +02:00
Philippe GRAND
97c740f510 Merge branch 'develop' of github.com:grandoc/dolibarr into develop 2018-09-06 19:28:10 +02:00
Frédéric FRANCE
4e619dd0ed Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-05 18:51:21 +02:00
Frédéric FRANCE
aa74d2ac38 Update api_agendaevents.class.php 2018-09-04 23:53:37 +02:00
Frédéric FRANCE
65b74ad30f Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Philippe Grand
c32c67ca57 Merge branch 'develop' into develop 2018-09-04 16:58:59 +02:00