 Marc-Danie Nazaire | 10ddbdacb15 | SHRINE2020-707 - Include a row in the demographic distributions CSV to include site counts - modified to use getOrElse | | |
 dwalend | 1eb1033cc8b | These are actual problems in the index. Drop an error about them in the log for SHRINE2020-451 | | |
Marc-Danie Nazaire | 7969d8134bc | SHRINE2020-707 - Include a row in the demographic distributions CSV to include site counts - now handles error status | | |
Marc-Danie Nazaire | ff85af6599b | SHRINE2020-706 - Allow a user to download a CSV of the sites and counts from the View Results tab | | |
dwalend | 5641f7017ac | Pathfinding for SHRINE2020-713 | | |
 bcarmen | b2f99b24193 | fix of missing styles | | |
dwalend | e5c1b3ed1d1 | Allowed empthy expressions if the timeline is valid for SHRINE2020-724 | | |
Marc-Danie Nazaire | ac7c326318d | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M... | | |
Marc-Danie Nazaire | c5cf2af1d61 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M... | | |
bcarmen | c49b773c88b | Merge branch '657-659' into feature/SHRINE2020-657 | | |
bcarmen | c16f3efd373 | merge of 659 into 657 | | |
bcarmen | aa1da297ccd | merge of 659 into 657 | | |
bcarmen | 4c9ede525a0 | Merge branch 'feature/SHRINE2020-659' into feature/SHRINE2020-657 | | |
bcarmen | c53775ad249 | working validation for timespan | | |
Marc-Danie Nazaire | 3c00a9eb96d | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - s... | | |
bcarmen | db26c509fb4 | removed hard coded value used for developing graphs styles. | | |
bcarmen | b63fb88cdb0 | Fixed look and feel of graphs | | |
Marc-Danie Nazaire | 9c6b4c9343c | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - r... | | |
Marc-Danie Nazaire | 62cf916924f | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - r... | | |
Marc-Danie Nazaire | 31767bf700d | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - j... | | |
Marc-Danie Nazaire | f72ddb41671 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - R... | | |
bcarmen | bf79db2df66 | Merge branch 'develop' into 657-merge | | |
Marc-Danie Nazaire | b9f7db82360 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M... | | |
Marc-Danie Nazaire | bc8febf9b95 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
 David Walend | ad2e8a32efd | Merge pull request #1103 in SHRINE/shrine from feature/SHRINE2020-660 to develop
* commit 'dd1c28cbb7af055e8e9783832... | | |
Marc-Danie Nazaire | 8e27628850e | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M... | | |
Marc-Danie Nazaire | fd59f33ed10 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-659 | | |
dwalend | b6cb3b6ae21 | null checks to prevent problems for searches for lab for SHRINE2020-451 | | |
Marc-Danie Nazaire | 9b050e15c9f | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | f7239a4041f | SHRINE2020-707 - Include a row in the demographic distributions CSV to include site counts | | |
bcarmen | 9999397115b | Working validation for start query button | | |
 Ben Carmen | 206d4d4044c | Merge pull request #1104 in SHRINE/shrine from feature/SHRINE2020-656 to develop
