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 |
|
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 |
|
Philippe GRAND
|
707f8b7312
|
fix merge
|
2018-09-04 14:49:56 +02:00 |
|
Philippe GRAND
|
7a0c19485e
|
fix merge
|
2018-09-03 09:34:08 +02:00 |
|
Frédéric FRANCE
|
35232b753a
|
move phpcs:ignore
|
2018-09-02 20:37:12 +02:00 |
|
Frédéric FRANCE
|
e13a8ec572
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-02 18:19:45 +02:00 |
|
Frédéric FRANCE
|
b60f7db60a
|
move phpcs:ignore
|
2018-09-02 10:43:34 +02:00 |
|
Frédéric FRANCE
|
e98b8e5e25
|
move phpcs:ignore
|
2018-09-02 09:27:59 +02:00 |
|
Frédéric FRANCE
|
71977514d7
|
Update actioncommreminder.class.php
|
2018-09-02 09:06:51 +02:00 |
|
Philippe GRAND
|
ae2df6be11
|
Standardize and Update code
|
2018-09-01 23:04:46 +02:00 |
|
Philippe GRAND
|
5d273960dc
|
fix conflict
|
2018-09-01 22:40:38 +02:00 |
|
Frédéric FRANCE
|
57fb3dc2f4
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-09-01 13:52:51 +02:00 |
|
Philippe GRAND
|
7354e485b0
|
precise label comment
|
2018-09-01 13:22:08 +02:00 |
|
Philippe GRAND
|
1944ef0dc3
|
conflict resolution
|
2018-09-01 12:38:22 +02:00 |
|
Philippe GRAND
|
9e880d3e72
|
Standardize and update code
|
2018-08-31 17:55:31 +02:00 |
|
Frédéric FRANCE
|
5100b8b7b0
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-30 10:42:47 +02:00 |
|
Frédéric FRANCE
|
6aee680a4f
|
PSR2 ClassDeclaration
|
2018-08-29 22:06:05 +02:00 |
|
Frédéric FRANCE
|
b03f4004ea
|
PSR2 FunctionClosingBrace
|
2018-08-29 21:25:22 +02:00 |
|
Laurent Destailleur
|
3ebfb23407
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/fournisseurs.php
htdocs/ticket/class/ticket.class.php
|
2018-08-29 20:22:50 +02:00 |
|
Frédéric FRANCE
|
fe4260a014
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-28 09:34:53 +02:00 |
|
Laurent Destailleur
|
2349f99eb9
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-08-28 02:58:51 +02:00 |
|
Laurent Destailleur
|
9c6ce4b29d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-28 02:36:15 +02:00 |
|
Laurent Destailleur
|
2db84a679e
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/modulebuilder/index.php
|
2018-08-28 02:35:45 +02:00 |
|
Laurent Destailleur
|
7219bac0b2
|
Merge pull request #9168 from frederic34/trimtrailing
Trimtrailing
|
2018-08-28 02:30:02 +02:00 |
|
Laurent Destailleur
|
32ef9695a7
|
Merge pull request #9282 from frederic34/patch-19
Update card.php
|
2018-08-28 02:28:35 +02:00 |
|
Laurent Destailleur
|
7462a1ae1d
|
Update card.php
|
2018-08-28 02:27:56 +02:00 |
|
Laurent Destailleur
|
0a7ce338f9
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/class/commondocgenerator.class.php
|
2018-08-28 02:23:34 +02:00 |
|
Frédéric FRANCE
|
85ae8f3901
|
Update card.php
|
2018-08-24 09:29:17 +02:00 |
|
Philippe GRAND
|
2fa82edd39
|
Standardize and update code
|
2018-08-23 17:07:27 +02:00 |
|
Frédéric FRANCE
|
343e6ce8b3
|
typo
|
2018-08-23 14:34:27 +02:00 |
|
Philippe Grand
|
eeaa257f11
|
Update cactioncomm.class.php
|
2018-08-22 22:39:51 +02:00 |
|
Philippe Grand
|
c626dcb710
|
Update actioncomm.class.php
|
2018-08-22 22:38:00 +02:00 |
|
Philippe GRAND
|
449ef9c464
|
Update and standardize code
|
2018-08-22 18:12:44 +02:00 |
|
Frédéric FRANCE
|
0334409d18
|
Update card.php
|
2018-08-22 13:43:30 +02:00 |
|
Philippe GRAND
|
95349365ba
|
Update and standardize code
|
2018-08-22 11:39:37 +02:00 |
|
Philippe GRAND
|
0ffad50974
|
Update and standardize code
|
2018-08-22 11:24:31 +02:00 |
|
Philippe GRAND
|
29f15b4ae6
|
Update and standardize code
|
2018-08-22 10:51:55 +02:00 |
|
Frédéric FRANCE
|
6b6daf178f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-21 20:57:58 +02:00 |
|
Frédéric FRANCE
|
aba69b94b2
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-21 14:03:02 +02:00 |
|
Laurent Destailleur
|
0799970804
|
Merge pull request #9248 from frederic34/FunctionDeclaration
function declaration
|
2018-08-21 13:41:56 +02:00 |
|
Laurent Destailleur
|
85eed6cf80
|
Merge branch 'develop' into trimtrailing
|
2018-08-21 13:40:04 +02:00 |
|
Philippe GRAND
|
da951e61f2
|
Update and standardize code
|
2018-08-17 22:29:21 +02:00 |
|
Laurent Destailleur
|
4e02b134da
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2018-08-16 14:50:04 +02:00 |
|
Frédéric FRANCE
|
54a078149a
|
function declaration
|
2018-08-15 17:34:35 +02:00 |
|
Laurent Destailleur
|
5a1a6ac095
|
Fix error message
|
2018-08-15 14:42:03 +02:00 |
|
Frédéric FRANCE
|
850ac34020
|
mark non camelCaps function
|
2018-08-13 17:26:32 +02:00 |
|
Frédéric FRANCE
|
6113b536a0
|
remove superfluous spaces
|
2018-08-12 19:59:39 +02:00 |
|
Philippe GRAND
|
948647f3f9
|
comment translation
|
2018-08-04 14:17:51 +02:00 |
|
Juanjo Menent
|
b8efe3b239
|
Merge pull request #9172 from grandoc/new_branch_28_07_2018
standardize
|
2018-08-02 11:27:02 +02:00 |
|
Philippe GRAND
|
de70bf983e
|
standardize
|
2018-07-29 13:40:35 +02:00 |
|
Frédéric FRANCE
|
a0a5d33641
|
test include
|
2018-07-26 17:30:53 +02:00 |
|
Laurent Destailleur
|
dc2fec8f57
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-07-24 19:37:04 +02:00 |
|
Laurent Destailleur
|
d871b8964f
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-07-24 19:23:40 +02:00 |
|
Laurent Destailleur
|
20f178fdfe
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/comm/action/index.php
htdocs/core/lib/functions.lib.php
|
2018-07-24 19:22:00 +02:00 |
|
John BOTELLA
|
1daba56bbc
|
Fix count(): Parameter must be an array or an object that implements Countable
|
2018-07-09 10:05:53 +02:00 |
|
Inovea Conseil
|
30cff2bb36
|
ADD check user's rights
|
2018-07-05 11:52:41 +02:00 |
|
Laurent Destailleur
|
4a5fd35e11
|
Look and feel v8
|
2018-06-13 22:57:41 +02:00 |
|
Laurent Destailleur
|
8aa7956b4f
|
Fix missing extraparams field in insert action
|
2018-06-07 12:53:06 +02:00 |
|
Laurent Destailleur
|
7a8fac4198
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/list.php
|
2018-06-04 15:14:26 +02:00 |
|
Laurent Destailleur
|
de2ffa1122
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/comm/action/listactions.php
|
2018-06-04 14:09:17 +02:00 |
|
Laurent Destailleur
|
29ee5dffc4
|
Clean code
|
2018-06-04 12:55:55 +02:00 |
|
florian HENRY
|
b996237142
|
fix: when agenda is filterd with "todo" event, do not display "not
applicable" event
|
2018-05-30 13:37:17 +02:00 |
|
Frédéric FRANCE
|
d986909109
|
loadlangs
|
2018-05-26 23:52:52 +02:00 |
|
Frédéric FRANCE
|
f24a6ed4d6
|
loadlangs
|
2018-05-26 19:03:41 +02:00 |
|
Günter Lukas
|
3adfce35e2
|
Update card.php
|
2018-05-24 13:32:13 +02:00 |
|
Günter Lukas
|
1b237a75b9
|
Update card.php
|
2018-05-24 13:31:23 +02:00 |
|
Laurent Destailleur
|
e51aa68284
|
Fix link to warehouses for events
|
2018-05-24 12:16:04 +02:00 |
|
Laurent Destailleur
|
c9d23d3930
|
Merge pull request #8783 from grandoc/new_branch_12_05_2018
Clean and update code
|
2018-05-18 08:56:06 +02:00 |
|
Laurent Destailleur
|
67ed1e0841
|
Fix filter criteria when using backto for events
|
2018-05-16 20:59:45 +02:00 |
|
Laurent Destailleur
|
133e736801
|
Fix save code
|
2018-05-16 20:52:45 +02:00 |
|
Philippe GRAND
|
29c735d8bd
|
Clean and update code
|
2018-05-12 10:46:17 +02:00 |
|
Laurent Destailleur
|
32ace6a8cf
|
NEW Add hook setContentSecurityPolicy
|
2018-04-30 15:17:38 +02:00 |
|
Regis Houssin
|
2906358383
|
Fix: use "socpeople" instead "societe"
|
2018-04-27 10:42:10 +02:00 |
|
Laurent Destailleur
|
461ae46cc4
|
FIX When on a high page and searching for a small result, list was not
visible.
|
2018-04-24 11:37:57 +02:00 |
|
Laurent Destailleur
|
46e448a086
|
Fix default agenda view
|
2018-04-22 17:57:20 +02:00 |
|
Laurent Destailleur
|
c81c744aaf
|
Clean deprecated var
|
2018-04-21 13:14:58 +02:00 |
|
Laurent Destailleur
|
ccd9aa8059
|
Fight against dolibarr warnings
|
2018-04-21 12:16:12 +02:00 |
|
Laurent Destailleur
|
38d200d8a6
|
Fix left menu
|
2018-04-20 13:23:34 +02:00 |
|
Laurent Destailleur
|
bbfc4a3e17
|
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
|
2018-04-18 03:26:15 +02:00 |
|
Laurent Destailleur
|
0d0da234b1
|
Lowercase NULL, TRUE, FALSE according to PSR2
|
2018-04-16 13:51:16 +02:00 |
|
Laurent Destailleur
|
be965bdbab
|
Clean code
|
2018-04-13 13:28:48 +02:00 |
|
Laurent Destailleur
|
1521b0595b
|
Clean code
|
2018-04-13 11:03:03 +02:00 |
|
Laurent Destailleur
|
7108f68db9
|
Remove old deprecated hook insertExtraFields. Triggers must be used for
action on CRUD events.
|
2018-04-10 12:03:01 +02:00 |
|
Laurent Destailleur
|
d46a8eb8f0
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/company.php
|
2018-04-07 12:30:30 +02:00 |
|
Laurent Destailleur
|
1009a629d9
|
Try better Fix for #8432
|
2018-04-06 13:20:09 +02:00 |
|
Laurent Destailleur
|
2207e5e470
|
Fix tooltip
|
2018-04-05 19:23:36 +02:00 |
|
Laurent Destailleur
|
43f8834b28
|
Uniformize code with the new module builder framework
|
2018-03-31 18:48:27 +02:00 |
|
Laurent Destailleur
|
6ccdb52229
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-03-29 13:30:22 +02:00 |
|
Laurent Destailleur
|
b806b85761
|
Fix field filtert is set twice
|
2018-03-29 11:15:50 +02:00 |
|
Laurent Destailleur
|
6ef1dbbe0f
|
FIX auto open contract if one result found
|
2018-03-24 18:28:06 +01:00 |
|
Laurent Destailleur
|
6e52c896f2
|
Dolibarrize module ticket
|
2018-03-22 10:46:42 +01:00 |
|
Laurent Destailleur
|
e639f2a91f
|
Removed deprecated method classer_facturee(). Duplicate of
classifyBilled
|
2018-03-16 10:51:12 +01:00 |
|
Laurent Destailleur
|
c962b89495
|
NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull
|
2018-03-15 20:46:55 +01:00 |
|
Laurent Destailleur
|
0258d3aeeb
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-03-13 18:04:59 +01:00 |
|
ptibogxiv
|
4f6f0b302e
|
FIX for nondisplay of fk_element 's id in REST API response
the fk_element don't display when the call is made with REST API (reason non found)
|
2018-03-13 10:28:44 +01:00 |
|
Laurent Destailleur
|
78b0585798
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/taxes.php
|
2018-03-12 19:09:57 +01:00 |
|
Laurent Destailleur
|
a3d25b24d3
|
FIX #8285 Extrafields now reported by /api/index.php/agendaevents/{id}
|
2018-03-11 19:27:03 +01:00 |
|
Laurent Destailleur
|
4070d78d13
|
Fix phpcs
|
2018-03-11 02:18:46 +01:00 |
|
Laurent Destailleur
|
7f469e9f6f
|
Fix PHPCS
|
2018-03-11 02:04:08 +01:00 |
|
Alexis Algoud
|
129c032118
|
NEW hidden conf to set nb weeks to show into user view
|
2018-03-10 16:46:57 +01:00 |
|
Laurent Destailleur
|
7e3b118257
|
Standardize output
|
2018-03-07 12:03:40 +01:00 |
|
Laurent Destailleur
|
1ca5c7083a
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
|
2018-03-07 11:54:48 +01:00 |
|
Laurent Destailleur
|
f800d50fec
|
WIP to show event per hours
|
2018-03-07 11:53:30 +01:00 |
|
Laurent Destailleur
|
a0a9e12178
|
Fix css
|
2018-03-07 11:29:50 +01:00 |
|
Laurent Destailleur
|
1a5cc4e516
|
Fix in edit mode, title of event is required
|
2018-03-07 11:06:14 +01:00 |
|
Laurent Destailleur
|
f3fd5f4cfa
|
FIX Label of event show twice
|
2018-03-07 11:03:35 +01:00 |
|
Laurent Destailleur
|
1e6a55745c
|
CSS
|
2018-03-06 11:54:05 +01:00 |
|
Laurent Destailleur
|
864edce665
|
NEW Accept anonmymous events (no user assigned)
NEW Online payment now record the payment on invoices
|
2018-03-04 19:39:46 +01:00 |
|
Laurent Destailleur
|
f545d2a134
|
NEW Can add filter actiontype and notactiontype on event ical export
|
2018-02-28 20:06:28 +01:00 |
|
Laurent Destailleur
|
b4446764f8
|
Clean code of deprecated usage
|
2018-02-21 14:48:25 +01:00 |
|
Laurent Destailleur
|
c4130730cb
|
Clean code around fetch_optionals()
|
2018-02-20 19:38:18 +01:00 |
|
Laurent Destailleur
|
b364b2a4de
|
Fix selection of filter in agenda views
|
2018-02-06 01:16:51 +01:00 |
|
Laurent Destailleur
|
2fbe4637ac
|
Fix bad filter link
|
2018-02-05 23:05:37 +01:00 |
|
Laurent Destailleur
|
0e3d5ea9e5
|
Fix missing translation
|
2018-02-04 11:44:39 +01:00 |
|
Laurent Destailleur
|
59eefa46e6
|
Fix duplicate search field
|
2018-01-16 18:02:36 +01:00 |
|
Laurent Destailleur
|
1351a43a30
|
FIX Maxi debug of permission for users external or restricted to sales
representatives
|
2017-12-18 16:13:05 +01:00 |
|
Laurent Destailleur
|
1251807f54
|
Fix several pb in links to projects on create page
|
2017-12-12 10:37:51 +01:00 |
|
Laurent Destailleur
|
95cb5025a2
|
Fix length of month too large
More complete template
|
2017-12-08 16:15:41 +01:00 |
|
Laurent Destailleur
|
e8327fd9a1
|
Fix the eatby/sellby date was not visible.
|
2017-12-02 10:43:01 +01:00 |
|
Laurent Destailleur
|
0a73daba01
|
Security: on target=_blank, we must have rel="noopener"
|
2017-12-02 03:04:52 +01:00 |
|
Laurent Destailleur
|
670465fcd8
|
Fix responsive and search
|
2017-12-01 12:01:17 +01:00 |
|
Laurent Destailleur
|
c269dcc4d5
|
Fix scrutinizer
|
2017-11-29 17:58:13 +01:00 |
|
Laurent Destailleur
|
682afe8918
|
Fix scrutinizer
|
2017-11-29 16:25:12 +01:00 |
|
florian HENRY
|
94285ae494
|
factorization of extrafeild into list
|
2017-11-27 15:24:29 +01:00 |
|
Laurent Destailleur
|
0b9a3087ea
|
Fix bug reported by scrutinizer
|
2017-11-25 12:11:02 +01:00 |
|
Laurent Destailleur
|
944d666d1a
|
Fix bugs
|
2017-11-25 11:27:24 +01:00 |
|
Laurent Destailleur
|
4cff4c6935
|
Simplify and standardize code for agenda pages
|
2017-11-25 00:12:45 +01:00 |
|
Laurent Destailleur
|
c16a150a70
|
NEW Remove background on agenda view when event is a not busy event.
|
2017-11-24 20:02:46 +01:00 |
|
Regis Houssin
|
2a7b04e795
|
Fix: wrong table name and id field name
|
2017-11-23 12:18:49 +01:00 |
|
Laurent Destailleur
|
5b77fe393e
|
Fix: contact not preselected
|
2017-11-23 00:59:43 +01:00 |
|
Laurent Destailleur
|
adce4b5b7b
|
Debug multi contact on event.
Prepare also code to manage properties of attendees of event
|
2017-11-22 14:42:47 +01:00 |
|
atm-ph
|
fbc761cbac
|
Fix rename TContactId into socpeopleassigned
|
2017-11-18 12:36:03 +01:00 |
|
atm-ph
|
15a8f2037b
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
|
2017-11-18 11:54:21 +01:00 |
|
Laurent Destailleur
|
481b810fd2
|
Merge pull request #7810 from frederic34/patch-1
fix trigger when module not enabled
|
2017-11-17 12:59:59 +01:00 |
|
Laurent Destailleur
|
4f25bc5e3b
|
NEW detection of edge browser
|
2017-11-16 14:44:55 +01:00 |
|
Frédéric FRANCE
|
0d79cc50b0
|
Merge remote-tracking branch 'upstream/develop' into patch-1
|
2017-11-16 13:41:24 +01:00 |
|
Laurent Destailleur
|
a7aa3ee438
|
Rename file
|
2017-11-16 12:21:21 +01:00 |
|
Laurent Destailleur
|
c527189088
|
Standardize page name
|
2017-11-16 12:18:25 +01:00 |
|
Laurent Destailleur
|
19d0283b63
|
Fix doxygen
|
2017-11-16 12:13:23 +01:00 |
|
Laurent Destailleur
|
c85acbfc11
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/install/repair.php
|
2017-11-14 19:47:33 +01:00 |
|
Laurent Destailleur
|
0e2f64af72
|
CSS
|
2017-11-14 12:18:02 +01:00 |
|
Laurent Destailleur
|
fa92c53ff6
|
Fix pb when showing dictionaries
|
2017-11-14 11:13:24 +01:00 |
|
Frédéric FRANCE
|
96031b0787
|
Update listactions.php
|
2017-11-14 11:05:58 +01:00 |
|
Laurent Destailleur
|
11cb9c0d81
|
Code simpler
|
2017-11-14 01:57:50 +01:00 |
|
Laurent Destailleur
|
3dc06977af
|
Update listactions.php
|
2017-11-14 01:33:44 +01:00 |
|
alexis Algoud
|
19a2c2fe06
|
Merge branch 'NEW_burger_menu_list_action' of github.com:atm-alexis/dolibarr into develop
|
2017-11-13 10:05:29 +01:00 |
|
Laurent Destailleur
|
9a8423ba5e
|
Start to show work on repeat events
|
2017-11-13 02:46:13 +01:00 |
|
Laurent Destailleur
|
90615a8682
|
Fix busy tag not set sometimes
|
2017-11-13 02:44:02 +01:00 |
|
Laurent Destailleur
|
186c8cdbf0
|
Fix selection of contact into creation of event
|
2017-11-12 13:40:05 +01:00 |
|
Alexis Algoud
|
7922fd0281
|
NEW add burger menu to list action comm
|
2017-11-11 18:41:35 +01:00 |
|
Laurent Destailleur
|
d938a56282
|
Clean code
|
2017-11-11 01:10:17 +01:00 |
|
Laurent Destailleur
|
a329f7dc75
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
build/exe/doliwamp/doliwamp.iss
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/list.php
|
2017-11-05 18:50:14 +01:00 |
|
Laurent Destailleur
|
048766bd24
|
Fix sql error
|
2017-11-03 17:24:14 +01:00 |
|
gauthier
|
03544f783a
|
FIX : Wrong alias sql
|
2017-11-02 16:16:29 +01:00 |
|
Laurent Destailleur
|
310bf4bde4
|
Update peruser.php
|
2017-11-02 15:51:35 +01:00 |
|
Laurent Destailleur
|
ec3a07cd52
|
Try to restore compatibility when actioncode=CODE1,CODE2,...
|
2017-11-02 15:50:55 +01:00 |
|
Laurent Destailleur
|
63a363080e
|
Update index.php
|
2017-11-02 15:48:56 +01:00 |
|
Laurent Destailleur
|
323a0d7d0d
|
Update index.php
|
2017-11-02 15:48:24 +01:00 |
|
Laurent Destailleur
|
1b28c45e2c
|
PERF Links in getNomUrl use only one tag a instead of 2.
|
2017-11-02 15:19:14 +01:00 |
|
gauthier
|
b7cf434ebd
|
FIX : Filter type on actioncomm with multiselect doesn't work
|
2017-11-02 14:58:33 +01:00 |
|
Laurent Destailleur
|
c226fc69d1
|
Update actioncomm.class.php
|
2017-11-02 10:45:27 +01:00 |
|
Laurent Destailleur
|
4220d02dd4
|
Debug module blocked log
|
2017-10-31 23:57:37 +01:00 |
|
Laurent Destailleur
|
9458c80c48
|
Work on reminders
|
2017-10-31 23:10:29 +01:00 |
|
Laurent Destailleur
|
b29f32171c
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/comm/action/class/actioncomm.class.php
htdocs/contrat/card.php
htdocs/core/lib/project.lib.php
htdocs/filefunc.inc.php
|
2017-10-30 18:22:26 +01:00 |
|
Laurent Destailleur
|
cd5e43483e
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/contrat/card.php
htdocs/core/lib/project.lib.php
htdocs/expedition/card.php
htdocs/projet/class/task.class.php
|
2017-10-28 22:08:16 +02:00 |
|
Laurent Destailleur
|
f02e731c67
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/core/lib/project.lib.php
|
2017-10-27 02:32:09 +02:00 |
|
Laurent Destailleur
|
708666349f
|
Minor fix
|
2017-10-26 18:35:32 +02:00 |
|
Laurent Destailleur
|
202712be94
|
Work on module builder
|
2017-10-25 22:02:07 +02:00 |
|
Laurent Destailleur
|
fb843430bf
|
FIX #7671
|
2017-10-22 03:22:31 +02:00 |
|
Juanjo Menent
|
75580f253e
|
FIX: Agenda events are not exported in the ICAL, VCAL if begin exactly with the same $datestart
|
2017-10-20 12:57:32 +02:00 |
|
Laurent Destailleur
|
7f85d73001
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/card.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contrat/card.php
htdocs/expensereport/card.php
htdocs/fichinter/list.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/paiement/card.php
htdocs/livraison/card.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/societe/rib.php
htdocs/supplier_proposal/list.php
htdocs/user/card.php
|
2017-10-18 19:51:29 +02:00 |
|
Laurent Destailleur
|
74b401b70d
|
Fix bad perm to delete file
|
2017-10-18 17:40:47 +02:00 |
|
Laurent Destailleur
|
8626d6279a
|
Fix perm to delete files
|
2017-10-18 17:21:30 +02:00 |
|
Laurent Destailleur
|
eb1fdca157
|
NEW Can create intervention from a proposal
|
2017-10-17 10:44:18 +02:00 |
|
Laurent Destailleur
|
082d59439f
|
Fix add missing seconds when adding event so sort order on date is ok
|
2017-10-17 10:43:37 +02:00 |
|
atm-ph
|
bab43b043e
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
|
2017-10-13 09:52:56 +02:00 |
|
Laurent Destailleur
|
85606126a9
|
Standardize code for events
|
2017-10-04 12:58:13 +02:00 |
|
Laurent Destailleur
|
3f3a5e0921
|
Merge pull request #7499 from atm-gauthier/NEW_custom_meteo
New custom meteo
|
2017-10-02 00:48:52 +02:00 |
|
Laurent Destailleur
|
0e15aef44f
|
CSS
|
2017-09-30 00:30:58 +02:00 |
|
gauthier
|
1694737e0b
|
NEW : new param on load_board() function in ActionComm class to avoid duplicate code
|
2017-09-27 10:09:21 +02:00 |
|
Laurent Destailleur
|
36b199e78c
|
Merge pull request #7433 from tysauron/patch-11
For use ajax combobox for societe and contacts in action card create.
|
2017-09-26 20:13:52 +02:00 |
|
gauthier
|
7f938bc517
|
NEW : unexistant function load_state_board() on several objects
|
2017-09-26 12:32:58 +02:00 |
|
Laurent Destailleur
|
e3da4188e2
|
GETPOST must not clean data for text input.
|
2017-09-25 00:16:52 +02:00 |
|
Laurent Destailleur
|
e56840b9ec
|
Clean deprecated code
|
2017-09-21 11:35:18 +02:00 |
|
tysauron
|
5643d4e867
|
Rename "->fk_action" in "->type_id"
(is old name)
|
2017-09-19 17:26:18 +02:00 |
|
tysauron
|
0803e03ca9
|
For use ajax combobox for societe and contacts in action card create.
|
2017-09-19 14:53:34 +02:00 |
|
Laurent Destailleur
|
fa18e788b5
|
Fix must use photo of user
|
2017-09-17 17:29:00 +02:00 |
|
Laurent Destailleur
|
0cf67944fa
|
Clean code
|
2017-09-16 13:14:46 +02:00 |
|
Laurent Destailleur
|
bd7c4fe940
|
NEW Summary of last events on a card are sorted on decreasing date.
|
2017-09-16 10:12:44 +02:00 |
|
Laurent Destailleur
|
b13dbf1f06
|
Clean code. Make selection of template working even if public.
|
2017-09-16 00:49:46 +02:00 |
|
Laurent Destailleur
|
5e34b121dd
|
Add more robust php unit to detect not escaped sql. Fix not escaped sql
|
2017-09-15 15:41:07 +02:00 |
|
Laurent Destailleur
|
c44a5ede43
|
FIX Several problem with the last event box on project/tasks
Conflicts:
htdocs/core/lib/functions2.lib.php
|
2017-09-13 15:16:06 +02:00 |
|
Laurent Destailleur
|
7767ac2aa7
|
FIX Several problem with the last event box on project/tasks
|
2017-09-13 15:12:54 +02:00 |
|
Laurent Destailleur
|
c5567fafd4
|
Enhancement for smartphone
|
2017-09-04 09:25:53 +02:00 |
|
atm-ph
|
8188abd4cd
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
|
2017-08-31 11:09:02 +02:00 |
|
Laurent Destailleur
|
c573df4f0e
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/user/card.php
|
2017-08-26 22:33:56 +02:00 |
|
Laurent Destailleur
|
4052e15565
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/comm/action/card.php
|
2017-08-26 21:58:29 +02:00 |
|
Laurent Destailleur
|
90afbcb034
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/bank.php
htdocs/core/lib/functions.lib.php
|
2017-08-23 17:02:53 +02:00 |
|
Laurent Destailleur
|
aae24c26a3
|
Some fixes with smartphones
|
2017-08-22 20:20:34 +02:00 |
|
Regis Houssin
|
18ca96e285
|
Fix: file delete link doesn't work
|
2017-08-22 18:33:00 +02:00 |
|
Laurent Destailleur
|
2104ab9aed
|
Disable event reminder
|
2017-08-21 13:11:29 +02:00 |
|
Laurent Destailleur
|
8cd2235b4b
|
Start to introduce cron for email reminder.
|
2017-08-03 11:42:22 +02:00 |
|
Laurent Destailleur
|
5b1f5b0f20
|
Fix translation done twice into field title of array
|
2017-08-02 13:31:53 +02:00 |
|
Laurent Destailleur
|
cfebbe3cc4
|
Fix css
|
2017-07-31 03:16:28 +02:00 |
|
Laurent Destailleur
|
837afa0e65
|
Fix better way to get info for contact/thirdparty on agenda
|
2017-07-29 04:07:46 +02:00 |
|
Laurent Destailleur
|
2a36166839
|
Fix error method on non object
|
2017-07-29 02:11:45 +02:00 |
|
Laurent Destailleur
|
cae21d3937
|
Fix in agenda output per user/type (reduce memory usage)
|
2017-07-29 01:59:26 +02:00 |
|
Laurent Destailleur
|
2870798d07
|
Fix remove warnings
|
2017-07-13 00:35:10 +02:00 |
|
Laurent Destailleur
|
4b4dcf2e01
|
Fix overload with a protection for rare case with very high nb of event
|
2017-07-12 23:05:26 +02:00 |
|
Laurent Destailleur
|
10cb7b2524
|
Fix remove warnings
|
2017-07-09 20:31:27 +02:00 |
|
Laurent Destailleur
|
e1ba69eee0
|
Fix edit of automatic event should keep its type.
|
2017-07-08 00:19:30 +02:00 |
|
Laurent Destailleur
|
de1a7042d4
|
Fix filter on list of actions
|
2017-07-07 10:55:42 +02:00 |
|
phf
|
49b8689f2d
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
|
2017-07-05 11:02:39 +02:00 |
|
Laurent Destailleur
|
0ee93fb00c
|
Fix conflict between option login and logina and logint in agenda export
|
2017-07-04 10:29:38 +02:00 |
|
Laurent Destailleur
|
b6002bd1f8
|
Fix bad link
|
2017-06-28 18:29:57 +02:00 |
|
Laurent Destailleur
|
08af9bf365
|
List before
|
2017-06-27 10:37:00 +02:00 |
|
Laurent Destailleur
|
34f3552dc7
|
Fix missing image of user
|
2017-06-27 04:31:29 +02:00 |
|
Laurent Destailleur
|
3fdfebf7ef
|
Fix position of top menu does not follow 'position' field.
|
2017-06-27 04:25:41 +02:00 |
|
Juan Bautista Mesa Roldán
|
0f5dc90bae
|
Fixing pages warning when value is null
|
2017-06-24 16:45:45 +02:00 |
|
Laurent Destailleur
|
86a6a83647
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
|
2017-06-18 21:13:48 +02:00 |
|
Laurent Destailleur
|
e813fd2dfa
|
Fix missing key import_key and extraparams
|
2017-06-16 12:57:30 +02:00 |
|
Laurent Destailleur
|
5a477bdd6d
|
Merge pull request #7018 from hregis/develop_bug_restapi
Fix: missing _cleanObjectDatas function
|
2017-06-16 12:53:11 +02:00 |
|
Regis Houssin
|
c2901ae8cd
|
Fix: add/remove unset unsused fields
|
2017-06-16 11:01:58 +02:00 |
|
Regis Houssin
|
9410466d72
|
Fix: better check and security
|
2017-06-15 21:51:31 +02:00 |
|
Regis Houssin
|
78d5520741
|
Fix: missing _cleanObjectDatas function
|
2017-06-15 21:23:35 +02:00 |
|
Regis Houssin
|
50aa40da3b
|
Fix: error when the project module not enabled
|
2017-06-14 07:40:11 +02:00 |
|
Laurent Destailleur
|
e93cefbbf0
|
FIX #6985
|
2017-06-11 10:37:58 +02:00 |
|
Laurent Destailleur
|
6ab47a845e
|
Fix look and feel v6
|
2017-06-10 13:54:43 +02:00 |
|
Laurent Destailleur
|
a8e16910c0
|
Fix look and feel v6
|
2017-06-10 13:44:20 +02:00 |
|
Laurent Destailleur
|
7c0de18ac1
|
Fix code comment
|
2017-06-10 12:56:28 +02:00 |
|
Laurent Destailleur
|
b441c62e1d
|
Fix syntax error
|
2017-06-08 14:55:12 +02:00 |
|
Laurent Destailleur
|
b1f93ccb0c
|
Fix security
|
2017-06-08 14:33:46 +02:00 |
|
phf
|
d6d451b54a
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
|
2017-06-08 12:03:59 +02:00 |
|
phf
|
711f9696aa
|
New multi contacts on actioncomm
|
2017-06-08 12:02:39 +02:00 |
|
Regis Houssin
|
2b36135641
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_mc
|
2017-06-07 20:14:03 +02:00 |
|
Laurent Destailleur
|
1820649175
|
Maxi debug of v6
|
2017-06-07 19:28:31 +02:00 |
|
Regis Houssin
|
bfd6116e5b
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
|
2017-06-06 15:03:36 +02:00 |
|
Laurent Destailleur
|
02b5d9e6f7
|
FIX #6945
|
2017-06-06 10:53:53 +02:00 |
|
Regis Houssin
|
2df33d1df3
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_mc
|
2017-06-03 11:45:15 +02:00 |
|
Laurent Destailleur
|
7f18dfee0d
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
dev/skeletons/build_class_from_table.php
dev/skeletons/skeleton_card.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/projet/card.php
|
2017-06-03 01:55:05 +02:00 |
|
phf
|
31aa8bdf05
|
Fix week view link has wrong link
|
2017-06-01 16:26:32 +02:00 |
|
Regis Houssin
|
5c5663c5ae
|
New: getEntity function use true $shared value by default
|
2017-05-30 18:50:54 +02:00 |
|
David
|
d8c5ec2aef
|
FIX: REST API not possible to add agendaevents
|
2017-05-29 13:47:42 +02:00 |
|
Laurent Destailleur
|
dc246fa44c
|
Merge pull request #6887 from hregis/develop_new
New: add REST api "dictionaryevents" for use with "agendaevents"
|
2017-05-29 10:16:35 +02:00 |
|
Laurent Destailleur
|
de1db57a9d
|
Merge pull request #6883 from dvasseur/develop
FIX: REST API not possible to add agendaevents
|
2017-05-29 10:12:33 +02:00 |
|
Regis Houssin
|
ee2019ae37
|
Fix: limit to 100 by default to avoid freeze
|
2017-05-26 16:52:27 +02:00 |
|
David
|
3898cfe02f
|
FIX: REST API not possible to add agendaevents
|
2017-05-23 18:27:41 +02:00 |
|
Laurent Destailleur
|
f5e29d6c86
|
Fix phpcs warning
|
2017-05-22 10:45:02 +02:00 |
|
Laurent Destailleur
|
b3dc73e611
|
Look and feel v6
|
2017-05-21 02:43:51 +02:00 |
|
Laurent Destailleur
|
807c77f754
|
Fix inconsistent options
|
2017-05-19 18:03:49 +02:00 |
|
Laurent Destailleur
|
bb2a9f9d0e
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-05-19 17:24:31 +02:00 |
|
Laurent Destailleur
|
c30dcf78cb
|
Show info when link has been deleted
|
2017-05-19 17:24:15 +02:00 |
|
Laurent Destailleur
|
d1c4439a0f
|
Merge pull request #6858 from OPEN-DSI/module_agenda_linked_object_option
NEW Module Agenda: Add option - Show linked object into agenda view
|
2017-05-19 17:23:54 +02:00 |
|
KHELIFA
|
169859b708
|
Module Agenda: Add option - Show linked object into agenda view
|
2017-05-17 17:00:45 +02:00 |
|
Alexandre SPANGARO
|
93554b7e30
|
Typo searchpicto
|
2017-05-14 21:06:33 +02:00 |
|
Laurent Destailleur
|
fa290c34fa
|
Fix against SQL injection. Add phpunit to detect missing escapement.
|
2017-05-12 16:55:11 +02:00 |
|
Laurent Destailleur
|
d53654e64f
|
Look and feel v6
|
2017-05-05 20:45:06 +02:00 |
|
Laurent Destailleur
|
d7e10085b8
|
Clean code. Using 2 different key for a param is not more allowed.
|
2017-05-05 18:42:11 +02:00 |
|
Laurent Destailleur
|
4c056d68d8
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/dict.php
htdocs/commande/list.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/bills.lang
htdocs/societe/list.php
|
2017-04-15 17:02:05 +02:00 |
|
Laurent Destailleur
|
39ebaec064
|
Replace usage of $bc[$var] with class="oddeven"
|
2017-04-14 11:22:48 +02:00 |
|
Laurent Destailleur
|
a6b05bb4da
|
Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0
|
2017-04-12 14:08:58 +02:00 |
|
Laurent Destailleur
|
26a9999fbf
|
Support of preview for pdf with several pages
|
2017-04-12 11:38:55 +02:00 |
|
Laurent Destailleur
|
9b45776941
|
Fix responsive
|
2017-04-10 17:25:53 +02:00 |
|
Laurent Destailleur
|
e221c48997
|
Css
|
2017-04-01 00:59:21 +02:00 |
|
Laurent Destailleur
|
7254b54a04
|
Work on 6.0 look and feel
|
2017-04-01 00:49:06 +02:00 |
|
Laurent Destailleur
|
7056edf509
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-03-31 18:32:36 +02:00 |
|
Laurent Destailleur
|
6e0918dded
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-03-31 18:31:54 +02:00 |
|
Laurent Destailleur
|
911d5832c6
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-03-31 18:30:41 +02:00 |
|
Laurent Destailleur
|
b44143d24d
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
|
2017-03-31 18:29:15 +02:00 |
|
Laurent Destailleur
|
01a74a8d23
|
Work on 6.0 look and feel
|
2017-03-31 17:41:20 +02:00 |
|
Laurent Destailleur
|
e416ea275e
|
Work on 6.0 look and feel
|
2017-03-28 21:04:38 +02:00 |
|
Laurent Destailleur
|
3740137e31
|
Add tooltip on label of each open item.
|
2017-03-28 10:44:52 +02:00 |
|
Laurent Destailleur
|
106d19a8af
|
FIX #6468 + Fix missing translation
|
2017-03-25 03:53:11 +01:00 |
|
hugome
|
38ccf7ffdd
|
Fix : Agenda getCalendarEvents hook
Return of getCalendarEvents on agenda page :
The array_merge change key of merged array.
|
2017-03-13 11:35:49 +01:00 |
|
Laurent Destailleur
|
618c27d63c
|
Optimize space
|
2017-03-10 16:26:43 +01:00 |
|
Laurent Destailleur
|
fb88eaf2a4
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2017-02-23 02:55:50 +01:00 |
|
Laurent Destailleur
|
e981e719a1
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/comm/action/card.php
|
2017-02-23 02:54:40 +01:00 |
|
Laurent Destailleur
|
92d9eb3c5d
|
Several fix for a better management of #6424
|
2017-02-22 17:46:54 +01:00 |
|
jfefe
|
0a9ffa58c1
|
FIX : event status is not modified when assign an user
|
2017-02-20 09:54:20 +01:00 |
|
Laurent Destailleur
|
8d03f86f45
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-17 13:10:46 +01:00 |
|
De Coninck Laurent
|
979a5e70bf
|
allow the drag and drop of an event only for allowed users
The drag and drop of the event didn't take into account the user rights.
|
2017-02-16 07:51:46 +01:00 |
|
Laurent Destailleur
|
809e3ce4d5
|
Debug browser notification
|
2017-01-20 20:10:16 +01:00 |
|
Juanjo Menent
|
2374aa351e
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2017-01-20 15:55:51 +01:00 |
|
Laurent Destailleur
|
4ecd657f34
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-16 00:02:43 +01:00 |
|