 bcarmen | 552710ef9ba | BA review UI layout changes | | |
 dwalend | 3a67ce163ff | Marc-Danie's logging fix for SHRINE2020-451 | | |
bcarmen | c61dc6af91e | Merge branch 'develop' into feature/SHRINE2020-717 | | |
 David Walend | f37f58cf1f2 | Merge pull request #1111 in SHRINE/shrine from feature/SHRINE2020-713 to develop
* commit '613e1bb41ba6f9693920935e7... | | |
 Marc-Danie Nazaire | 45a7bd03196 | SHRINE2020-629 - Help text in topic creation lingers beyond its welcome | | |
Marc-Danie Nazaire | 32b7b5b4302 | SHRINE2020-706 - Allow a user to download a CSV of the sites and counts from the View Results tab - reverting changes | | |
Marc-Danie Nazaire | 9638a79bb2b | SHRINE2020-629 - Help text in topic creation lingers beyond its welcome | | |
bcarmen | 25810de47f1 | edited changes based on BA review | | |
Marc-Danie Nazaire | 6318a6eea1e | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-707 | | |
Marc-Danie Nazaire | 58eab4b0a4e | SHRINE2020-706 - Allow a user to download a CSV of the sites and counts from the View Results tab - Add check for err... | | |
Marc-Danie Nazaire | 51516e1f3b9 | SHRINE2020-706 - Allow a user to download a CSV of the sites and counts from the View Results tab | | |
David Walend | 027a951fe04 | Merge pull request #1109 in SHRINE/shrine from bugfix/SHRINE2020-724 to feature/SHRINE2020-661
* commit '361c2ff9067... | | |
David Walend | 60b3e0246c8 | Merge pull request #1106 in SHRINE/shrine from bugfix/SHRINE2020-451 to develop
* commit 'a656f50357ba4f1721d8c704fc... | | |
bcarmen | f837afd261c | changed from BA review recommendation | | |
bcarmen | 751cc895b2e | added recommended changes from BA review | | |
bcarmen | 0fe45ee100a | Merge branch 'develop' into feature/SHRINE2020-717 | | |
dwalend | 613e1bb41ba | Check a value for a PM cell project named in shrine.con - optionally - for SHRINE2020-713 | | |
bcarmen | 7ba4a7f0ab3 | reload of queries is working | | |
Marc-Danie Nazaire | 04e184a6c69 | SHRINE2020-707 - Include a row in the demographic distributions CSV to include site counts - modified to use getOrElse | | |
dwalend | a656f50357b | These are actual problems in the index. Drop an error about them in the log for SHRINE2020-451 | | |
Marc-Danie Nazaire | 9b76d088190 | SHRINE2020-707 - Include a row in the demographic distributions CSV to include site counts - now handles error status | | |
Marc-Danie Nazaire | b8e471297d6 | SHRINE2020-706 - Allow a user to download a CSV of the sites and counts from the View Results tab | | |
dwalend | d442bcc3174 | Pathfinding for SHRINE2020-713 | | |
bcarmen | 65809d0f858 | fix of missing styles | | |
dwalend | 361c2ff9067 | Allowed empthy expressions if the timeline is valid for SHRINE2020-724 | | |
Marc-Danie Nazaire | 7164acba071 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M... | | |
Marc-Danie Nazaire | f8705eeb3f5 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M... | | |
bcarmen | 36860b8dd66 | Merge branch '657-659' into feature/SHRINE2020-657 | | |
bcarmen | 5fffc6675c0 | merge of 659 into 657 | | |
bcarmen | 295891569e9 | merge of 659 into 657 | | |
bcarmen | cb649eb87b1 | Merge branch 'feature/SHRINE2020-659' into feature/SHRINE2020-657 | | |
bcarmen | c070a1725f4 | working validation for timespan | | |
Marc-Danie Nazaire | 95ce9747a25 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - s... | | |
bcarmen | f832ad1220c | removed hard coded value used for developing graphs styles. | | |
bcarmen | 455d98b1467 | Fixed look and feel of graphs | | |
Marc-Danie Nazaire | 0aefc99a354 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - r... | | |
Marc-Danie Nazaire | 7b1d2fb904d | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - r... | | |
Marc-Danie Nazaire | c3a3f57bbae | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - j... | | |
Marc-Danie Nazaire | d2a2c22fe64 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - R... | | |
bcarmen | 4c561befe3e | Merge branch 'develop' into 657-merge | | |
Marc-Danie Nazaire | 3bffb99010d | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M... | | |
Marc-Danie Nazaire | 950282a1d8e | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
David Walend | 3aaf33e8394 | Merge pull request #1103 in SHRINE/shrine from feature/SHRINE2020-660 to develop
* commit '9d4e28e34d3847eae8441cb74... | | |
Marc-Danie Nazaire | 669bae78699 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M... | | |
Marc-Danie Nazaire | f2f33773f5a | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-659 | | |
dwalend | 97b42e789ef | null checks to prevent problems for searches for lab for SHRINE2020-451 | | |
Marc-Danie Nazaire | 50a2e1e877f | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | 434f8b39611 | SHRINE2020-707 - Include a row in the demographic distributions CSV to include site counts | | |
bcarmen | ca76272be2f | Working validation for start query button | | |
 Ben Carmen | 0ed044a7c20 | Merge pull request #1104 in SHRINE/shrine from feature/SHRINE2020-656 to develop
