This repository was archived by the owner on May 5, 2021. It is now read-only.
Commit d7a0e1f
committed
Merge branch 'development' of https://github.com/hzi-braunschweig/SORMAS-Project into SORMAS-Foundation#3843-Bulk_editing_cases_takes_a_very_long_time
� Conflicts:
� sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseFacade.java126 files changed
Lines changed: 1596 additions & 864 deletions
File tree
- sormas-api/src/main
- java/de/symeda/sormas/api
- action
- caze
- contact
- event
- i18n
- importexport
- sormastosormas
- utils
- resources
- sormas-backend/src
- main
- java/de/symeda/sormas/backend
- action
- caze
- contact
- importexport
- resources/sql
- test/java/de/symeda/sormas/backend
- contact
- importexport
- sormas-rest/src/test/resources
- sormas-ui/src/main/java/de/symeda/sormas/ui
- action
- caze
- exporter
- contact
- customexport
- dashboard/contacts
- epicurve
- events
- survnet
- utils
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 5 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
59 | | - | |
| 59 | + | |
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
| |||
146 | 146 | | |
147 | 147 | | |
148 | 148 | | |
149 | | - | |
150 | | - | |
| 149 | + | |
| 150 | + | |
151 | 151 | | |
152 | 152 | | |
153 | | - | |
154 | | - | |
| 153 | + | |
| 154 | + | |
155 | 155 | | |
156 | 156 | | |
157 | 157 | | |
| |||
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
184 | 184 | | |
185 | 185 | | |
186 | 186 | | |
| 187 | + | |
| 188 | + | |
187 | 189 | | |
188 | 190 | | |
189 | 191 | | |
| |||
0 commit comments