* commit '7c6c0785f5e16ab4559e2c893... | | |
bcarmen | df9b8635cce | working *required field for on or before the start of in timeline options | | |
bcarmen | 7c6c0785f5e | BA review feedback...change text and position | | |
bcarmen | 82c19ecf4fb | possible fix of select alignment issues for topic | | |
Marc-Danie Nazaire | 5174d597435 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M... | | |
Marc-Danie Nazaire | 1fbb1bcf7d9 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M... | | |
bcarmen | e650f92a670 | fixed z index of topic drop down | | |
bcarmen | 198108ca119 | saving layout | | |
Marc-Danie Nazaire | 96bf6352beb | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - R... | | |
Marc-Danie Nazaire | d44a252c3a2 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - f... | | |
Marc-Danie Nazaire | 0483bfaea27 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | a12af806bed | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | fd2ebc2df2d | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | e250245cbc4 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | b9b18ea5147 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | d8fc39b1e62 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M... | | |
Marc-Danie Nazaire | 3651864aa32 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | 615ba670b20 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | d176dfdc47a | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | 04dded90f9a | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | 83db5d50d55 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - A... | | |
Marc-Danie Nazaire | 4e4fdf7d554 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M... | | |
Marc-Danie Nazaire | 321d216e830 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - A... | | |
Marc-Danie Nazaire | f19a45f7366 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M... | | |
Marc-Danie Nazaire | 018b583c210 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | 1deb8294729 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M... | | |
bcarmen | 11a22664acb | Potential solution for validating whether or not event panels have concepts | | |
bcarmen | e9bc6ff7ae0 | Merge branch 'feature/SHRINE2020-657' into feature/SHRINE2020-656 | | |
bcarmen | d7685366942 | fix of submit button not enabling | | |
Marc-Danie Nazaire | 1b95bde2f82 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-659 | | |
Marc-Danie Nazaire | fef5ef8b53d | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - R... | | |
bcarmen | 3effa11fac5 | working error message | | |
Marc-Danie Nazaire | 07dd72aef76 | Merge pull request #1099 in SHRINE/shrine from feature/SHRINE2020-666 to develop
* commit '00339d8293d2203c3a13b0aaf... | | |
Marc-Danie Nazaire | 4fd3e191636 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - T... | | |
David Walend | 965fab9a448 | Merge pull request #1101 in SHRINE/shrine from feature/SHRINE2020-691 to develop
* commit 'ff0b33b470bfcfc6924f167ce... | | |
dwalend | dd1c28cbb7a | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-660 | | |
dwalend | aca40d764c6 | Rearranged the span tags for SHRINE2020-660 to make chaining the text a bit easier, and fixed the tests to match | | |
Marc-Danie Nazaire | 48a1b94af83 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-659
# Co... | | |
Marc-Danie Nazaire | ebc6ad3bae8 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | 7bdb8247429 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - R... | | |
Marc-Danie Nazaire | 0c65ea688da | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
bcarmen | b096a334367 | mege of 651 | | |
bcarmen | 57ea65389e9 | Merge branch 'develop' into feature/SHRINE2020-683 | | |
Ben Carmen | 5e0cee9a340 | Merge pull request #1094 in SHRINE/shrine from feature/SHRINE2020-651 to feature/SHRINE2020-683
* commit 'ef6b5d2515... | | |
Marc-Danie Nazaire | 724307ad1b9 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - r... | | |
Marc-Danie Nazaire | 8889b8de5fb | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - a... | | |
Marc-Danie Nazaire | 965f2bd10e4 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - a... | | |
Marc-Danie Nazaire | e77e6c1d496 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - r... | | |
Marc-Danie Nazaire | a8f49d8513d | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - r... | | |
Marc-Danie Nazaire | e739ce6f034 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - r... | | |
Marc-Danie Nazaire | adb3684cf7c | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - n... | | |
bcarmen | ef6b5d2515b | Fix of resetting date ranges not working. | | |
dwalend | fb54acf49af | Spacing for the readable text in SHRINE2020-660 | | |
dwalend | 40c0fa15a84 | Queries with just timelines now OK for SHRINE2020-660 | | |
bcarmen | b5ebd38e898 | Merge branch 'feature/SHRINE2020-657' into feature/SHRINE2020-651 | | |
dwalend | ff0b33b470b | Tweaked anotehr comment for SHRINE2020-691 | | |
dwalend | 394b146c00f | Comment cleanup for SHRINE2020-691 | | |
dwalend | d7c7601f4da | jmeter parameters for testing SHRINE2020-691 | | |
Marc-Danie Nazaire | da0178928a6 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - I... | | |
Marc-Danie Nazaire | c00c24a8c90 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-659
# Co... | | |
Marc-Danie Nazaire | f36ddeae5a6 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - A... | | |
Marc-Danie Nazaire | 127da12beb3 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - A... | | |
David Walend | dd4987c0a25 | Merge pull request #1098 in SHRINE/shrine from feature/SHRINE2020-658 to develop
* commit 'b72cb4d2799cc4753bf57cda0... | | |
Marc-Danie Nazaire | 7c86490a726 | Merge pull request #1097 in SHRINE/shrine from feature/SHRINE2020-655 to develop
* commit '9136d5770c6a9fe388471b139... | | |
Marc-Danie Nazaire | 00339d8293d | SHRINE2020-666 - Write JMeter scripts for SHRINE 2020 - Removed old jmx files and v3.0 directory | | |
bcarmen | dd534dd355d | Removed occurrences from Timeline Options | | |
dwalend | 3f599cc25eb | Merge remote-tracking branch 'origin/feature/SHRINE2020-666' into feature/SHRINE2020-691 | | |
Marc-Danie Nazaire | b72cb4d2799 | SHRINE2020-658 - Allow a user to run a "simple" event based query (any of event 1 before any of event 2) - Fixed json... | | |
bcarmen | 8c7c5c730e0 | Merge branch 'develop' into feature/SHRINE2020-651 | | |
dwalend | e17e6f8064e | Set the timestamp in the adapters for SHRINE2020-691 | | |
bcarmen | f87b603ed7c | Will validate the date ranges and occurrences | | |
dwalend | c293a682a7b | Exploring and exonerating the QEP for SHRINE2020-691 | | |
bcarmen | c550703b172 | Merge branch 'feature/SHRINE2020-651' into feature/SHRINE2020-657 | | |
bcarmen | a68b364f8e0 | Merge branch 'feature/SHRINE2020-658' into feature/SHRINE2020-657 | | |
Marc-Danie Nazaire | 1221161fe41 | SHRINE2020-666 - Write JMeter scripts for SHRINE 2020 - Renamed the hosts text file for running against multiple qeps | | |
Marc-Danie Nazaire | d7f34b61d00 | SHRINE2020-666 - Write JMeter scripts for SHRINE 2020 - File Cleanup | | |
Marc-Danie Nazaire | d241cd96502 | SHRINE2020-666 - Write JMeter scripts for SHRINE 2020 - File Cleanup | | |
Marc-Danie Nazaire | 33de8e1db15 | SHRINE2020-666 - Write JMeter scripts for SHRINE 2020 - Performance testing against perftest network jmeter scripts | | |
dwalend | 3960064c52e | Moved that test code that's been annoying Marc-Danie for SHRINE2020-658 | | |
dwalend | 4cd33986125 | Added the last bit of panel timing to get event order constraint queries working for SHRINE2020-658 | | |
bcarmen | f669af663a2 | removed xdescribe | | |
Marc-Danie Nazaire | 9136d5770c6 | SHRINE2020-655- Display a drop down menu to set the gap between events - removed unused TimelineEventLink model | | |
David Walend | 6532c9d98b1 | Merge pull request #1095 in SHRINE/shrine from bugfix/SHRINE2020-685 to develop
* commit '541e3e6d4b25304906db88d9f2... | | |
Marc-Danie Nazaire | 1d465a0e356 | SHRINE2020-655- Display a drop down menu to set the gap between events - Css tweak to improve scaling | | |
bcarmen | 453355c1a8b | xdescribed a failing test on Dave's box | | |
bcarmen | a099d578910 | Merge branch 'feature/SHRINE2020-698' into feature/SHRINE2020-658 | | |
bcarmen | b9ed4963cd9 | added paneltiming back into event | | |
Marc-Danie Nazaire | 50b5e29e571 | SHRINE2020-655- Display a drop down menu to set the gap between events - Css tweak | | |
Marc-Danie Nazaire | 7671f000eb3 | SHRINE2020-655- Display a drop down menu to set the gap between events - Fixed so that event relationship value is up... | | |
Marc-Danie Nazaire | 2460543655d | SHRINE2020-655- Display a drop down menu to set the gap between events - Fixed so that time unit value is updated | | |
Marc-Danie Nazaire | 4d911cc2e25 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-655
# Co... | | |
Marc-Danie Nazaire | 49d1396ac9e | SHRINE2020-655- Display a drop down menu to set the gap between events - Updated css | | |
bcarmen | 6fbe8604ab1 | Merge branch 'feature/SHRINE2020-698' into feature/SHRINE2020-658 | | |
bcarmen | dcdef899d88 | potential formatting to run a query | | |
bcarmen | c8ca10bbca8 | Merge branch 'feature/SHRINE2020-658' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
bcarmen | 355334c1065 | Merge branch 'feature/SHRINE2020-698' into feature/SHRINE2020-658 | | |
bcarmen | 10ca5ea4517 | possible solution to unblock Dave | | |
bcarmen | 37c86e80692 | saving json format | | |
bcarmen | 1b8fffc57ed | saving change to dev | | |
David Walend | eab6e1090f4 | Merge pull request #1091 in SHRINE/shrine from feature/SHRINE2020-689 to develop
* commit '08407b14ab6fb0c96ddbe9316... | | |
David Walend | 5476c9ed2e4 | Merge pull request #1096 in SHRINE/shrine from feature/SHRINE2020-698 to feature/SHRINE2020-658
* commit 'e60b130ccc... | | |
bcarmen | d78be1f6322 | fix of enabled date range when switching tabs when there is a demographic. | | |
Ben Carmen | a47b69beba6 | Merge pull request #1092 in SHRINE/shrine from feature/SHRINE2020-683 to develop
* commit '7f0b784f0082d8e485ce82f06... | | |
bcarmen | 4ed43362d81 | Merge branch 'feature/SHRINE2020-658' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
bcarmen | e60b130ccca | allow event queries to be run | | |
dwalend | 541e3e6d4b2 | Removed curly brace for SHRINE2020-685 | | |
Marc-Danie Nazaire | 921913aef81 | SHRINE2020-655- Display a drop down menu to set the gap between events - Modified the display names for the drop downs | | |
Marc-Danie Nazaire | 99a45b007fd | SHRINE2020-655- Display a drop down menu to set the gap between events - Fixed so that occurrence value is updated | | |
Marc-Danie Nazaire | a49f6440c96 | SHRINE2020-655- Display a drop down menu to set the gap between events - Fixed so that occurrence value is updated | | |
Marc-Danie Nazaire | 2d52825b8f0 | SHRINE2020-655- Display a drop down menu to set the gap between events - Fixed so that occurrence value is updated | | |
dwalend | 15959d1eb18 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-658 | | |
Marc-Danie Nazaire | a8203b70e63 | SHRINE2020-655- Display a drop down menu to set the gap between events - added year options | | |
Marc-Danie Nazaire | ebf2f705241 | SHRINE2020-655- Display a drop down menu to set the gap between events - added months option | | |
Marc-Danie Nazaire | 20d4abed388 | SHRINE2020-655- Display a drop down menu to set the gap between events | | |
bcarmen | 39d1b3fbcb3 | Merge branch 'feature/SHRINE2020-683' into feature/SHRINE2020-658 | | |
dwalend | d7d66889b9e | Merge branch 'feature/SHRINE2020-689' into feature/SHRINE2020-658 | | |
dwalend | 08407b14ab6 | Fixed all the tests so that everything has a topic a la SHRINE 3.0 for SHRINE2020-689 | | |
bcarmen | 7f0b784f008 | Merge branch 'develop' into feature/SHRINE2020-683 | | |
bcarmen | 1ffe0459097 | updated startQuery query group filter to include timeline groups in the query | | |
bcarmen | be3e2780ab8 | Set any unused QueryTermGroup.timeline elements to null before sending them off | | |
Ben Carmen | 9d9fb39e75e | Merge pull request #1093 in SHRINE/shrine from feature/SHRINE2020-690 to develop
* commit '33ceee1a1ab4e650c22cdec43... | | |
Marc-Danie Nazaire | 8e9aba84af0 | SHRINE2020-655- Display a drop down menu to set the gap between events | | |
Marc-Danie Nazaire | 29bf358e40a | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-655 | | |
bcarmen | 65bd3d71ba2 | functioning date range component in eventViews | | |
bcarmen | dae973efc2d | Added update timeline options action | | |
bcarmen | 0c6b6b97e6c | Merge branch 'feature/SHRINE2020-683' into feature/SHRINE2020-651 | | |
bcarmen | cb52f7303dd | Merge branch 'feature/SHRINE2020-683' into feature/SHRINE2020-658 | | |
bcarmen | 909fae703bb | Merge branch 'feature/SHRINE2020-690' into feature/SHRINE2020-683 | | |
bcarmen | 33ceee1a1ab | changed to have eventOperatorName be "First" by default | | |
bcarmen | 11656d1fd9d | Merge branch 'feature/SHRINE2020-683' into feature/SHRINE2020-658 | | |
bcarmen | 2f21d213c93 | quick fix for allowing timeline json to flow to back end | | |
bcarmen | ec25fcfee67 | saving work to merge | | |
bcarmen | f5d0395be03 | Merge branch 'feature/SHRINE2020-683' into 683-658-merge | | |
bcarmen | 588e104d20b | merge with 690 | | |
bcarmen | f18fa83a524 | Merge branch 'feature/SHRINE2020-683' into feature/SHRINE2020-651 | | |
bcarmen | e6f0468e8f0 | Merge branch 'feature/SHRINE2020-690' into 683-690-merge | | |
dwalend | da70ebbd071 | Merge remote-tracking branch 'origin/feature/SHRINE2020-690' into feature/SHRINE2020-658 | | |
bcarmen | 815ff84cbb7 | allow import from "model" for Timeline related models | | |
bcarmen | d5e89bac758 | shell of the format for json | | |
Marc-Danie Nazaire | 20babe57627 | small change | | |
dwalend | f329f495e2d | merging with develop | | |
dwalend | 1ebfc9970cc | Removing the bogus constraint for SHRINE2020-689 | | |
Marc-Danie Nazaire | 06e6ee0ab14 | SHRINE2020-653- Allow a user to specify the relationship between the groups - renamed argument | | |
Marc-Danie Nazaire | 67cf9a78d0c | SHRINE2020-653- Allow a user to specify the relationship between the groups - Added TimelineEventLink model | | |
bcarmen | 620ede7f685 | rename to timelineeventconcepts | | |
bcarmen | 881bfb9c620 | working reducer for updating timeline event options | | |
Marc-Danie Nazaire | b0fe970feea | Merge pull request #1083 in SHRINE/shrine from feature/SHRINE2020-205 to develop
* commit 'e67c1cb030095f9aa2316d432... | | |
Marc-Danie Nazaire | e67c1cb0300 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-205
# Co... | | |
bcarmen | beec8792503 | added UPDATE_TIMELINE_EVENT_OPTIONS | | |
bcarmen | 1d92dfa442c | renamed updateGroupTerm to updateGroupTermOptions | | |
bcarmen | 0f5e57ebc40 | renamed attribute to options | | |
bcarmen | a524a32020e | saving timelineeventoptions model | | |
bcarmen | f2e6d8baea0 | Merge branch 'develop' into feature/SHRINE2020-683 | | |
bcarmen | 6b243949bf0 | Merge branch 'feature/SHRINE2020-649' into develop | | |
dwalend | 324a39e503b | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-689 | | |
David Walend | 36df84ebe16 | Merge pull request #1089 in SHRINE/shrine from feature/SHRINE2020-684 to develop
* commit 'c182ac58219ed487addaba69d... | | |
dwalend | 13595ccaa92 | Added obfuscation off override.conf and wired up timeline to QueryNameTopicAndConcepts for SHRINE2020-689 | | |
| Next → |
