|
|
8de8f1afb7
|
webpack: push assets into chill entry
|
2021-03-21 15:09:08 +01:00 |
|
|
|
dc1f8e9533
|
webpack installation of ckeditor5
|
2021-03-21 15:09:08 +01:00 |
|
|
|
18fec8c491
|
webpack, add new entrypoint for bootstrap
|
2021-03-21 15:09:08 +01:00 |
|
|
|
3182c3607c
|
remove unused files: css/select2 and css/scratch
|
2021-03-21 15:09:08 +01:00 |
|
|
|
e78855fe0c
|
check webpack assets entrypoints
|
2021-03-21 15:09:08 +01:00 |
|
|
|
6efa795f2a
|
replace fontawesome by forkawesome
|
2021-03-21 15:09:08 +01:00 |
|
|
|
371da5d9bf
|
remove bower and grunt js
|
2021-03-21 15:09:08 +01:00 |
|
|
|
f4c556812e
|
"Duplicate": import 11 previous commits from Person bundle, before merging monorepo
Last 11 commits are rewritten to maintain history :
5e461dc Mathieu Jaumotte Mon Mar 8 18:37:11 2021 +0100 oups
f2179b5 Mathieu Jaumotte Mon Mar 8 18:33:32 2021 +0100 count linked objects in merge person side panel
7bc76f3 Mathieu Jaumotte Mon Mar 8 16:54:01 2021 +0100 improve duplicate ux
71aa9f4 Mathieu Jaumotte Thu Mar 4 21:52:42 2021 +0100 improve duplicates templates
d3c13ce Mathieu Jaumotte Thu Mar 4 16:15:55 2021 +0100 design UX for duplicate person feature
a8b306e Mathieu Jaumotte Wed Mar 3 18:38:00 2021 +0100 change migration namespace
8752c71 Jean-Francois Monfort Thu Feb 18 14:24:37 2021 +0100 Unit testf for duplicate person
0799980 Jean-Francois Monfort Thu Feb 18 11:39:23 2021 +0100 New screen to find duplicate person manually
a7fa7a5 Jean-Francois Monfort Thu Feb 11 16:31:30 2021 +0100 New permission for duplicate & export duplicate persons
2980441 Jean-Francois Monfort Thu Feb 4 17:21:15 2021 +0100 Duplicate module
d06ab66 Jean-Francois Monfort Thu Jan 28 17:26:20 2021 +0100 List duplicate persons
|
2021-03-21 15:06:28 +01:00 |
|
|
|
31ef7ba74f
|
oups
|
2021-03-21 14:42:26 +01:00 |
|
|
|
d81fc881af
|
count linked objects in merge person side panel
|
2021-03-21 14:41:22 +01:00 |
|
|
|
03ef68dc36
|
improve duplicate ux
|
2021-03-21 14:40:16 +01:00 |
|
|
|
a86feafa53
|
improve duplicates templates
|
2021-03-21 14:38:58 +01:00 |
|
|
|
aa40716898
|
design UX for duplicate person feature
|
2021-03-21 14:36:59 +01:00 |
|
|
|
76c9cd5be3
|
change migration namespace
|
2021-03-21 14:29:00 +01:00 |
|
|
|
e841e9015c
|
Unit testf for duplicate person
Signed-off-by: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
|
2021-03-21 14:21:27 +01:00 |
|
|
|
3bcb5fb3dd
|
New screen to find duplicate person manually
Signed-off-by: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
|
2021-03-21 14:19:31 +01:00 |
|
|
|
c34b992437
|
New permission for duplicate & export duplicate persons
Signed-off-by: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
|
2021-03-21 14:14:38 +01:00 |
|
|
|
0149457fba
|
Duplicate module
Signed-off-by: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
|
2021-03-21 14:08:55 +01:00 |
|
|
|
728ea73bdf
|
List duplicate persons
Signed-off-by: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Signed-off-by: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
|
2021-03-21 14:03:06 +01:00 |
|
|
|
0cc951b296
|
fix webpack path with aliases
|
2021-03-21 10:20:57 +01:00 |
|
|
|
60b48a97e2
|
Adding missing dependencies. See trace:
master@chill-vendee cb68f33e71 JFMonfort 2021-02-18 Adding missing dependencies
sf4@chill-standard 732f4af595 MathieuJ 2021-03-08 rebase: Add missing dependencies (cb68f33e713)
sf4@chill-standard 358f7e7be7 MathieuJ 2021-03-08 install php markdown to html, and test change in template
|
2021-03-20 16:09:45 +01:00 |
|
|
|
a0e7105e83
|
fix package name
|
2021-03-18 13:54:11 +01:00 |
|
|
|
1ef4a90989
|
Merge branch 'master' into sf4
|
2021-03-18 13:51:25 +01:00 |
|
|
|
3cd6d6af2b
|
add composer file
|
2021-03-18 13:47:46 +01:00 |
|
|
|
9977062665
|
fix folder name in master branch
|
2021-03-18 13:37:31 +01:00 |
|
|
|
eaa0ad925f
|
fix folder name
|
2021-03-18 13:37:13 +01:00 |
|
|
|
a2f6773f5a
|
import changes on address from chill main
|
2021-03-18 13:14:37 +01:00 |
|
|
|
490ea5bd72
|
Merge branch 'master' into sf4
|
2021-03-18 13:02:45 +01:00 |
|
|
|
4a9db7839c
|
Merge remote-tracking branch 'ChillThirdParty/sf4' into sf4
|
2021-03-18 12:46:49 +01:00 |
|
|
|
3a6fdb3c3d
|
Merge remote-tracking branch 'ChillTask/sf4' into sf4
|
2021-03-18 12:46:49 +01:00 |
|
|
|
a68577cc69
|
Merge remote-tracking branch 'ChillReport/sf4' into sf4
|
2021-03-18 12:46:49 +01:00 |
|
|
|
a4246d4eeb
|
Merge remote-tracking branch 'ChillPerson/sf4' into sf4
|
2021-03-18 12:46:49 +01:00 |
|
|
|
47516e0b5a
|
Merge remote-tracking branch 'ChillMain/sf4' into sf4
|
2021-03-18 12:46:48 +01:00 |
|
|
|
e73c215ae8
|
Merge remote-tracking branch 'ChillFamilyMembers/sf4' into sf4
|
2021-03-18 12:46:48 +01:00 |
|
|
|
5727629292
|
Merge remote-tracking branch 'ChillEvent/sf4' into sf4
|
2021-03-18 12:46:48 +01:00 |
|
|
|
f28f34690b
|
Merge remote-tracking branch 'ChillDocStore/sf4' into sf4
|
2021-03-18 12:46:48 +01:00 |
|
|
|
d1a066e272
|
Merge remote-tracking branch 'ChillThirdParty/master'
|
2021-03-18 12:46:47 +01:00 |
|
|
|
5ea4b4efe1
|
Merge remote-tracking branch 'ChillCustomFields/sf4' into sf4
|
2021-03-18 12:46:47 +01:00 |
|
|
|
4c731a55f7
|
Merge remote-tracking branch 'ChillTask/master'
|
2021-03-18 12:46:47 +01:00 |
|
|
|
3ede278389
|
Merge remote-tracking branch 'ChillBudgetBundle/sf4' into sf4
|
2021-03-18 12:46:47 +01:00 |
|
|
|
5dc757b9a1
|
Merge remote-tracking branch 'ChillReport/master'
|
2021-03-18 12:46:47 +01:00 |
|
|
|
5712cf6f31
|
Merge remote-tracking branch 'ChillActivityBundle/sf4' into sf4
|
2021-03-18 12:46:47 +01:00 |
|
|
|
6d99f8d2ea
|
Merge remote-tracking branch 'ChillPerson/master'
|
2021-03-18 12:46:46 +01:00 |
|
|
|
9b97d10ec4
|
Merge remote-tracking branch 'ChillMain/master'
|
2021-03-18 12:46:45 +01:00 |
|
|
|
8ae83d9f85
|
Merge remote-tracking branch 'ChillFamilyMembers/master'
|
2021-03-18 12:46:44 +01:00 |
|
|
|
9e807d7bd8
|
Merge remote-tracking branch 'ChillEvent/master'
|
2021-03-18 12:46:44 +01:00 |
|
|
|
275ef9a369
|
Merge remote-tracking branch 'ChillDocStore/master'
|
2021-03-18 12:46:44 +01:00 |
|
|
|
bbb8ffb484
|
Merge remote-tracking branch 'ChillCustomFields/master'
|
2021-03-18 12:46:44 +01:00 |
|
|
|
9b426c4c48
|
Merge remote-tracking branch 'ChillBudgetBundle/master'
|
2021-03-18 12:46:44 +01:00 |
|
|
|
f429eebd7b
|
Merge remote-tracking branch 'ChillActivityBundle/master'
|
2021-03-18 12:46:44 +01:00 |
|
