901 Commits

Author SHA1 Message Date
abcc8557ce resources: add a WriteComment new subcomponent 2022-01-12 15:25:06 +01:00
b1bffd875c Undo 'add thirdparty comment in acccourse resources' (commit 62b8b3e6)
-> it was displaying wrong comment !
2022-01-12 11:19:57 +01:00
b23161fa1d Merge branch 'master' into 232_resources_comment 2022-01-12 10:11:39 +01:00
098c2fbaa0 Merge remote-tracking branch 'origin/master' into 232_resources_comment 2022-01-10 21:50:00 +01:00
46ca74fc70 Merge branch 'master' into notification/completion 2022-01-10 16:11:06 +01:00
584b77bbf4 accourse resume page: fix masonry block border 2022-01-10 14:36:27 +01:00
juminet
699dcc85de Issue344 vue multiselect i18n 2022-01-10 12:04:57 +00:00
95027e93c6 fix translations for AddPersons in PickEntity 2022-01-10 12:41:47 +01:00
juminet
921dd639bf accompanying period: add location to accompanying period + add delete button 2022-01-10 11:03:14 +00:00
c32b767d9b Notifications list template 2022-01-06 19:04:16 +01:00
1e0c62b09d Merge branch 'master' into notification/completion 2022-01-05 11:15:49 +01:00
4f1540c541 add a patch resource api endpoint (wip) 2022-01-04 19:37:27 +01:00
nobohan
06f8014b76 Merge branch 'master' into issue303_household_fixes 2022-01-04 16:06:15 +01:00
nobohan
52f817bde7 fix conflicts when merging master 2022-01-04 15:56:32 +01:00
bcd25fa950 Merge branch 'issue349-masonry' into 'master'
Issue349 masonry

See merge request Chill-Projet/chill-bundles!274
2022-01-04 14:38:04 +00:00
nobohan
f4c8d0b09a Merge remote-tracking branch 'origin/master' into issue230_person 2022-01-04 13:50:27 +01:00
45dd21e02a add component and type to add user dynamically 2022-01-03 15:42:24 +01:00
dc581fcf57 fix details and corrections 2021-12-29 15:06:33 +01:00
bd909b0061 fix details and corrections 2021-12-29 14:57:18 +01:00
5089bba4d7 improve masonry bloc style 2021-12-29 12:11:20 +01:00
f117dcd703 objective-result-eval: display as a table in lists and dashboards 2021-12-20 15:46:07 +01:00
67c1760b51 fix bootstrap class 2021-12-20 13:53:49 +01:00
ae43e23ec6 Merge branch 'master' into issue321_layout_improvements_actionForm 2021-12-20 12:56:41 +01:00
6a4d7fbece AccompanyingCourseWorkEdit: fix bug, remove goal one by one
(adding a temporary negative index on just created goals)
2021-12-20 12:52:29 +01:00
3d16f68f54 accompanyingcourse-work: improve ui 2021-12-17 08:16:39 +01:00
395920bd51 suggest-list: picto is managedby css 2021-12-17 00:22:20 +01:00
a6cc6221d6 restore badge-title appearance 2021-12-16 22:35:47 +01:00
37ed6b7591 revert some scss conflicts with suggest-list 2021-12-16 22:18:17 +01:00
d588c36308 Merge branch '327_pinned_comment' into issue321_layout_improvements_actionForm 2021-12-16 21:41:22 +01:00
45c608cd48 AddPerson: optimize request while searching
* wait for a person to finish to type: delay before launching request;
* cancel previous requests, if any
2021-12-15 22:14:20 +01:00
264bd76461 Issue336 internal create action fixes 2021-12-14 18:48:31 +00:00
976f2fd41a fix thirdparty renderbox after merge 2021-12-13 19:37:19 +01:00
8c14232a91 Conflict resolved after rebase 2021-12-13 19:16:53 +01:00
a983b34f0d styling adjusted 2021-12-13 19:06:27 +01:00
4970cf000e behavior and style changed for adding motifs,obectifs, dispositifs 2021-12-13 19:06:27 +01:00
1422ddeb2a restyling and deleting of console.logs 2021-12-13 19:06:27 +01:00
9afc8c64ad stylefix 2021-12-13 19:06:27 +01:00
200f1749f1 patchOnTheFly action added to store, bug in posting thirdparty though 2021-12-13 19:06:27 +01:00
4645ede7d1 social issue added to title 2021-12-13 19:06:27 +01:00
6016038813 add modal to confirm delete action + delete button changed 2021-12-13 19:06:06 +01:00
d40b0e88ed change of masquer message, removal double import 2021-12-13 19:06:06 +01:00
f26863487b fix badge mixin 2021-12-13 19:06:06 +01:00
119a9981af Using thirdparty renderbox to display intervening thirdparties 2021-12-13 19:02:26 +01:00
decc18596b minor adjustment to allow for action title banner with correct colors 2021-12-13 19:01:36 +01:00
eea72c9bcd fix after rebase 2021-12-13 19:01:36 +01:00
717b71ff54 first commit 2021-12-13 19:01:36 +01:00
20c95a179d first commit 2021-12-13 18:58:17 +01:00
f8071d32c0 batch replace/rename initialComment by pinnedComment 2021-12-13 16:31:16 +01:00
nobohan
bbebaa9fae household member editor: comment markNoAddress button 2021-12-13 14:58:01 +01:00
nobohan
159dba0dc3 household member editor: do not add in new members if the member is included in the members of household 2021-12-13 14:36:08 +01:00