Frédéric FRANCE
|
95212e9cc1
|
Update ical.class.php
|
2019-02-13 00:44:34 +01:00 |
|
Frédéric FRANCE
|
3de192364b
|
Update ical.class.php
|
2019-02-13 00:12:20 +01:00 |
|
klemens
|
beb2791dde
|
spelling fixes
|
2019-02-10 12:59:09 +01:00 |
|
Laurent Destailleur
|
af92303319
|
Merge pull request #10487 from frederic34/psr2squizwhite
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-08 09:30:25 +01:00 |
|
Laurent Destailleur
|
88fb491441
|
Fix note output
|
2019-02-06 00:40:07 +01:00 |
|
Laurent Destailleur
|
58e6cfd635
|
Fix popup content
|
2019-02-06 00:36:11 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Laurent Destailleur
|
57f81217ee
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/index.php
|
2019-02-03 21:14:44 +01:00 |
|
Laurent Destailleur
|
efe5cd3dd8
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-02-03 21:13:06 +01:00 |
|
Laurent Destailleur
|
72f78ecf3b
|
FIX #10460 compatibility with MariaDB 10.4
|
2019-02-03 20:02:05 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
4f9f0fd7b5
|
Merge branch 'develop' into elseif
|
2019-01-27 17:54:06 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Laurent Destailleur
|
300889f53a
|
# WARNING: head commit changed in the meantime
Fix
|
2019-01-19 13:22:38 +01:00 |
|
Laurent Destailleur
|
2bbaae88d6
|
Fix standardize 'createfromclone' param when cloning
|
2019-01-19 12:46:38 +01:00 |
|
Marc de Lima Lucio
|
1cfd52e7e2
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_actionlist_desc
|
2019-01-09 12:08:55 +01:00 |
|
Marc de Lima Lucio
|
de7dfd3423
|
NEW: actioncomm list: add description column (hidden by default)
|
2019-01-09 11:54:03 +01:00 |
|
Laurent Destailleur
|
d929d93376
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-08 14:19:35 +01:00 |
|
Laurent Destailleur
|
acc665a9f1
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/class/html.form.class.php
|
2019-01-08 14:16:23 +01:00 |
|
Laurent Destailleur
|
1ee0d42408
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-01-08 14:08:22 +01:00 |
|
Marc de Lima Lucio
|
68802c659e
|
FIX: action list: add printFieldListSelect and printFieldListWhere hooks
|
2019-01-08 11:41:58 +01:00 |
|
Laurent Destailleur
|
a445e7597d
|
FIX Popup when having notes of events
|
2018-12-27 06:37:17 +01:00 |
|
Laurent Destailleur
|
fadc9983dc
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-12-27 06:18:03 +01:00 |
|
Laurent Destailleur
|
cd53e22d64
|
FIX Edit description of event
|
2018-12-27 06:16:54 +01:00 |
|
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 |
|