* commit '03e513b50951c053520f94769... | | |
bcarmen | ec9c6eeef6f | working *required field for on or before the start of in timeline options | | |
bcarmen | 03e513b5095 | BA review feedback...change text and position | | |
bcarmen | 15736372840 | possible fix of select alignment issues for topic | | |
Marc-Danie Nazaire | e68397f5bf7 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M... | | |
Marc-Danie Nazaire | acd8df32a30 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M... | | |
bcarmen | 77e30bf833b | fixed z index of topic drop down | | |
bcarmen | 65fd33aed70 | saving layout | | |
Marc-Danie Nazaire | 26437dcad91 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - R... | | |
Marc-Danie Nazaire | d1ab7288bc7 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - f... | | |
Marc-Danie Nazaire | 46cc64bc670 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | c4ba71f672c | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | d5622335f5a | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | 44c4f4bbb37 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | 3ed94467b2a | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | 0b5b92f3125 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M... | | |
Marc-Danie Nazaire | 21807f5d0d9 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | 29e6b718c7f | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | 01019fe65da | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | 9c40efb8eec | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | fd9e9707056 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - A... | | |
Marc-Danie Nazaire | b4292ebb13a | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M... | | |
Marc-Danie Nazaire | 613f5c370d9 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - A... | | |
Marc-Danie Nazaire | 213ab6fc087 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M... | | |
Marc-Danie Nazaire | d975909c5f5 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | 17becc455c3 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M... | | |
bcarmen | 4570e525fff | Potential solution for validating whether or not event panels have concepts | | |
bcarmen | 42b1f942a47 | Merge branch 'feature/SHRINE2020-657' into feature/SHRINE2020-656 | | |
bcarmen | 9b48c70634b | fix of submit button not enabling | | |
Marc-Danie Nazaire | 7cfc8bcdf95 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-659 | | |
Marc-Danie Nazaire | 0f029a61719 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - R... | | |
bcarmen | 8dde3740862 | working error message | | |
Marc-Danie Nazaire | ce3e51f9447 | Merge pull request #1099 in SHRINE/shrine from feature/SHRINE2020-666 to develop
* commit '1ef67b02a3c1c955b45022f9d... | | |
Marc-Danie Nazaire | 81fa4179bb3 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - T... | | |
David Walend | 2ea0d7b90e7 | Merge pull request #1101 in SHRINE/shrine from feature/SHRINE2020-691 to develop
* commit 'bead34099bb875b3505cdd33e... | | |
dwalend | 9d4e28e34d3 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-660 | | |
dwalend | 472096e06f3 | Rearranged the span tags for SHRINE2020-660 to make chaining the text a bit easier, and fixed the tests to match | | |
Marc-Danie Nazaire | e860b99f665 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-659
# Co... | | |
Marc-Danie Nazaire | f13e74c8cf2 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
Marc-Danie Nazaire | 5804207b601 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - R... | | |
Marc-Danie Nazaire | 7462b6abd75 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F... | | |
bcarmen | f24a4ac94fa | mege of 651 | | |
bcarmen | 1995d2431b6 | Merge branch 'develop' into feature/SHRINE2020-683 | | |
Ben Carmen | 2b30008e28d | Merge pull request #1094 in SHRINE/shrine from feature/SHRINE2020-651 to feature/SHRINE2020-683
* commit 'e5d9dfe4f6... | | |
Marc-Danie Nazaire | 020a91dd627 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - r... | | |
Marc-Danie Nazaire | c1e4bcc2ab9 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - a... | | |
Marc-Danie Nazaire | 4434989a270 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - a... | | |
Marc-Danie Nazaire | 429579280b4 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - r... | | |
Marc-Danie Nazaire | 825c1671aff | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - r... | | |
Marc-Danie Nazaire | 34dfd8bf749 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - r... | | |
Marc-Danie Nazaire | 72767000cf1 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - n... | | |
bcarmen | e5d9dfe4f6f | Fix of resetting date ranges not working. | | |
dwalend | a9b01c46447 | Spacing for the readable text in SHRINE2020-660 | | |
dwalend | 47a43024095 | Queries with just timelines now OK for SHRINE2020-660 | | |
bcarmen | a0e68c1b1ad | Merge branch 'feature/SHRINE2020-657' into feature/SHRINE2020-651 | | |
dwalend | bead34099bb | Tweaked anotehr comment for SHRINE2020-691 | | |
dwalend | 47927f2ae6e | Comment cleanup for SHRINE2020-691 | | |
dwalend | 7d3b26b4ff8 | jmeter parameters for testing SHRINE2020-691 | | |
Marc-Danie Nazaire | c17b8330bb0 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - I... | | |
Marc-Danie Nazaire | 755c31bc209 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-659
# Co... | | |
Marc-Danie Nazaire | 356a20fdf37 | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - A... | | |
Marc-Danie Nazaire | aa1683ced7c | SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - A... | | |
David Walend | 6c0d86dde80 | Merge pull request #1098 in SHRINE/shrine from feature/SHRINE2020-658 to develop
* commit '52f6b250f38017259863befa6... | | |
Marc-Danie Nazaire | c5ba2745fa0 | Merge pull request #1097 in SHRINE/shrine from feature/SHRINE2020-655 to develop
* commit 'e322806f46ecdd657fb6f7fa8... | | |
Marc-Danie Nazaire | 1ef67b02a3c | SHRINE2020-666 - Write JMeter scripts for SHRINE 2020 - Removed old jmx files and v3.0 directory | | |
bcarmen | ae977145402 | Removed occurrences from Timeline Options | | |
dwalend | 72247814052 | Merge remote-tracking branch 'origin/feature/SHRINE2020-666' into feature/SHRINE2020-691 | | |
Marc-Danie Nazaire | 52f6b250f38 | SHRINE2020-658 - Allow a user to run a "simple" event based query (any of event 1 before any of event 2) - Fixed json... | | |
bcarmen | 1d504ad8935 | Merge branch 'develop' into feature/SHRINE2020-651 | | |
dwalend | eae4e2a9a11 | Set the timestamp in the adapters for SHRINE2020-691 | | |
bcarmen | 6a816e1c8ac | Will validate the date ranges and occurrences | | |
dwalend | f255d2c3b7c | Exploring and exonerating the QEP for SHRINE2020-691 | | |
bcarmen | 1f0709c1c2f | Merge branch 'feature/SHRINE2020-651' into feature/SHRINE2020-657 | | |
bcarmen | 77c84bfda74 | Merge branch 'feature/SHRINE2020-658' into feature/SHRINE2020-657 | | |
Marc-Danie Nazaire | 46907c488e4 | SHRINE2020-666 - Write JMeter scripts for SHRINE 2020 - Renamed the hosts text file for running against multiple qeps | | |
Marc-Danie Nazaire | 2612ac30057 | SHRINE2020-666 - Write JMeter scripts for SHRINE 2020 - File Cleanup | | |
Marc-Danie Nazaire | 1f8763263ac | SHRINE2020-666 - Write JMeter scripts for SHRINE 2020 - File Cleanup | | |
Marc-Danie Nazaire | e80cc879cc1 | SHRINE2020-666 - Write JMeter scripts for SHRINE 2020 - Performance testing against perftest network jmeter scripts | | |
dwalend | 6267d294c44 | Moved that test code that's been annoying Marc-Danie for SHRINE2020-658 | | |
dwalend | 62b14f50bb6 | Added the last bit of panel timing to get event order constraint queries working for SHRINE2020-658 | | |
bcarmen | 76370d3e24d | removed xdescribe | | |
Marc-Danie Nazaire | e322806f46e | SHRINE2020-655- Display a drop down menu to set the gap between events - removed unused TimelineEventLink model | | |
David Walend | ce69197c604 | Merge pull request #1095 in SHRINE/shrine from bugfix/SHRINE2020-685 to develop
* commit '2d0c59b11c457f12b31bb3f310... | | |
Marc-Danie Nazaire | 2781e78b57e | SHRINE2020-655- Display a drop down menu to set the gap between events - Css tweak to improve scaling | | |
bcarmen | 2eae371d734 | xdescribed a failing test on Dave's box | | |
bcarmen | fcfa259a62e | Merge branch 'feature/SHRINE2020-698' into feature/SHRINE2020-658 | | |
bcarmen | 5eeb97a42c7 | added paneltiming back into event | | |
Marc-Danie Nazaire | ca31d174004 | SHRINE2020-655- Display a drop down menu to set the gap between events - Css tweak | | |
Marc-Danie Nazaire | 384793f9a93 | SHRINE2020-655- Display a drop down menu to set the gap between events - Fixed so that event relationship value is up... | | |
Marc-Danie Nazaire | e47b1651bb3 | SHRINE2020-655- Display a drop down menu to set the gap between events - Fixed so that time unit value is updated | | |
Marc-Danie Nazaire | 1b75a1a8aee | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-655
# Co... | | |
Marc-Danie Nazaire | a29f7deb6f9 | SHRINE2020-655- Display a drop down menu to set the gap between events - Updated css | | |
bcarmen | ed3a83d2560 | Merge branch 'feature/SHRINE2020-698' into feature/SHRINE2020-658 | | |
bcarmen | 9653ce76359 | potential formatting to run a query | | |
bcarmen | 3636930873f | Merge branch 'feature/SHRINE2020-658' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
bcarmen | 204ebebff7a | Merge branch 'feature/SHRINE2020-698' into feature/SHRINE2020-658 | | |
bcarmen | 785090b8fc4 | possible solution to unblock Dave | | |
bcarmen | b4722406462 | saving json format | | |
bcarmen | 43c6273f4a9 | saving change to dev | | |
David Walend | 1f527601ba1 | Merge pull request #1091 in SHRINE/shrine from feature/SHRINE2020-689 to develop
* commit 'a54e7112730f02b5fefa8182e... | | |
David Walend | d28911ca1a6 | Merge pull request #1096 in SHRINE/shrine from feature/SHRINE2020-698 to feature/SHRINE2020-658
* commit '75aa13aebd... | | |
bcarmen | 077248764f1 | fix of enabled date range when switching tabs when there is a demographic. | | |
Ben Carmen | 26ce0a9e7fa | Merge pull request #1092 in SHRINE/shrine from feature/SHRINE2020-683 to develop
* commit '02b0a0fc9f896d8de00ec68ce... | | |
bcarmen | a59ed6f294a | Merge branch 'feature/SHRINE2020-658' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
bcarmen | 75aa13aebd6 | allow event queries to be run | | |
dwalend | 2d0c59b11c4 | Removed curly brace for SHRINE2020-685 | | |
Marc-Danie Nazaire | f7dd850417a | SHRINE2020-655- Display a drop down menu to set the gap between events - Modified the display names for the drop downs | | |
Marc-Danie Nazaire | ab75cdd1d53 | SHRINE2020-655- Display a drop down menu to set the gap between events - Fixed so that occurrence value is updated | | |
Marc-Danie Nazaire | 401772e1a4c | SHRINE2020-655- Display a drop down menu to set the gap between events - Fixed so that occurrence value is updated | | |
Marc-Danie Nazaire | 16f62782a87 | SHRINE2020-655- Display a drop down menu to set the gap between events - Fixed so that occurrence value is updated | | |
dwalend | 8b93ddc8834 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-658 | | |
Marc-Danie Nazaire | fa318a04f31 | SHRINE2020-655- Display a drop down menu to set the gap between events - added year options | | |
Marc-Danie Nazaire | 311d40a5fd0 | SHRINE2020-655- Display a drop down menu to set the gap between events - added months option | | |
Marc-Danie Nazaire | 7b5f9eaa711 | SHRINE2020-655- Display a drop down menu to set the gap between events | | |
bcarmen | 2bdd9da4055 | Merge branch 'feature/SHRINE2020-683' into feature/SHRINE2020-658 | | |
dwalend | 920b8e25fe5 | Merge branch 'feature/SHRINE2020-689' into feature/SHRINE2020-658 | | |
dwalend | a54e7112730 | Fixed all the tests so that everything has a topic a la SHRINE 3.0 for SHRINE2020-689 | | |
bcarmen | 02b0a0fc9f8 | Merge branch 'develop' into feature/SHRINE2020-683 | | |
bcarmen | 8fbe2525921 | updated startQuery query group filter to include timeline groups in the query | | |
bcarmen | 6189ab58bf3 | Set any unused QueryTermGroup.timeline elements to null before sending them off | | |
Ben Carmen | 19443867139 | Merge pull request #1093 in SHRINE/shrine from feature/SHRINE2020-690 to develop
* commit '778353d4fad2e796b005623b4... | | |
Marc-Danie Nazaire | ff6109506f1 | SHRINE2020-655- Display a drop down menu to set the gap between events | | |
Marc-Danie Nazaire | 78752f4cbcb | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-655 | | |
bcarmen | 1c57c0d2af3 | functioning date range component in eventViews | | |
bcarmen | e735bb3dded | Added update timeline options action | | |
bcarmen | 3bd44eaa994 | Merge branch 'feature/SHRINE2020-683' into feature/SHRINE2020-651 | | |
bcarmen | a5caf1ffb44 | Merge branch 'feature/SHRINE2020-683' into feature/SHRINE2020-658 | | |
bcarmen | 333ca537942 | Merge branch 'feature/SHRINE2020-690' into feature/SHRINE2020-683 | | |
bcarmen | 778353d4fad | changed to have eventOperatorName be "First" by default | | |
bcarmen | 346ca2e5dd1 | Merge branch 'feature/SHRINE2020-683' into feature/SHRINE2020-658 | | |
bcarmen | 5e2236a4332 | quick fix for allowing timeline json to flow to back end | | |
bcarmen | fac56d4d2c1 | saving work to merge | | |
bcarmen | 755cedecf61 | Merge branch 'feature/SHRINE2020-683' into 683-658-merge | | |
bcarmen | f8d79240a5e | merge with 690 | | |
bcarmen | be44fd3e7ef | Merge branch 'feature/SHRINE2020-683' into feature/SHRINE2020-651 | | |
bcarmen | b7c9e4a51da | Merge branch 'feature/SHRINE2020-690' into 683-690-merge | | |
dwalend | 627ee8e162d | Merge remote-tracking branch 'origin/feature/SHRINE2020-690' into feature/SHRINE2020-658 | | |
bcarmen | 7d8efb5bbc4 | allow import from "model" for Timeline related models | | |
bcarmen | 4c8813a2898 | shell of the format for json | | |
| Next → |
