|
|
8f541c8418
|
Merge branch 'master' into 'issue83_ACCent_addDocument_toAction'
# Conflicts:
# CHANGELOG.md
|
2021-11-04 11:40:56 +00:00 |
|
|
|
c03b925bd9
|
Merge branch 'master' into 'issue153_ACCent_activity_admin'
# Conflicts:
# CHANGELOG.md
# src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
|
2021-11-04 08:52:32 +00:00 |
|
nobohan
|
a768563cd0
|
location: display the error message in case of wrong phone number or email
|
2021-11-03 16:16:51 +01:00 |
|
nobohan
|
4011fc6e77
|
location: client side validation
|
2021-11-03 16:16:51 +01:00 |
|
nobohan
|
c1f4e77293
|
location: allow null value for location in Activity
|
2021-11-03 16:16:51 +01:00 |
|
nobohan
|
bfb219746a
|
location: client-side form validation
|
2021-11-03 16:16:51 +01:00 |
|
nobohan
|
4e72bdead5
|
location: code refactoring: move saveNewLocation + order of fields
|
2021-11-03 16:16:51 +01:00 |
|
|
|
39e0e01eb8
|
cascade persist added to Activity::documents
|
2021-11-03 14:15:48 +01:00 |
|
|
|
6d248ab47b
|
Activity link added to admin homepage
|
2021-11-03 10:55:51 +01:00 |
|
|
|
2bbc6bd158
|
Merge remote-tracking branch 'origin/improve_location'
|
2021-10-27 16:50:17 +02:00 |
|
|
|
59118c8eed
|
Merge branch 'issue88_rename_field' into 'master'
field label for duration of activity
See merge request Chill-Projet/chill-bundles!178
|
2021-10-27 10:18:00 +00:00 |
|
nobohan
|
db67ed3194
|
rdv->calendar: add location
|
2021-10-20 22:04:20 +02:00 |
|
|
|
2227d5c66f
|
translation fixed in master vendee branch
|
2021-10-18 16:56:33 +02:00 |
|
|
|
eecb11436e
|
field label for duration of activity
|
2021-10-18 15:33:26 +02:00 |
|
|
|
8be11314c3
|
Merge branch 'master' into HEAD
|
2021-10-18 13:49:00 +02:00 |
|
|
|
6565e3f8e3
|
fix invisible selected item in multiselect
|
2021-10-15 15:37:16 +02:00 |
|
|
|
6876c23adb
|
adapting vue_calendar to use Location
|
2021-10-15 15:28:33 +02:00 |
|
|
|
4677fadf6f
|
adding activity location in show template + translations
|
2021-10-15 13:11:14 +02:00 |
|
|
|
3e4cb41f7a
|
vue_activity Location i18n translations
|
2021-10-15 12:49:15 +02:00 |
|
|
|
ada9efc75d
|
filter list of locations on backend side (GET location endpoint)
|
2021-10-15 12:01:57 +02:00 |
|
|
|
d0dd99db9a
|
fix Location POST endpoint and saveNewLocation event method in vue_activity Location
|
2021-10-15 11:25:18 +02:00 |
|
|
|
e6845326d7
|
vue_activity location: add NewLocation fields, submit activity form with hidden field (+)
|
2021-10-15 09:09:47 +02:00 |
|
|
|
4f940b44ad
|
Fix tests with capitalization
|
2021-10-14 14:01:18 +00:00 |
|
|
|
4d4662a634
|
adding endpoint for LocationType. fetch types and add form fields.
|
2021-10-13 19:31:48 +02:00 |
|
|
|
b418d13190
|
make somes changes on model: to manage isVisible field option + others
|
2021-10-13 15:47:48 +02:00 |
|
|
|
48f3c440a2
|
adding an API GET Location endpoint, fetch locations and list them in vue multiselect
|
2021-10-13 14:22:53 +02:00 |
|
|
|
342c462ed7
|
prepare vue Location component
|
2021-10-13 12:02:45 +02:00 |
|
|
|
49b1b6f413
|
vue_activity: add a Location sub-component, teleported in form
|
2021-10-13 09:56:29 +02:00 |
|
|
|
7c21818f00
|
vue_activity: removing v-model in a multiselect (try to fix warning in console)
|
2021-10-13 09:54:50 +02:00 |
|
|
|
e570f5c28e
|
adding Entities Location and LocationType (for activity/calendar) + doctrine migration
|
2021-10-12 17:38:09 +02:00 |
|
|
|
7ed61398ea
|
Merge branch '207_activity_bugfix' into 'master'
option added to distinguish between edit and new action so that modification...
See merge request Chill-Projet/chill-bundles!168
|
2021-10-08 16:43:10 +00:00 |
|
|
|
02268792ba
|
Activity: sharing badge-title include in list and in recent-list
|
2021-10-08 17:32:26 +02:00 |
|
|
|
afe076041f
|
rename recent_list to list_recent
|
2021-10-08 17:23:52 +02:00 |
|
|
|
800ab896bc
|
Activity, improve badge-title. Fix too long badges line break in a narrow inline wrapper.
|
2021-10-08 17:15:58 +02:00 |
|
|
|
e12e5798ea
|
refactor activity list css styles (wip)
|
2021-10-08 13:01:34 +02:00 |
|
|
|
52c1a01980
|
Refactoring sass chill colors variables and badge mixins
|
2021-10-08 13:01:10 +02:00 |
|
|
|
84189faae6
|
Translation for Last Items
|
2021-10-08 13:01:10 +02:00 |
|
|
|
3a07fa4faf
|
resume short list style abstraction for accourse-work and activities (wip)
|
2021-10-08 13:01:04 +02:00 |
|
|
|
48e59bac79
|
changelog updated
|
2021-10-07 15:50:35 +02:00 |
|
|
|
9d6958a835
|
logic moved to controller instead of form
|
2021-10-07 10:56:10 +02:00 |
|
|
|
b510d6a7f5
|
option added to distinguish between edit and new action so that modification of activity with uactive type is possible
|
2021-10-06 14:07:26 +02:00 |
|
|
|
d3bf64a00c
|
Merge remote-tracking branch 'origin/master' into HEAD
|
2021-09-24 12:32:19 +02:00 |
|
nobohan
|
d172ae9682
|
rdv -> activity: add comment
|
2021-09-23 13:43:12 +02:00 |
|
nobohan
|
99f2692684
|
activity: correction of displaying activity when durationTime or travelTime is null
|
2021-09-23 13:43:12 +02:00 |
|
nobohan
|
c6bbe46bae
|
rdv: rdv -> activity: fix some bugs (duplicate person var name, case keys are missing)
|
2021-09-23 13:43:12 +02:00 |
|
nobohan
|
17036e83ba
|
rdv: rdv-> activity: convert some fields
|
2021-09-23 13:43:12 +02:00 |
|
nobohan
|
e8d8a57b4b
|
rdv: rdv -> activity: pass calendar data to new activity controller
|
2021-09-23 13:43:12 +02:00 |
|
|
|
120f7d8026
|
upgrade voter and acl for activities and implement autoconfiguration for
ChillProvideRole interface
|
2021-09-20 13:56:44 +02:00 |
|
|
|
753e6c1105
|
adding a dev page with sass assets album
|
2021-09-10 11:34:08 +02:00 |
|
|
|
05aaa32881
|
track all files added in other bundles
|
2021-09-09 16:46:26 +02:00 |
|
