|
|
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 |
|
|
|
5b531a0529
|
improve docgen wip
|
2021-12-13 19:04:37 +01:00 |
|
|
|
a25123ee38
|
add docgen:normalization for relation
|
2021-12-13 19:03:42 +01:00 |
|
|
|
2524229941
|
docgen normalization for relation
|
2021-12-13 19:03:22 +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 |
|
|
|
64015479b1
|
improve docgen, trnslations, admin
|
2021-12-13 19:01:36 +01:00 |
|
|
|
18fa4eb586
|
fix tests (wip)
|
2021-12-13 19:00:13 +01:00 |
|
|
|
47574f82aa
|
fix code style
|
2021-12-13 19:00:13 +01:00 |
|
|
|
12309ca1b5
|
fix tests (wip)
|
2021-12-13 18:59:43 +01:00 |
|
|
|
20c95a179d
|
first commit
|
2021-12-13 18:58:17 +01:00 |
|
|
|
3973cdd3f6
|
update changelog [ci-skip]
|
2021-12-13 16:19:32 +01:00 |
|
|
|
13a1ab380e
|
fix import social work metadata: use child social issue if any
|
2021-12-13 15:03:30 +01:00 |
|
|
|
041655d26e
|
update changelog [ci-skip]
|
2021-12-13 15:03:30 +01:00 |
|
|
|
6e412117d3
|
Merge branch 'issue324_civility_order' into 'master'
main: add order field to civility
See merge request Chill-Projet/chill-bundles!265
|
2021-12-13 14:00:55 +00:00 |
|
|
|
cc849e279d
|
fix column name
|
2021-12-13 14:38:33 +01:00 |
|
|
|
550b4775bf
|
behavior and style changed for adding motifs,obectifs, dispositifs
|
2021-12-13 14:32:59 +01:00 |
|
|
|
de262bbc28
|
civility::order: replace int by a float
|
2021-12-13 14:12:48 +01:00 |
|
|
|
2bafdd9e62
|
Merge branch 'fix/236-update-social-work-metadata-importer' into 'master'
Update Social Work Metadata importer
Closes champs-libres/departement-de-la-vendee/chill#236
See merge request Chill-Projet/chill-bundles!190
|
2021-12-13 12:49:03 +00:00 |
|
|
|
d01eaa8065
|
various fixes
|
2021-12-13 13:48:20 +01:00 |
|
nobohan
|
4a465b8f78
|
upd CHANGELOG
|
2021-12-13 12:39:09 +01:00 |
|
nobohan
|
eaf7ae6f2f
|
php cs fixer
|
2021-12-13 12:38:18 +01:00 |
|
nobohan
|
b5178c3be3
|
main: add order field to civility
|
2021-12-13 12:35:17 +01:00 |
|
|
|
fdae6c106a
|
Merge remote-tracking branch 'origin/master' into fix/236-update-social-work-metadata-importer
|
2021-12-13 11:01:19 +01:00 |
|
|
|
1fff9ef535
|
stylefix
|
2021-12-13 10:10:05 +01:00 |
|
|
|
20c4d07668
|
fix of aside activity category creation
|
2021-12-13 10:05:51 +01:00 |
|
|
|
6e1340be27
|
Merge branch 'master' into 292_activity_acl
|
2021-12-13 09:21:32 +01:00 |
|
|
|
118b208f68
|
Merge branch 'master' into 292_activity_acl
|
2021-12-13 09:13:43 +01:00 |
|
|
|
e21f12d96c
|
Merge remote-tracking branch 'origin/master'
|
2021-12-12 21:05:35 +01:00 |
|
|
|
4b213dc290
|
remove dump [ci-skip]
|
2021-12-12 21:05:12 +01:00 |
|
|
|
55991a6082
|
Merge branch 'issue309_format_address' into 'master'
main: change address format for France, in Address render box and normalizer
See merge request Chill-Projet/chill-bundles!259
|
2021-12-12 15:05:54 +00:00 |
|
juminet
|
898f25c0e4
|
main: change address format for France, in Address render box and normalizer
|
2021-12-12 15:05:54 +00:00 |
|
|
|
b3929321b6
|
Merge branch 'badge_by_entity_type' into 'master'
Badge-thirdparty
See merge request Chill-Projet/chill-bundles!258
|
2021-12-12 14:51:43 +00:00 |
|
|
|
c049a0b78b
|
Badge-thirdparty
|
2021-12-12 14:51:42 +00:00 |
|
|
|
10aa897899
|
Merge branch 'docgen/improve-normalizer' into 'master'
Docgen/improve normalizer
See merge request Chill-Projet/chill-bundles!257
|
2021-12-12 14:43:05 +00:00 |
|
|
|
31f5d97912
|
Docgen/improve normalizer
|
2021-12-12 14:43:05 +00:00 |
|
|
|
c6cda437c4
|
Merge branch 'issue324_person' into 'master'
fix some person issues
See merge request Chill-Projet/chill-bundles!254
|
2021-12-12 14:39:59 +00:00 |
|
juminet
|
7e045e964a
|
fix some person issues
|
2021-12-12 14:39:59 +00:00 |
|
|
|
133ac67794
|
Merge branch 'issue320_bug_redirect_createPeriod' into 'master'
Issue320 bug redirect create period
See merge request Chill-Projet/chill-bundles!249
|
2021-12-12 14:12:44 +00:00 |
|
