atm-lena
|
86c6ef23e3
|
Errors management v2
|
2020-09-01 10:05:55 +02:00 |
|
atm-lena
|
b747f6285e
|
Errors management
|
2020-09-01 10:01:59 +02:00 |
|
atm-lena
|
d2ed43d913
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2
|
2020-09-01 09:43:14 +02:00 |
|
atm-lena
|
13f91f1de8
|
FIX getEmailTemplat() in sendEmailsReminder() reminder function
|
2020-09-01 09:41:59 +02:00 |
|
Laurent Destailleur
|
b69a992324
|
Fix option AGENDA_SUPPORT_PRIORITY_IN_EVENTS
|
2020-09-01 04:29:57 +02:00 |
|
Laurent Destailleur
|
e353d4a42d
|
Add tooltip if label truncated
|
2020-09-01 03:59:57 +02:00 |
|
atm-lena
|
f8c79db4a9
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2
|
2020-08-31 14:14:27 +02:00 |
|
Laurent Destailleur
|
e030b2089a
|
Look and feel v13
|
2020-08-30 13:14:28 +02:00 |
|
Laurent Destailleur
|
8adf1852b1
|
Clean code
|
2020-08-30 03:00:35 +02:00 |
|
Laurent Destailleur
|
6293f76692
|
Debug
|
2020-08-29 06:17:26 +02:00 |
|
Laurent Destailleur
|
bca9a84710
|
Enhance autofill of end date when creating an event
|
2020-08-29 06:05:52 +02:00 |
|
Laurent Destailleur
|
b721930b3b
|
Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind
Agenda Remind (Part 1)
|
2020-08-29 05:19:21 +02:00 |
|
Laurent Destailleur
|
82f93fed92
|
css
|
2020-08-29 03:52:27 +02:00 |
|
Laurent Destailleur
|
ad87e753b4
|
Clean trim on GETPOST (already included inside GETPOST when not 'none'
|
2020-08-28 21:27:50 +02:00 |
|
atm-lena
|
6562334f7b
|
FIX sendEmailsReminder() function
|
2020-08-28 09:37:18 +02:00 |
|
Laurent Destailleur
|
9f8d1f0e63
|
Merge pull request #14520 from TobiasSekan/ShowUserOnExternalCalenderEvents
NEW Show user on external calender events (when found)
|
2020-08-27 20:10:13 +02:00 |
|
Laurent Destailleur
|
0309510ab8
|
Fix avoid duplicate event recorded from email collector
|
2020-08-27 18:50:08 +02:00 |
|
atm-lena
|
c0f254d10c
|
Translation + decode
|
2020-08-27 16:03:25 +02:00 |
|
atm-lena
|
e3ce3cbb7c
|
Function sendEmailsReminder()
|
2020-08-27 15:49:56 +02:00 |
|
atm-lena
|
f57325237a
|
WIP : sendEmailsReminder()
|
2020-08-27 12:30:59 +02:00 |
|
atm-lena
|
5856033892
|
Replace "agenda_send" and "event_push" to "actioncomm_send"
|
2020-08-27 11:15:08 +02:00 |
|
stickler-ci
|
b0fe7bc2e0
|
Fixing style errors.
|
2020-08-27 08:47:57 +00:00 |
|
atm-lena
|
4ef2644300
|
Use date.lib.php functions
|
2020-08-27 10:29:23 +02:00 |
|
atm-lena
|
9d1fc28eba
|
Fix type reminder "push" to "browser"
|
2020-08-27 09:35:02 +02:00 |
|
atm-lena
|
bbc554070c
|
Fix
|
2020-08-27 09:33:40 +02:00 |
|
atm-lena
|
6a60228bc3
|
Translation
|
2020-08-26 17:11:32 +02:00 |
|
atm-lena
|
efe60ebc58
|
Error management
|
2020-08-26 17:02:34 +02:00 |
|
atm-lena
|
cc29654f47
|
WIP : rename fk_project to fk_actioncomm + add line to sql file to install
|
2020-08-26 16:48:09 +02:00 |
|
atm-lena
|
a01d1b58c7
|
Add fk_email_template
|
2020-08-26 16:06:20 +02:00 |
|
atm-lena
|
cf9337b644
|
Add fk_project to actioncommreminder object
|
2020-08-26 15:58:14 +02:00 |
|
atm-lena
|
c10556473f
|
Clean
|
2020-08-26 15:35:12 +02:00 |
|
atm-lena
|
552e655668
|
Add field "entity" in actioncommrminder object and table
|
2020-08-26 15:22:32 +02:00 |
|
atm-lena
|
2fb5824836
|
Calcul date of reminder for event create
|
2020-08-26 15:12:08 +02:00 |
|
atm-lena
|
d3ac39589a
|
WIP
|
2020-08-26 12:48:12 +02:00 |
|
atm-lena
|
42f492877e
|
WIP
|
2020-08-26 11:36:32 +02:00 |
|
atm-lena
|
3046556d7b
|
Add checkbox "AddReminder"
|
2020-08-26 11:19:14 +02:00 |
|
atm-lena
|
a4018f41f7
|
WIP
|
2020-08-26 10:52:36 +02:00 |
|
atm-lena
|
7df993c7ed
|
Add "select_model_mail" function + add select to create event
|
2020-08-25 17:26:32 +02:00 |
|
atm-lena
|
94b2f3c5e1
|
Add $conf conditions
|
2020-08-25 12:57:36 +02:00 |
|
atm-lena
|
25840c2b3d
|
Create Event - Add fields
|
2020-08-25 12:40:29 +02:00 |
|
Sekan, Tobias
|
a7895f3496
|
Merge branch 'ShowUserOnExternalCalenderEvents' of https://github.com/TobiasSekan/dolibarr into ShowUserOnExternalCalenderEvents
|
2020-08-25 12:20:10 +02:00 |
|
Sekan, Tobias
|
4c851884e5
|
Address feedback
|
2020-08-25 12:16:44 +02:00 |
|
Laurent Destailleur
|
d23e83779f
|
Merge branch 'develop' into ParseTranspAndPrioFromExternalCalendar
|
2020-08-23 18:21:18 +02:00 |
|
Laurent Destailleur
|
053aa1b750
|
Merge pull request #14509 from TobiasSekan/ShowLocationOnImportCalenderEvents
NEW Show place from events on import calender
|
2020-08-23 18:11:02 +02:00 |
|
Laurent Destailleur
|
a265bec7ca
|
NEW Events in agenda for contact
FIX Saving contacts of an events
|
2020-08-23 02:38:56 +02:00 |
|
stickler-ci
|
183013e9ed
|
Fixing style errors.
|
2020-08-21 12:02:03 +00:00 |
|
Sekan, Tobias
|
9af5354dfe
|
Parse priority and transparency from external calender events
|
2020-08-21 13:57:03 +02:00 |
|
stickler-ci
|
61cce2e700
|
Fixing style errors.
|
2020-08-21 06:46:00 +00:00 |
|
Sekan, Tobias
|
22ff5a320f
|
fix not working external calender on/off
|
2020-08-21 08:40:23 +02:00 |
|
Sekan, Tobias
|
bb1452917b
|
fix wrong event percentage
|
2020-08-21 08:33:19 +02:00 |
|
Sekan, Tobias
|
ba98db934d
|
Show user on external calender events
|
2020-08-21 08:18:26 +02:00 |
|
Laurent Destailleur
|
ad0625b6ec
|
Debug posting message from ticket page
|
2020-08-21 01:11:22 +02:00 |
|
Sekan, Tobias
|
546571a6f8
|
Show place from events on import calender
|
2020-08-20 08:20:00 +02:00 |
|
Laurent Destailleur
|
dd86c21382
|
FIX dolGetElementUrl and agenda page for external modules
|
2020-07-25 03:01:04 +02:00 |
|
Laurent Destailleur
|
46fccf8eb1
|
FIX dolGetElementUrl and agenda page for external modules
|
2020-07-24 11:53:44 +02:00 |
|
Laurent Destailleur
|
8b5f4fe9a6
|
Fix massaction delete on events
|
2020-07-11 12:21:53 +02:00 |
|
Laurent Destailleur
|
46119dc786
|
Fix per user
|
2020-07-09 12:49:48 +02:00 |
|
Laurent Destailleur
|
b2bd90ae1a
|
Fix link to list of event
|
2020-07-09 12:33:28 +02:00 |
|
Laurent Destailleur
|
9592fdb3fc
|
CSS
|
2020-07-09 11:55:16 +02:00 |
|
Laurent Destailleur
|
1dfd2d565b
|
FIX Reposition and nav
|
2020-07-08 18:18:47 +02:00 |
|
Laurent Destailleur
|
96d935832c
|
FIX Reposition and nav
|
2020-07-08 18:18:08 +02:00 |
|
Laurent Destailleur
|
5ea47f3ade
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/resultat/index.php
htdocs/product/admin/product.php
htdocs/projet/tasks/list.php
|
2020-07-08 18:11:58 +02:00 |
|
Laurent Destailleur
|
96729769f7
|
Standardize Agenda view
|
2020-07-08 18:06:14 +02:00 |
|
Laurent Destailleur
|
f72a836231
|
Fix look and feel v12
|
2020-07-06 16:59:25 +02:00 |
|
Laurent Destailleur
|
3939a640e9
|
Fix note in creation
|
2020-07-06 16:52:28 +02:00 |
|
Laurent Destailleur
|
90d4458aab
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
|
2020-06-27 00:38:51 +02:00 |
|
Laurent Destailleur
|
29ba9c82c3
|
Fix #14120
|
2020-06-26 17:17:13 +02:00 |
|
Laurent Destailleur
|
333d4873c3
|
Properties ->contactid has been renamed into ->contact_id
|
2020-06-25 12:17:47 +02:00 |
|
Laurent Destailleur
|
18c23680f7
|
Fix bad object
|
2020-06-25 12:17:06 +02:00 |
|
Laurent Destailleur
|
501fd2f7a3
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/takepos/admin/receipt.php
|
2020-06-21 20:48:41 +02:00 |
|
Laurent Destailleur
|
bb3320f103
|
FIX #14104
|
2020-06-20 18:34:19 +02:00 |
|
Laurent Destailleur
|
90b5ed9908
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/website.lib.php
|
2020-06-11 23:41:35 +02:00 |
|
Laurent Destailleur
|
e94ef09977
|
css
|
2020-06-10 22:24:15 +02:00 |
|
Laurent Destailleur
|
8dbc0ff040
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/prelevement.php
htdocs/admin/system/phpinfo.php
htdocs/modulebuilder/index.php
|
2020-05-31 00:31:14 +02:00 |
|
Laurent Destailleur
|
94e02269ee
|
Fix: missing fk_project
|
2020-05-31 00:20:01 +02:00 |
|
Laurent Destailleur
|
ddebe1bbba
|
FIX Missing ref into popup
|
2020-05-30 23:52:47 +02:00 |
|
Laurent Destailleur
|
02bf646abe
|
FIX Missing ref into popup
|
2020-05-30 23:51:02 +02:00 |
|
stickler-ci
|
029f5570e5
|
Fixing style errors.
|
2020-05-28 12:55:29 +00:00 |
|
Supermanu
|
0baea21947
|
NEW Add mass deletion for events
Only users with the right `allactions->delete` will be able to mass delete.
|
2020-05-28 14:45:54 +02:00 |
|
Supermanu
|
721b99bb2f
|
Add calendar selection for agenda view
|
2020-05-28 11:24:37 +02:00 |
|
Frédéric FRANCE
|
5c78eca68a
|
prepare new rule
|
2020-05-23 21:14:44 +02:00 |
|
Frédéric FRANCE
|
174ddc5fd4
|
prepare new rule
|
2020-05-23 21:07:47 +02:00 |
|
stickler-ci
|
66637ba0b6
|
Fixing style errors.
|
2020-05-23 16:39:06 +00:00 |
|
Frédéric FRANCE
|
2085ac73e7
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-23 18:34:58 +02:00 |
|
Laurent Destailleur
|
4e3fbb9d05
|
Merge pull request #13912 from TobiasSekan/NewEventMassactionPercent
NEW mass-actions for the event list view
|
2020-05-23 14:26:51 +02:00 |
|
Laurent Destailleur
|
7397806ae7
|
Update actioncomm.class.php
|
2020-05-23 14:26:28 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
ee6fadd0d5
|
add new rule
|
2020-05-21 01:41:27 +02:00 |
|
Laurent Destailleur
|
92cbff7749
|
Clean code
|
2020-05-20 23:40:04 +02:00 |
|
stickler-ci
|
f0bb7d233f
|
Fixing style errors.
|
2020-05-19 06:29:23 +00:00 |
|
Tobias Sekan
|
7fd6151c43
|
Add massactions for event list
|
2020-05-19 08:18:38 +02:00 |
|
Tobias Sekan
|
223224d12c
|
Add function to update the event percent + const
|
2020-05-19 08:07:21 +02:00 |
|
Laurent Destailleur
|
ff8d22a80d
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/expedition/class/expedition.class.php
scripts/cron/cron_run_jobs.php
|
2020-05-18 15:57:01 +02:00 |
|
Laurent Destailleur
|
9336828710
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/paiement/card.php
htdocs/expedition/class/expedition.class.php
|
2020-05-18 15:54:39 +02:00 |
|
Laurent Destailleur
|
45345440a4
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/expedition/class/expedition.class.php
scripts/cron/cron_run_jobs.php
|
2020-05-18 15:50:36 +02:00 |
|
Maxime Kohlhaas
|
cf96383bf9
|
Fix : entity was missing in actioncomm fetch
|
2020-05-18 10:44:55 +02:00 |
|
Laurent Destailleur
|
4584fa1aa6
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/asset/list.php
htdocs/compta/bank/list.php
htdocs/contrat/services_list.php
htdocs/core/lib/date.lib.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/holiday/list.php
htdocs/projet/tasks/list.php
htdocs/supplier_proposal/list.php
htdocs/user/list.php
|
2020-05-11 19:43:06 +02:00 |
|
Laurent Destailleur
|
42ee755ea5
|
Look and feel v12
|
2020-05-08 02:52:55 +02:00 |
|
Maxime Kohlhaas
|
1a9afe6b20
|
Fix missing hook params for printFieldListValue
|
2020-05-08 01:40:25 +02:00 |
|
Laurent Destailleur
|
206b16410e
|
Revert the option to avoid to introduce a feature that is duplicate with
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
|
2020-05-07 22:52:32 +02:00 |
|
Laurent Destailleur
|
1c70e49695
|
Merge branch 'develop' into 12.0_a23
|
2020-04-27 14:14:13 +02:00 |
|
Laurent Destailleur
|
9679b1f04c
|
Merge pull request #13704 from frederic34/actioncomm_note
actioncomm note deprecated
|
2020-04-23 18:52:56 +02:00 |
|
Laurent Destailleur
|
72c6ac1c72
|
Complete #13708, normalization of code
|
2020-04-23 13:21:39 +02:00 |
|
Frédéric FRANCE
|
177008ab65
|
actioncomm note deprecated
|
2020-04-23 00:45:33 +02:00 |
|
Frédéric FRANCE
|
4220d6b253
|
actioncomm note deprecated
|
2020-04-23 00:38:42 +02:00 |
|
Laurent Destailleur
|
16e46c672c
|
Clean code
|
2020-04-20 15:06:27 +02:00 |
|
Scrutinizer Auto-Fixer
|
387ea73bf3
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-13 11:24:42 +00:00 |
|
Laurent Destailleur
|
96d087c99d
|
Fix clean event report
|
2020-04-13 02:59:33 +02:00 |
|
Laurent Destailleur
|
92b6b1a042
|
Look and feel v12
|
2020-04-12 18:13:43 +02:00 |
|
stickler-ci
|
a873afdad9
|
Fixing style errors.
|
2020-04-12 15:08:44 +00:00 |
|
Laurent Destailleur
|
51f73526f9
|
Merge branch 'develop' into patch-8
|
2020-04-12 17:07:57 +02:00 |
|
Laurent Destailleur
|
fe4cd2e7bc
|
Update actioncomm.class.php
|
2020-04-12 17:05:12 +02:00 |
|
Laurent Destailleur
|
422e33a68b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/ihm.php
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/stats/cabyprodserv.php
htdocs/filefunc.inc.php
htdocs/takepos/invoice.php
|
2020-04-12 17:01:44 +02:00 |
|
Laurent Destailleur
|
1cda760621
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
|
2020-04-12 16:54:09 +02:00 |
|
Laurent Destailleur
|
eebf48b27c
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
|
2020-04-12 16:52:58 +02:00 |
|
Frédéric FRANCE
|
e2660fd31c
|
Update actioncomm.class.php
|
2020-04-11 22:38:28 +02:00 |
|
Frédéric FRANCE
|
88f18ec3ce
|
can't remove actioncomm if there is a category
|
2020-04-11 22:24:50 +02:00 |
|
Scrutinizer Auto-Fixer
|
444c293c01
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-10 08:59:32 +00:00 |
|
Laurent Destailleur
|
1adee36314
|
Upgrade to font awesome 5.13
|
2020-04-07 21:11:18 +02:00 |
|
Laurent Destailleur
|
ff1b3db54b
|
Fix regression on hamburger picto
|
2020-04-06 23:38:30 +02:00 |
|
Alexandre SPANGARO
|
e6d9f7885c
|
Work on split module fournisseur
|
2020-03-24 21:22:20 +01:00 |
|
Laurent Destailleur
|
a5379c7144
|
FIX All forms must use newToken()
Conflicts:
htdocs/commande/card.php
htdocs/compta/cashcontrol/cashcontrol_card.php
htdocs/supplier_proposal/card.php
|
2020-03-24 13:14:23 +01:00 |
|
Laurent Destailleur
|
1ff15e1fd9
|
FIX All forms must use newToken()
|
2020-03-24 13:10:35 +01:00 |
|
Scrutinizer Auto-Fixer
|
e8083e2a65
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-23 14:54:02 +00:00 |
|
Alexandre SPANGARO
|
d5729e6dcc
|
Work on split module fournisseur
|
2020-03-23 05:53:33 +01:00 |
|
Alexandre SPANGARO
|
e6a59dcdbb
|
Work on split module fournisseur
|
2020-03-23 05:43:41 +01:00 |
|
Alexandre SPANGARO
|
6e9a07d119
|
Work on split module fournisseur
|
2020-03-22 05:33:30 +01:00 |
|
Laurent Destailleur
|
33c5db9cc3
|
Prepare code for the new pagination possibility
|
2020-03-13 13:07:11 +01:00 |
|
Laurent Destailleur
|
895503d2eb
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/index.php
htdocs/core/class/CMailFile.class.php
|
2020-02-20 00:21:25 +01:00 |
|
Laurent Destailleur
|
2cfca2a45e
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/comm/action/card.php
htdocs/comm/index.php
htdocs/core/boxes/box_fournisseurs.php
htdocs/core/boxes/box_propales.php
htdocs/societe/index.php
|
2020-02-20 00:18:58 +01:00 |
|
root
|
0dcb83e6bf
|
referer XSS patches
|
2020-02-18 22:31:24 +01:00 |
|
VESSILLER
|
d1e9f3a505
|
FIX keep assigned users in session when loading projects and tasks
|
2020-02-18 11:18:00 +01:00 |
|
Jamie Slome
|
2d9162aedb
|
Merge branch 'develop' into develop
|
2020-02-17 10:49:41 +00:00 |
|
Scrutinizer Auto-Fixer
|
17010478ba
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-13 09:44:08 +00:00 |
|
Laurent Destailleur
|
74d3912763
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
|
2020-02-11 16:52:58 +01:00 |
|
Laurent Destailleur
|
644b27bcf9
|
Fix look and feel v11
|
2020-02-10 13:34:09 +01:00 |
|
Laurent Destailleur
|
b9a8d82b2f
|
FIX Filter on list of events were lost after "Back to list"
|
2020-02-10 13:29:26 +01:00 |
|
Laurent Destailleur
|
8645fd8946
|
FIX CVE-2019–17223 FIX #13053
|
2020-02-09 18:28:57 +01:00 |
|
Laurent Destailleur
|
716f765ce1
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
|
2020-02-08 16:00:06 +01:00 |
|
Laurent Destailleur
|
fe0d1a81eb
|
Fix filter on current user is stupi on the view "per user".
|
2020-02-06 21:16:48 +01:00 |
|
Laurent Destailleur
|
f3597926c4
|
Fix missing escape returned by ci
|
2020-02-06 10:05:13 +01:00 |
|
oscim
|
7cc87423e4
|
ref_ext is not in sql requete for save
ref_ext is not in sql requete for save
|
2020-02-05 22:31:27 +01:00 |
|
root
|
2419f122c4
|
referer XSS patches
|
2020-02-03 23:10:04 +00:00 |
|
Scrutinizer Auto-Fixer
|
5fda829023
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-30 00:48:28 +00:00 |
|
Laurent Destailleur
|
25f0e893ba
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-29 23:49:43 +01:00 |
|
Laurent Destailleur
|
1144b937eb
|
Fix phpcs
|
2020-01-29 23:34:54 +01:00 |
|
Laurent Destailleur
|
7b10c2440b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-29 23:08:42 +01:00 |
|
kadogo
|
b2610903a4
|
NEW enable put for agendaevents api
|
2020-01-29 22:55:44 +01:00 |
|
Laurent Destailleur
|
51d750cb49
|
Merge pull request #12865 from TobiasSekan/ExportIcalWithHolidays
New: Export ical with holidays
|
2020-01-28 03:19:34 +01:00 |
|
Tobias Sekan
|
ce9d1a320f
|
Update actioncomm.class.php after review
|
2020-01-27 08:27:13 +01:00 |
|
Laurent Destailleur
|
27a0858050
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
|
2020-01-23 17:41:31 +01:00 |
|
Laurent Destailleur
|
25665daa40
|
FIX #11957
|
2020-01-22 14:53:40 +01:00 |
|
Laurent Destailleur
|
f06f15de2e
|
Merge pull request #12861 from TobiasSekan/ShowHolidaysInAgenda
New: Show holidays in the agenda view (month, week, day)
|
2020-01-22 14:13:55 +01:00 |
|
Laurent Destailleur
|
d3411a79ef
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-22 14:11:44 +01:00 |
|
Laurent Destailleur
|
d87419f3db
|
FIX #11957
|
2020-01-22 13:34:07 +01:00 |
|
stickler-ci
|
b47e2e8127
|
Fixing style errors.
|
2020-01-16 12:55:08 +00:00 |
|
Tobias Sekan
|
651bf8c1fc
|
Export ical with holidays
|
2020-01-16 13:49:05 +01:00 |
|
stickler-ci
|
eca59220d8
|
Fixing style errors.
|
2020-01-16 09:44:49 +00:00 |
|
Tobias Sekan
|
72e227a543
|
Add link to leave request for holidays in agenda
|
2020-01-16 10:37:16 +01:00 |
|
Tobias Sekan
|
bbd7900fc7
|
Show holidays in agenda
|
2020-01-16 10:34:45 +01:00 |
|
Laurent Destailleur
|
3f79c00542
|
Merge branch 'develop' into actioncomm_category
|
2020-01-15 14:21:06 +01:00 |
|
Laurent Destailleur
|
97f62c68f2
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-08 13:38:03 +01:00 |
|
Laurent Destailleur
|
7ef3ee56bd
|
Fix MRP
|
2020-01-07 20:28:21 +01:00 |
|
Laurent Destailleur
|
6dcba0f053
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-04 14:27:55 +01:00 |
|
Laurent Destailleur
|
38de69f5a9
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/list.php
htdocs/compta/bank/releve.php
htdocs/compta/salaries/card.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/boxes.lang
htdocs/langs/en_US/main.lang
htdocs/product/class/product.class.php
htdocs/product/reassort.php
htdocs/product/stock/product.php
htdocs/projet/element.php
|
2020-01-04 14:20:25 +01:00 |
|
Laurent Destailleur
|
afd32135f2
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/takepos/invoice.php
|
2020-01-01 22:37:13 +01:00 |
|
Laurent Destailleur
|
e4a03e98b7
|
FIX Do not record resource owner of event when not defined.
More log to track payment errors.
|
2020-01-01 12:47:01 +01:00 |
|
Laurent Destailleur
|
d2efe1d427
|
Fix SQL injection on type parameter in list of events
|
2019-12-31 17:52:28 +01:00 |
|
Frédéric FRANCE
|
90235d0528
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-31 13:57:40 +01:00 |
|
Laurent Destailleur
|
945296bb55
|
Merge pull request #12690 from atm-greg/Hook_on_ics_generation
NEW hook on ics generation to add more events in eventarray
|
2019-12-30 22:03:07 +01:00 |
|
Laurent Destailleur
|
dcf07646cc
|
Fix specimen
|
2019-12-21 14:02:06 +01:00 |
|
Laurent Destailleur
|
19c14f354e
|
Fix specimen
|
2019-12-21 14:01:40 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Scrutinizer Auto-Fixer
|
455178ff73
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-18 14:20:36 +00:00 |
|
Scrutinizer Auto-Fixer
|
c8baaa2995
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-16 12:06:25 +00:00 |
|
Laurent Destailleur
|
d17c177251
|
Merge pull request #12684 from frederic34/hookagendaperuser
add hook like for per day/week/month
|
2019-12-14 13:52:51 +01:00 |
|
Laurent Destailleur
|
835d22f556
|
Merge branch 'develop' into doxygen_todo
|
2019-12-14 13:46:40 +01:00 |
|
Frédéric FRANCE
|
57055bad03
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-13 14:36:00 +01:00 |
|
Laurent Destailleur
|
ce47de453e
|
Fix HTML5
|
2019-12-12 10:31:08 +01:00 |
|
Frédéric FRANCE
|
307bad1d2a
|
doxygen todo
|
2019-12-11 19:11:13 +01:00 |
|
atm-greg
|
caaa95da6a
|
hook on ics generation to add more events in eventarray
|
2019-12-11 15:33:36 +01:00 |
|
Frédéric FRANCE
|
5c59ddb357
|
add hook like for per day/week/month
|
2019-12-10 21:11:52 +01:00 |
|
Laurent Destailleur
|
a4272ab947
|
Debug v11
|
2019-12-06 09:20:45 +01:00 |
|
Frédéric FRANCE
|
d9bfa62367
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-05 21:47:42 +01:00 |
|
Frédéric FRANCE
|
4c5c6b6ff1
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-03 17:56:43 +01:00 |
|
Laurent Destailleur
|
7a1a932755
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/list.php
htdocs/main.inc.php
|
2019-12-03 15:03:10 +01:00 |
|
Laurent Destailleur
|
d153918a10
|
Fix trans
|
2019-12-03 15:00:52 +01:00 |
|
Scrutinizer Auto-Fixer
|
36a74cd160
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-03 10:17:29 +00:00 |
|
Frédéric FRANCE
|
25ed2b930f
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-01 16:10:37 +01:00 |
|
Frédéric FRANCE
|
35394639a4
|
The property ownerid does not exist on ActionComm
|
2019-11-28 22:26:25 +01:00 |
|
Frédéric FRANCE
|
4c4ae5b6e1
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-26 08:10:40 +01:00 |
|
Laurent Destailleur
|
e4d9f99484
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/remx.php
htdocs/expedition/card.php
htdocs/fourn/facture/card.php
|
2019-11-22 15:04:40 +01:00 |
|
ptibogxiv
|
f73bd0e0a6
|
FIX display job of contact list
can see différent contact with same name but different job
|
2019-11-20 13:07:26 +01:00 |
|
Frédéric FRANCE
|
2e5f539b2a
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-18 17:45:52 +01:00 |
|
Laurent Destailleur
|
2689f7515c
|
Fix pb with colspan and extrafields.
Fix remove empty id
|
2019-11-16 14:38:05 +01:00 |
|
Frédéric FRANCE
|
6784ea9fae
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-16 09:21:57 +01:00 |
|
Scrutinizer Auto-Fixer
|
ddcc14dc16
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:15 +00:00 |
|
Laurent Destailleur
|
f5da126cff
|
Fix property not defined
|
2019-11-14 12:01:01 +01:00 |
|
Frédéric FRANCE
|
a3e092b227
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-14 09:21:26 +01:00 |
|
Laurent Destailleur
|
171b94fc5c
|
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:24 +01:00 |
|
Laurent Destailleur
|
86094613e8
|
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:06 +01:00 |
|
Frédéric FRANCE
|
3bac051521
|
use class CONST
|
2019-11-14 08:07:16 +01:00 |
|
Frédéric FRANCE
|
9040f6d9c7
|
can tag actioncomm
|
2019-11-13 21:18:34 +01:00 |
|
Scrutinizer Auto-Fixer
|
b40ecc3933
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:37:08 +00:00 |
|
Scrutinizer Auto-Fixer
|
ac40dd8bbe
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:39 +00:00 |
|
Scrutinizer Auto-Fixer
|
8a527631a0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:02 +00:00 |
|
Scrutinizer Auto-Fixer
|
c85e54b08c
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-12 08:46:08 +00:00 |
|
Laurent Destailleur
|
cb1e5954f6
|
Fix regression
|
2019-11-08 13:10:41 +01:00 |
|
Laurent Destailleur
|
cb3fd5728b
|
Fix color for not busy events
|
2019-11-08 13:04:49 +01:00 |
|
Laurent Destailleur
|
dc84d7e844
|
Code comment
|
2019-11-08 11:29:56 +01:00 |
|
Laurent Destailleur
|
34564ea084
|
Merge pull request #12381 from TobiasSekan/FixIcalExportAlwaysSameUser
Fix ICAL export add a user to all events
|
2019-11-08 11:26:57 +01:00 |
|
Tobias Sekan
|
3677855ebc
|
Fix ICAL export add a user to all events
|
2019-11-07 15:45:34 +01:00 |
|
Tobias Sekan
|
6fdbe8923f
|
Fix mixed order of events with same time
|
2019-11-06 10:33:26 +01:00 |
|
Laurent Destailleur
|
94bd0f71d9
|
Fix pb with permission
|
2019-11-05 19:41:30 +01:00 |
|
Laurent Destailleur
|
4909a21f8a
|
Fix css
|
2019-11-03 22:09:20 +01:00 |
|
Laurent Destailleur
|
9c5e17d676
|
Merge pull request #12214 from homer8173/patch-8
Implement new now feature
|
2019-11-02 15:09:06 +01:00 |
|
Laurent Destailleur
|
93f3b1d2db
|
Clean APIs
|
2019-11-02 15:05:14 +01:00 |
|
Laurent Destailleur
|
df750b6a9d
|
Merge pull request #12287 from TobiasSekan/AddAttendeeToIcal
NEW Add attendee to ical export + cleanup
|
2019-11-02 13:40:27 +01:00 |
|
Laurent Destailleur
|
e087ac434d
|
Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
|
2019-11-02 13:34:21 +01:00 |
|
Laurent Destailleur
|
58ffb73627
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-02 12:59:49 +01:00 |
|
Laurent Destailleur
|
45c77b4560
|
Renaming some libelle into label
|
2019-11-02 12:59:38 +01:00 |
|
Laurent Destailleur
|
25e64b0610
|
Merge branch 'develop' into socid
|
2019-11-02 12:01:06 +01:00 |
|
Laurent Destailleur
|
1797b49778
|
Merge pull request #12288 from frederic34/patch-14
form_select_status_action returns void
|
2019-11-02 11:48:07 +01:00 |
|
Frédéric FRANCE
|
bb9b435875
|
doxygen for actioncomm class
|
2019-11-01 17:12:07 +01:00 |
|
Frédéric FRANCE
|
400defd93d
|
form_select_status_action returns void
|
2019-11-01 15:04:37 +01:00 |
|
Sekan, Tobias
|
0bfff92032
|
Add attendee to ical export + cleanup
|
2019-11-01 11:59:54 +01:00 |
|
Laurent Destailleur
|
c215d534fc
|
Fix phpcs
|
2019-10-31 21:16:41 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Laurent Destailleur
|
66a288a343
|
Merge pull request #12235 from frederic34/scopeindent
clean indent
|
2019-10-30 02:57:59 +01:00 |
|
Laurent Destailleur
|
6073692654
|
Merge pull request #12243 from TobiasSekan/FixEventSortNonNumeric
Fix non-numeric error in sort event function
|
2019-10-30 02:57:00 +01:00 |
|
Tobias Sekan
|
bfe7ad211f
|
Fix non-numeric error in sort event function
Fix non-numeric error in sort event function and fix mixed space and tab indent, use spaces
|
2019-10-28 09:53:27 +01:00 |
|
Frédéric FRANCE
|
1a10b30a76
|
clean indent in comm directory
|
2019-10-26 14:28:40 +02:00 |
|
Norbert Penel
|
a67b3d8cf5
|
Implement new now feature
8d75e83e55
|
2019-10-24 18:55:43 +02:00 |
|
Laurent Destailleur
|
b88968520b
|
Move code of extrafields to the new architecture
|
2019-10-22 17:08:37 +02:00 |
|
Frédéric FRANCE
|
86f22c4563
|
do not ignore lines with mix od tabs and spaces
|
2019-10-20 17:17:22 +02:00 |
|
Laurent Destailleur
|
b813dfe3c9
|
Merge pull request #12172 from TobiasSekan/FixMissingIcalAuthor
Fix missing organizer and contact on ical export
|
2019-10-20 13:49:47 +02:00 |
|
Laurent Destailleur
|
89b0730483
|
Update actioncomm.class.php
|
2019-10-20 13:49:36 +02:00 |
|
Tobias Sekan
|
28dea51c4a
|
Fix missing organizer in ical export
|
2019-10-18 13:18:09 +02:00 |
|
Laurent Destailleur
|
f85899742b
|
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-17 17:48:42 +02:00 |
|
Laurent Destailleur
|
1a021e85f6
|
Merge pull request #12141 from TobiasSekan/FixNoneNumericValue
Fix non-numeric value encountered on ical export
|
2019-10-17 17:39:25 +02:00 |
|
Tobias Sekan
|
daa7f54295
|
fix - not removed old code line
|
2019-10-17 08:10:21 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Tobias Sekan
|
741627897e
|
fix interchanged allocation
|
2019-10-16 13:56:11 +02:00 |
|
Laurent Destailleur
|
a57b456aa6
|
Merge pull request #12143 from frederic34/patch-19
NEW Add location into event tooltip. Use full day for fullday events
|
2019-10-16 13:21:55 +02:00 |
|
Laurent Destailleur
|
e07e01580d
|
Replace deprecated code with new one
|
2019-10-16 03:34:32 +02:00 |
|
Frédéric FRANCE
|
ccd9da99f4
|
Update list.php
|
2019-10-15 20:11:15 +02:00 |
|
Tobias Sekan
|
199fb3be0f
|
Fix non-numeric value encountered on ical export
|
2019-10-15 14:29:27 +02:00 |
|
Laurent Destailleur
|
9ba992b8b6
|
Work on inventory module
|
2019-10-12 12:31:35 +02:00 |
|
Laurent Destailleur
|
51ef2cd20a
|
FIX #12058
|
2019-10-07 20:20:06 +02:00 |
|
Laurent Destailleur
|
d4f4f33122
|
Merge pull request #12048 from frederic34/patch-17
Update card.php
|
2019-10-07 10:23:51 +02:00 |
|
Laurent Destailleur
|
866dcf18fe
|
Look and feel v11
|
2019-10-06 15:34:22 +02:00 |
|
Laurent Destailleur
|
2b66282b61
|
NEW Code for extrafields uses the new array $extrafields->attributes
|
2019-10-06 14:41:52 +02:00 |
|
Frédéric FRANCE
|
bfd8bc839e
|
Update card.php
|
2019-10-06 10:28:09 +02:00 |
|
Laurent Destailleur
|
b60ee4c18c
|
css
|
2019-10-03 09:58:49 +02:00 |
|
Alexandre SPANGARO
|
16c6c9ae75
|
Merge remote-tracking branch 'upstream/develop' into 11.0_https
|
2019-10-01 06:12:24 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Frédéric FRANCE
|
fec67aade4
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-30 18:44:34 +02:00 |
|
Laurent Destailleur
|
d3eafa86d7
|
Merge pull request #11988 from frederic34/patch-12
Add hook beforeAgenda in comm/action/index.php
|
2019-09-30 18:03:25 +02:00 |
|
Laurent Destailleur
|
ce7e8c83a3
|
Use a dedicated css imgforviewmode for button used to switch view
|
2019-09-30 17:08:57 +02:00 |
|
Frédéric FRANCE
|
4a305ec95c
|
Add hook beforeAgenda in comm/action/index.php
|
2019-09-30 15:59:05 +02:00 |
|
Laurent Destailleur
|
d8de78dca9
|
Merge pull request #11984 from fuhraih/develop
Fix 11554 and 7533
|
2019-09-30 15:31:41 +02:00 |
|
Frédéric FRANCE
|
258424416e
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-30 07:49:52 +02:00 |
|
Laurent Destailleur
|
86e5465197
|
Standardize extrafields code
|
2019-09-28 10:55:09 +02:00 |
|
fuhraih
|
5757159c30
|
FIX #7533 Infinite loop in Agenda per user view if workinghours not set
correctly
Remove the spaces in the Working_hours and Working_days stored
|
2019-09-27 22:29:12 +02:00 |
|
Laurent Destailleur
|
c5e7413ed2
|
Merge branch 'develop' into fix-resource-event-move-check-busy
|
2019-09-27 15:35:14 +02:00 |
|
Laurent Destailleur
|
34813a931f
|
Merge branch 'develop' into patch-10
|
2019-09-27 14:45:09 +02:00 |
|
Laurent Destailleur
|
f90bfb54d4
|
Merge pull request #11913 from frederic34/actioncommcarddoaction
add doaction to actioncommcard
|
2019-09-27 14:34:49 +02:00 |
|
Frédéric FRANCE
|
41cb628d05
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-25 08:06:44 +02:00 |
|
Laurent Destailleur
|
961f2b5165
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/categories/viewcat.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/takepos/invoice.php
|
2019-09-24 14:25:02 +02:00 |
|
Laurent Destailleur
|
5838fa1229
|
Fix az09 -> aZ09
|
2019-09-24 14:20:45 +02:00 |
|
Laurent Destailleur
|
db334a3b94
|
FIX Var not enough sanitized
|
2019-09-24 14:16:24 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Laurent Destailleur
|
40f75b16d8
|
FIX Substitution of __PROJECT_XXX__ not done
|
2019-09-23 13:04:22 +02:00 |
|
VESSILLER
|
ea5ff59076
|
FIX check if a resource is in use after a drag and drop from events
|
2019-09-17 16:43:36 +02:00 |
|
Frédéric FRANCE
|
850b9fd52a
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-17 08:24:31 +02:00 |
|
Frédéric FRANCE
|
155e8fb500
|
fix syntax
|
2019-09-17 08:18:01 +02:00 |
|
Frédéric FRANCE
|
0d63c43ccd
|
add doaction to actioncommcard
|
2019-09-17 08:15:01 +02:00 |
|
Frédéric FRANCE
|
ecac1f9f40
|
wip
|
2019-09-17 08:02:55 +02:00 |
|
Frédéric FRANCE
|
a2d3cde291
|
some update after night
|
2019-09-17 07:59:46 +02:00 |
|
Frédéric FRANCE
|
fb7ef3cefc
|
Update card.php
|
2019-09-16 23:12:11 +02:00 |
|
Frédéric FRANCE
|
f369c1a80a
|
Update card.php
|
2019-09-16 20:59:13 +02:00 |
|
Frédéric FRANCE
|
67b73cf0e6
|
Update actioncomm.class.php
|
2019-09-16 20:57:20 +02:00 |
|
Laurent Destailleur
|
434ab2965a
|
Merge pull request #11820 from OPEN-DSI/new-resource-add-event-check-busy
NEW check if a resource is in use in an event
|
2019-09-15 15:47:07 +02:00 |
|
Laurent Destailleur
|
4d0ef33471
|
FIX #11857
|
2019-09-15 15:43:03 +02:00 |
|
Frédéric FRANCE
|
c9c7d60fc0
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-14 16:37:10 +02:00 |
|
Laurent Destailleur
|
56a99f6e6d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-12 11:22:13 +02:00 |
|
Laurent Destailleur
|
db900cb5ea
|
FIX EDB-ID:47370
|
2019-09-11 17:51:50 +02:00 |
|
VESSILLER
|
66611f4097
|
FIX rename "resource" (reserved) by "dolresource"
|
2019-09-09 09:29:43 +02:00 |
|
Frédéric FRANCE
|
bd4c9a64a8
|
wip
|
2019-09-07 14:48:25 +02:00 |
|
Laurent Destailleur
|
bb81f66a1a
|
Add phpunit test for Lessc
|
2019-09-06 10:36:49 +02:00 |
|
VESSILLER
|
815d0bbc20
|
FIX rename "dolresource" into "resource" for compatibility with PR 11822
|
2019-09-05 11:57:12 +02:00 |
|
VESSILLER
|
9ed09db93c
|
FIX replace "<br />" by "<br>"
|
2019-09-05 09:41:15 +02:00 |
|
VESSILLER
|
4ef7e755ad
|
FIX only check on busy resources before updating an event
|
2019-09-05 09:29:40 +02:00 |
|
VESSILLER
|
b70587c150
|
NEW check if a resource is in use in an event
|
2019-09-04 15:14:16 +02:00 |
|
Laurent Destailleur
|
750182f9cd
|
Removed deprecated method actioncomm->add(), use create() instead
|
2019-09-04 13:54:36 +02:00 |
|
Laurent Destailleur
|
da3d230182
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.stickler.yml
htdocs/takepos/invoice.php
|
2019-09-03 17:34:49 +02:00 |
|
Laurent Destailleur
|
6c96478040
|
Removed deprecated code
|
2019-09-02 22:57:55 +02:00 |
|
florian HENRY
|
243fca9a1a
|
fix event list with description
|
2019-08-27 16:12:07 +02:00 |
|
Laurent Destailleur
|
d304749eca
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-19 10:19:14 +02:00 |
|
Laurent Destailleur
|
18886c701d
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/core/lib/company.lib.php
|
2019-08-19 00:02:26 +02:00 |
|
Laurent Destailleur
|
b1be6bf4f2
|
FIX #11422 Can't edit his own events with standard rights
|
2019-08-18 01:24:54 +02:00 |
|
John Botella
|
9b84987cc1
|
prepare new dashboard
|
2019-08-01 12:33:19 +02:00 |
|
Laurent Destailleur
|
bef3423764
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/admin.lang
|
2019-07-22 19:12:27 +02:00 |
|
Laurent Destailleur
|
9f95b10d0e
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/action/list.php
htdocs/comm/action/peruser.php
htdocs/compta/prelevement/card.php
htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
|
2019-07-22 19:11:27 +02:00 |
|
Laurent Destailleur
|
f39f710fd9
|
Merge pull request #11538 from atm-maxime/fix_agenda_list_filter
Fix lost filter in action list
|
2019-07-22 18:44:22 +02:00 |
|
Maxime Kohlhaas
|
7ec8b48b18
|
Fix lost filter in action list
|
2019-07-21 22:21:11 +02:00 |
|
florian HENRY
|
b046bcc197
|
fix warning php
|
2019-07-20 15:19:25 +02:00 |
|
florian HENRY
|
d03d79222e
|
fix warning php
|
2019-07-20 15:15:48 +02:00 |
|
florian HENRY
|
d88fec52bf
|
fix warining message
|
2019-07-20 15:07:59 +02:00 |
|
Laurent Destailleur
|
fc31a1182b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-18 18:54:50 +02:00 |
|
Laurent Destailleur
|
58428cefc0
|
Fix phpcs
|
2019-07-18 18:53:51 +02:00 |
|
Laurent Destailleur
|
50480bf517
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/opensurvey/index.php
|
2019-07-18 18:23:24 +02:00 |
|
Laurent Destailleur
|
3cffd70ed3
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/prelevement/create.php
htdocs/core/class/commonobject.class.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/commande/dispatch.php
htdocs/fourn/product/list.php
htdocs/opensurvey/index.php
htdocs/ticket/index.php
htdocs/ticket/list.php
|
2019-07-18 18:09:37 +02:00 |
|
John Botella
|
b5d348356d
|
Fix socpeople assigned list in action com list
|
2019-07-17 16:49:41 +02:00 |
|
Laurent Destailleur
|
2fee41f712
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-04 12:27:00 +02:00 |
|
Laurent Destailleur
|
8e3620fce1
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/compta/facture/invoicetemplate_list.php
|
2019-07-04 12:26:17 +02:00 |
|
Laurent Destailleur
|
ee0a65e7fa
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/comm/action/card.php
|
2019-07-04 12:22:40 +02:00 |
|
Ferran Marcet
|
433835860c
|
FIX: When saving an action it didn't save the label based on the type of event if the label is empty and the type is customized
|
2019-07-03 13:12:41 +02:00 |
|
Laurent Destailleur
|
fa476b4994
|
Properties ->libelle_incoterms were renamed into ->label_incoterms
|
2019-06-25 13:00:02 +02:00 |
|
Laurent Destailleur
|
18348fea93
|
Fix sort on date on agenda list
|
2019-06-22 11:34:16 +02:00 |
|
Frédéric FRANCE
|
f1d64ad164
|
Update peruser.php
|
2019-06-17 23:02:54 +02:00 |
|
Laurent Destailleur
|
e8b139d1c6
|
Fix repeated logs and fetch
|
2019-06-13 22:48:31 +02:00 |
|
Laurent Destailleur
|
900e860f6d
|
Fix list of events for BOM module
|
2019-06-12 19:32:29 +02:00 |
|
Laurent Destailleur
|
2be5e9615d
|
Fix look and field v10
|
2019-06-12 19:03:22 +02:00 |
|
Laurent Destailleur
|
f6d8b46b40
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/action/card.php
htdocs/fichinter/card.php
|
2019-06-07 22:58:58 +02:00 |
|
Frédéric FRANCE
|
ad95b66842
|
Warning: A non-numeric value encountered
|
2019-06-06 10:12:01 +02:00 |
|
Laurent Destailleur
|
57cfb4b007
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/class/website.class.php
|
2019-06-02 12:36:07 +02:00 |
|
Maxime Kohlhaas
|
6dd01e86e9
|
Fix : avoid warning and uniformize var use
|
2019-05-31 15:53:23 +02:00 |
|
florian HENRY
|
ebe37df9db
|
scrunitizer
|
2019-05-18 16:19:44 +02:00 |
|
florian HENRY
|
47ae988b57
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
|
2019-05-18 16:18:22 +02:00 |
|
florian HENRY
|
12a8008107
|
scrunitizer
|
2019-05-18 16:18:14 +02:00 |
|
Laurent Destailleur
|
11fea03074
|
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
NEW : look and feel title button
|
2019-05-18 16:04:47 +02:00 |
|
Laurent Destailleur
|
90a1181dc5
|
Debug module Ticket
|
2019-05-01 20:41:03 +02:00 |
|
Laurent Destailleur
|
ee5d50b905
|
css
|
2019-04-27 13:25:21 +02:00 |
|
Laurent Destailleur
|
091132de2f
|
Signatures of methods createFromClone() has been standardized. All
methods requires the object User as first parameter.
|
2019-04-25 12:11:32 +02:00 |
|
Abbes Bahfir
|
dccc8b0be3
|
Fix:Same action in both cases
|
2019-04-24 08:48:36 +01:00 |
|
Laurent Destailleur
|
84ec39f043
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-04-23 12:25:53 +02:00 |
|
Laurent Destailleur
|
bf7fcce1b2
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-04-23 12:24:25 +02:00 |
|
Laurent Destailleur
|
5c53044863
|
Merge pull request #11024 from ATM-Marc/FIX_7.0_sort_events
FIX: actioncomm: sort events by date after external calendars and hook
|
2019-04-16 23:28:30 +02:00 |
|
Laurent Destailleur
|
c0defe3965
|
Update index.php
|
2019-04-16 23:27:45 +02:00 |
|
Marc de Lima Lucio
|
1669d497b4
|
FIX: actioncomm: sort events by date after external calendars and hook
|
2019-04-16 17:36:27 +02:00 |
|
ATM john
|
292d9c38a5
|
Appli function to links
|
2019-04-15 00:21:58 +02:00 |
|
ATM john
|
29b31bd7ab
|
New title button first step
|
2019-04-11 00:38:44 +02:00 |
|
Laurent Destailleur
|
f27f65e8bf
|
Responsive
|
2019-03-25 10:09:02 +01:00 |
|
Frédéric FRANCE
|
013e536f32
|
Update actioncomm.class.php
|
2019-03-19 12:49:54 +01:00 |
|
Philippe Grand
|
7942903548
|
Update actioncomm.class.php
|
2019-03-18 12:24:16 +01:00 |
|
Philippe GRAND
|
198cf4af2f
|
add comments
|
2019-03-18 10:06:22 +01:00 |
|
Laurent Destailleur
|
d4f2a16abf
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/productaccount.php
|
2019-03-14 17:10:58 +01:00 |
|
John BOTELLA
|
31e588dbab
|
fix hookmanager global
|
2019-03-14 16:13:32 +01:00 |
|
John BOTELLA
|
8bc795c055
|
Fix missing hook for export agenda
|
2019-03-14 15:19:38 +01:00 |
|
Laurent Destailleur
|
e7cd8d690c
|
Remove warnings
|
2019-03-13 19:06:45 +01:00 |
|
Laurent Destailleur
|
98ca9bf17a
|
Reduce quantity of string to translates
|
2019-03-12 19:44:59 +01:00 |
|
Laurent Destailleur
|
6daa262779
|
Files for variables of themes were renamed from graph-color.php into
theme_vars.inc.php to match naming convention of extension .inc.php for
files to be included.
|
2019-03-11 20:32:25 +01:00 |
|
Lionel VESSILLER
|
b56cd11f02
|
Fix default contact id for update and clone actions in event card
|
2019-03-06 12:00:55 +01:00 |
|
Frédéric FRANCE
|
0c2a77cb53
|
Merge remote-tracking branch 'upstream/develop' into patch-2
|
2019-03-05 18:14:15 +01:00 |
|
Laurent Destailleur
|
b851911708
|
Dolibarize module ticket
|
2019-03-05 12:18:46 +01:00 |
|
Frédéric FRANCE
|
f283782445
|
change visibility
|
2019-03-04 19:57:46 +01:00 |
|
Frédéric FRANCE
|
9b165f6b3f
|
add visibility
|
2019-02-27 20:45:07 +01:00 |
|
Laurent Destailleur
|
3ec2338c2d
|
Look and feel v10
|
2019-02-26 19:37:32 +01:00 |
|
Frédéric FRANCE
|
c7cec4be34
|
Update peruser.php
|
2019-02-14 21:45:40 +01:00 |
|
Frédéric FRANCE
|
b65532c5d8
|
Update pertype.php
|
2019-02-14 21:43:46 +01:00 |
|
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 |
|
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 |
|