Commits
![Ben Carmen](https://secure.gravatar.com/avatar/a0d301ac878bae98ed361f1bd5fec404.jpg?s=96&d=mm)
Ben Carmen authored a47b69beba6M
Merge pull request #1092 in SHRINE/shrine from feature/SHRINE2020-683 to develop * commit '7f0b784f0082d8e485ce82f06c1e97e6eb4f060a': updated startQuery query group filter to include timeline groups in the query Set any unused QueryTermGroup.timeline elements to null before sending them off quick fix for allowing timeline json to flow to back end fixed failing unit test removed accidental import renamed components to Timeline refactor of reducers changed the model TemporalConstraint to Timeline refactor fully functioning feature...fixed hasDuplicateConcepts method. fully functioning nested drag and drop can drag between groups and events, started work on making sure concepts move to event panel 1 when "when" is selected. added, delete and update term props. saving work added UPDATE_QUERY_GROUP_TEMPORAL_CONCEPTS action refactor of actions functioning drag and drop and droppable functioning drag and drop
Showing diff to9d9fb39e75e