SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
dwalenddwalend
5f7ecb0f713Code cleanup for SHRINE2020-731
bcarmenbcarmen
31cfcddde9dMerge branch 'feature/SHRINE2020-731' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
bcarmenbcarmen
99274f94086fix of reloading events
dwalenddwalend
d9a6e96febfsome todo cleanup for SHRINE2020-731
dwalenddwalend
861017c0c0dGot category names to appear for SHRINE2020-731, with a batch of refactoring
Marc-Danie NazaireMarc-Danie Nazaire
03ea5c8b9c7SHRINE2020-675 - View Results tab is showing the same set of queries if a user logs out from one user id and logs in ...
dwalenddwalend
b734b954e3eBacking out the change that should get category names for SHRINE2020-731
dwalenddwalend
4940729c701Merge branch 'feature/SHRINE2020-731' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
dwalenddwalend
fee358b480cConcept catagories for terms for SHRINE2020-731
bcarmenbcarmen
ff3ff1c7badfix of missing timeSpan on reload
bcarmenbcarmen
77ccd100b89make sure 2nd operator loads
dwalenddwalend
9ad13232428Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-731
bcarmenbcarmen
6c5638bd49dMerge branch 'develop' into feature/SHRINE2020-661
Marc-Danie NazaireMarc-Danie Nazaire
4c877565471SHRINE2020-675 - View Results tab is showing the same set of queries if a user logs out from one user id and logs in ...
dwalenddwalend
6529290ed1bI added a space for SHRINE2020-731
bcarmenbcarmen
e0cf5bf1a32Merge branch 'feature/SHRINE2020-204' into develop
Ben CarmenBen Carmen
6aefe6d883bMerge pull request #1124 in SHRINE/shrine from feature/SHRINE2020-740 to feature/SHRINE2020-204 * commit 'c45e3772fe...
Marc-Danie NazaireMarc-Danie Nazaire
101d5d7d3fbSHRINE2020-741 - Configure the breakdown aggregate chart titles in shrine.conf
dwalenddwalend
7328b2ab2fcMerge remote-tracking branch 'origin/develop' into feature/SHRINE2020-731
dwalenddwalend
6363eb1ee55Merge remote-tracking branch 'origin/feature/SHRINE2020-661' into feature/SHRINE2020-731
bcarmenbcarmen
945e5ca0a99saving work
dwalenddwalend
f2c86c0b47cFound the source of the unreported and fatal NullPointerException and filtered it out for SHRINE2020-721
Marc-Danie NazaireMarc-Danie Nazaire
a03495c89c0Merge pull request #1123 in SHRINE/shrine from bugfix/SHRINE2020-673 to develop * commit 'ae0a37ead61e9e4d16d3caed33...
Marc-Danie NazaireMarc-Danie Nazaire
ae0a37ead61SHRINE2020-673 - Scroll bar to navigate the query information section on the View Results page is missing - slight cs...
bcarmenbcarmen
c45e3772feeshow demographic distributions only if there are results to show
bcarmenbcarmen
34b14ed18efMerge branch 'develop' into feature/SHRINE2020-204
Marc-Danie NazaireMarc-Danie Nazaire
8686869b536SHRINE2020-635 - Tutorial Don't show again checkbox is not working - remove unused function
Marc-Danie NazaireMarc-Danie Nazaire
76c72b5e968SHRINE2020-635 - Tutorial Don't show again checkbox is not working
Marc-Danie NazaireMarc-Danie Nazaire
1ff6ccd07ecSHRINE2020-635 - Tutorial Don't show again checkbox is not working
Marc-Danie NazaireMarc-Danie Nazaire
4b8688c7dadSHRINE2020-635 - Tutorial Don't show again checkbox is not working
bcarmenbcarmen
e455f63ed3ffix to save event settings when switching tabs
Marc-Danie NazaireMarc-Danie Nazaire
c44156264a3Merge pull request #1118 in SHRINE/shrine from bugfix/SHRINE2020-675 to develop * commit 'ef2ef780b768447c8c0d7b14a4...
Marc-Danie NazaireMarc-Danie Nazaire
f5b842ccce4Merge pull request #1119 in SHRINE/shrine from bugfix/SHRINE2020-687 to develop * commit '0d801570180e7841f93f5c0542...
bcarmenbcarmen
8d05183fa65Merge branch 'feature/SHRINE2020-661' into bugfix/SHRINE2020-716
bcarmenbcarmen
f7d3293f7a7Merge branch 'develop' into feature/SHRINE2020-661
bcarmenbcarmen
c4d4906a7c6Merge branch 'develop' into bugfix/SHRINE2020-729
bcarmenbcarmen
1a1bf3c05b6When concepts are rearranged from group to group, make sure there is always an empty starter group at the bottom of t...
bcarmenbcarmen
5b1731f786aupdated default config to dev
dwalenddwalend
b0feb0f823fBA review comments from Anupama for SHRINE2020-731
Marc-Danie NazaireMarc-Danie Nazaire
b7fc9f64db3Merge pull request #1113 in SHRINE/shrine from bugfix/SHRINE2020-629 to develop * commit '7b4c5f2689b335461839d53b8a...
Marc-Danie NazaireMarc-Danie Nazaire
7b4c5f2689bSHRINE2020-629 - Help text in topic creation lingers beyond its welcome - Fixed labels in dialog after a topic was se...
Marc-Danie NazaireMarc-Danie Nazaire
0d801570180SHRINE2020-687 Removed date range values are persisted when reloading query with dates
Ben CarmenBen Carmen
b18b23bdc5eMerge pull request #1116 in SHRINE/shrine from feature/SHRINE2020-736 to feature/SHRINE2020-661 * commit 'e1822572bb...
Marc-Danie NazaireMarc-Danie Nazaire
ef2ef780b76SHRINE2020-675 - View Results tab is showing the same set of queries if a user logs out from one user id and logs in ...
bcarmenbcarmen
e1822572bb2fix of minor detail
bcarmenbcarmen
e873368bdd8removed reset of query definition when running a query
bcarmenbcarmen
541a32ae860fix of timelineLink reload
bcarmenbcarmen
13c3593e756fix of style
bcarmenbcarmen
1961fbf2d4bfix of style issue
dwalenddwalend
4398b576f21Merge branch 'feature/SHRINE2020-661' into feature/SHRINE2020-731
dwalenddwalend
f84fdf58c9dNice string for timespans for SHRINE2020-731
bcarmenbcarmen
28eaa95499cMerge branch 'feature/SHRINE2020-661' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
bcarmenbcarmen
8de55f37905fixed issue of loading a null timeline
bcarmenbcarmen
9a87d62a9a6Merge branch 'develop' into feature/SHRINE2020-661
dwalenddwalend
831ead56648Merge remote-tracking branch 'origin/feature/SHRINE2020-661' into feature/SHRINE2020-731
bcarmenbcarmen
5e45a24edbasuggested BA review changes
Marc-Danie NazaireMarc-Danie Nazaire
767905274aeMerge pull request #1112 in SHRINE/shrine from feature/SHRINE2020-706 to develop * commit 'fb0dd7b4e3ea642d02852b0e6...
David WalendDavid Walend
b03dc600310Merge pull request #1114 in SHRINE/shrine from feature/SHRINE2020-451 to develop * commit '8f07b2d381084464cd641e977...
Ben CarmenBen Carmen
d5726ccab86Merge pull request #1115 in SHRINE/shrine from feature/SHRINE2020-725 to feature/SHRINE2020-661 * commit 'c50995a952...
Marc-Danie NazaireMarc-Danie Nazaire
fb0dd7b4e3eMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-706 # Co...
Marc-Danie NazaireMarc-Danie Nazaire
493ae09cd2bmerging with develop
Marc-Danie NazaireMarc-Danie Nazaire
585da563126Merge pull request #1108 in SHRINE/shrine from feature/SHRINE2020-707 to develop * commit '3e4df817405d5a4beb645ac8b...
Marc-Danie NazaireMarc-Danie Nazaire
a0326c19f6cSHRINE2020-706 - Allow a user to download a CSV of the sites and counts from the View Results tab - Added use of eith...
Marc-Danie NazaireMarc-Danie Nazaire
3e4df817405SHRINE2020-707 - Include a row in the demographic distributions CSV to include site counts - changes based on code re...
Ben CarmenBen Carmen
ea87bf3e97cMerge pull request #1107 in SHRINE/shrine from feature/SHRINE2020-657 to develop Dave, mentioned that this ticket wa...
bcarmenbcarmen
4be86603b29Merge branch 'develop' into 657-merge
bcarmenbcarmen
c50995a9527moved redundant logic to method
Ben CarmenBen Carmen
de02660cb63Merge pull request #1110 in SHRINE/shrine from bugfix/SHRINE2020-699 to develop * commit '48dad02ceb659312ba0a76db1f...
Ben CarmenBen Carmen
b1e60d9cd8cMerge pull request #1105 in SHRINE/shrine from feature/SHRINE2020-717 to develop * commit '7bcd98b8e8744f625f8ac2c30...
bcarmenbcarmen
bb1a3b441e5working reload of event
Marc-Danie NazaireMarc-Danie Nazaire
487869076b3SHRINE2020-706 - Allow a user to download a CSV of the sites and counts from the View Results tab - Modified so that ...
bcarmenbcarmen
7bcd98b8e87Tweak of alignment of text in controls
Marc-Danie NazaireMarc-Danie Nazaire
9071158a909SHRINE2020-706 - Allow a user to download a CSV of the sites and counts from the View Results tab - Add missing 10 pa...
dwalenddwalend
8f07b2d3810used the latest ontology file name in all the docs and comments for SHRINE2020-451
dwalenddwalend
b7788c62882Trading one todo for another for SHRINE2020-451
dwalenddwalend
4559401bb44Code cleanup before review of SHRINE2020-451
Marc-Danie NazaireMarc-Danie Nazaire
980beae89a1SHRINE2020-707 - Include a row in the demographic distributions CSV to include site counts - Replaced String type wit...
dwalenddwalend
c97a64e62f0Got the search indexer to ignore modifier terms for SHRINE2020-451
Marc-Danie NazaireMarc-Danie Nazaire
d8e84e70a84Merge pull request #1102 in SHRINE/shrine from feature/SHRINE2020-659 to develop * commit '3c00a9eb96d7e1a27183f5973...
Marc-Danie NazaireMarc-Danie Nazaire
b49eceec4b5Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-707
Marc-Danie NazaireMarc-Danie Nazaire
e52fec35eddSHRINE2020-673 - Scroll bar to navigate the query information section on the View Results page is missing
bcarmenbcarmen
1527a4a54d9BA review UI layout changes
dwalenddwalend
bb1608567c5Marc-Danie's logging fix for SHRINE2020-451
bcarmenbcarmen
b736558a060Merge branch 'develop' into feature/SHRINE2020-717
David WalendDavid Walend
6bbfee339d3Merge pull request #1111 in SHRINE/shrine from feature/SHRINE2020-713 to develop * commit '116bd93fa79b533c71f6b6a15...
Marc-Danie NazaireMarc-Danie Nazaire
9f3fb9dc063SHRINE2020-629 - Help text in topic creation lingers beyond its welcome
Marc-Danie NazaireMarc-Danie Nazaire
d87027fbc77SHRINE2020-706 - Allow a user to download a CSV of the sites and counts from the View Results tab - reverting changes
Marc-Danie NazaireMarc-Danie Nazaire
2a1611a8e30SHRINE2020-629 - Help text in topic creation lingers beyond its welcome
bcarmenbcarmen
d6a8435cc3bedited changes based on BA review
Marc-Danie NazaireMarc-Danie Nazaire
5d78e9dbd91Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-707
Marc-Danie NazaireMarc-Danie Nazaire
accfb043396SHRINE2020-706 - Allow a user to download a CSV of the sites and counts from the View Results tab - Add check for err...
Marc-Danie NazaireMarc-Danie Nazaire
a0dfb00484fSHRINE2020-706 - Allow a user to download a CSV of the sites and counts from the View Results tab
David WalendDavid Walend
4e8ea88c5a7Merge pull request #1109 in SHRINE/shrine from bugfix/SHRINE2020-724 to feature/SHRINE2020-661 * commit 'e5c1b3ed1d1...
David WalendDavid Walend
3c9ec5b9c3fMerge pull request #1106 in SHRINE/shrine from bugfix/SHRINE2020-451 to develop * commit '1eb1033cc8b472bc5e8dc97822...
bcarmenbcarmen
196b4d38415changed from BA review recommendation
bcarmenbcarmen
1753d141680added recommended changes from BA review
bcarmenbcarmen
c1c3391914dMerge branch 'develop' into feature/SHRINE2020-717
dwalenddwalend
116bd93fa79Check a value for a PM cell project named in shrine.con - optionally - for SHRINE2020-713
bcarmenbcarmen
48dad02ceb6reload of queries is working
Marc-Danie NazaireMarc-Danie Nazaire
10ddbdacb15SHRINE2020-707 - Include a row in the demographic distributions CSV to include site counts - modified to use getOrElse
dwalenddwalend
1eb1033cc8bThese are actual problems in the index. Drop an error about them in the log for SHRINE2020-451
Marc-Danie NazaireMarc-Danie Nazaire
7969d8134bcSHRINE2020-707 - Include a row in the demographic distributions CSV to include site counts - now handles error status
Marc-Danie NazaireMarc-Danie Nazaire
ff85af6599bSHRINE2020-706 - Allow a user to download a CSV of the sites and counts from the View Results tab
dwalenddwalend
5641f7017acPathfinding for SHRINE2020-713
bcarmenbcarmen
b2f99b24193fix of missing styles
dwalenddwalend
e5c1b3ed1d1Allowed empthy expressions if the timeline is valid for SHRINE2020-724
Marc-Danie NazaireMarc-Danie Nazaire
ac7c326318dSHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M...
Marc-Danie NazaireMarc-Danie Nazaire
c5cf2af1d61SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M...
bcarmenbcarmen
c49b773c88bMerge branch '657-659' into feature/SHRINE2020-657
bcarmenbcarmen
c16f3efd373merge of 659 into 657
bcarmenbcarmen
aa1da297ccdmerge of 659 into 657
bcarmenbcarmen
4c9ede525a0Merge branch 'feature/SHRINE2020-659' into feature/SHRINE2020-657
bcarmenbcarmen
c53775ad249working validation for timespan
Marc-Danie NazaireMarc-Danie Nazaire
3c00a9eb96dSHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - s...
bcarmenbcarmen
db26c509fb4removed hard coded value used for developing graphs styles.
bcarmenbcarmen
b63fb88cdb0Fixed look and feel of graphs
Marc-Danie NazaireMarc-Danie Nazaire
9c6b4c9343cSHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - r...
Marc-Danie NazaireMarc-Danie Nazaire
62cf916924fSHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - r...
Marc-Danie NazaireMarc-Danie Nazaire
31767bf700dSHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - j...
Marc-Danie NazaireMarc-Danie Nazaire
f72ddb41671SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - R...
bcarmenbcarmen
bf79db2df66Merge branch 'develop' into 657-merge
Marc-Danie NazaireMarc-Danie Nazaire
b9f7db82360SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M...
Marc-Danie NazaireMarc-Danie Nazaire
bc8febf9b95SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F...
David WalendDavid Walend
ad2e8a32efdMerge pull request #1103 in SHRINE/shrine from feature/SHRINE2020-660 to develop * commit 'dd1c28cbb7af055e8e9783832...
Marc-Danie NazaireMarc-Danie Nazaire
8e27628850eSHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M...
Marc-Danie NazaireMarc-Danie Nazaire
fd59f33ed10Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-659
dwalenddwalend
b6cb3b6ae21null checks to prevent problems for searches for lab for SHRINE2020-451
Marc-Danie NazaireMarc-Danie Nazaire
9b050e15c9fSHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F...
Marc-Danie NazaireMarc-Danie Nazaire
f7239a4041fSHRINE2020-707 - Include a row in the demographic distributions CSV to include site counts
bcarmenbcarmen
9999397115bWorking validation for start query button
Ben CarmenBen Carmen
206d4d4044cMerge pull request #1104 in SHRINE/shrine from feature/SHRINE2020-656 to develop * commit '7c6c0785f5e16ab4559e2c893...
bcarmenbcarmen
df9b8635cceworking *required field for on or before the start of in timeline options
bcarmenbcarmen
7c6c0785f5eBA review feedback...change text and position
bcarmenbcarmen
82c19ecf4fbpossible fix of select alignment issues for topic
Marc-Danie NazaireMarc-Danie Nazaire
5174d597435SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M...
Marc-Danie NazaireMarc-Danie Nazaire
1fbb1bcf7d9SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M...
bcarmenbcarmen
e650f92a670fixed z index of topic drop down
bcarmenbcarmen
198108ca119saving layout
Marc-Danie NazaireMarc-Danie Nazaire
96bf6352bebSHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - R...
Marc-Danie NazaireMarc-Danie Nazaire
d44a252c3a2SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - f...
Marc-Danie NazaireMarc-Danie Nazaire
0483bfaea27SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F...
Marc-Danie NazaireMarc-Danie Nazaire
a12af806bedSHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F...
Marc-Danie NazaireMarc-Danie Nazaire
fd2ebc2df2dSHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F...
Marc-Danie NazaireMarc-Danie Nazaire
e250245cbc4SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F...
Marc-Danie NazaireMarc-Danie Nazaire
b9b18ea5147SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F...
Marc-Danie NazaireMarc-Danie Nazaire
d8fc39b1e62SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M...
Marc-Danie NazaireMarc-Danie Nazaire
3651864aa32SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F...
Marc-Danie NazaireMarc-Danie Nazaire
615ba670b20SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F...
Marc-Danie NazaireMarc-Danie Nazaire
d176dfdc47aSHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F...
Marc-Danie NazaireMarc-Danie Nazaire
04dded90f9aSHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F...
Marc-Danie NazaireMarc-Danie Nazaire
83db5d50d55SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - A...
Marc-Danie NazaireMarc-Danie Nazaire
4e4fdf7d554SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M...
Marc-Danie NazaireMarc-Danie Nazaire
321d216e830SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - A...
Marc-Danie NazaireMarc-Danie Nazaire
f19a45f7366SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M...
Marc-Danie NazaireMarc-Danie Nazaire
018b583c210SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F...
Marc-Danie NazaireMarc-Danie Nazaire
1deb8294729SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - M...
bcarmenbcarmen
11a22664acbPotential solution for validating whether or not event panels have concepts
bcarmenbcarmen
e9bc6ff7ae0Merge branch 'feature/SHRINE2020-657' into feature/SHRINE2020-656
bcarmenbcarmen
d7685366942fix of submit button not enabling
Marc-Danie NazaireMarc-Danie Nazaire
1b95bde2f82Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-659
Marc-Danie NazaireMarc-Danie Nazaire
fef5ef8b53dSHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - R...
bcarmenbcarmen
3effa11fac5working error message
Marc-Danie NazaireMarc-Danie Nazaire
07dd72aef76Merge pull request #1099 in SHRINE/shrine from feature/SHRINE2020-666 to develop * commit '00339d8293d2203c3a13b0aaf...
Marc-Danie NazaireMarc-Danie Nazaire
4fd3e191636SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - T...
David WalendDavid Walend
965fab9a448Merge pull request #1101 in SHRINE/shrine from feature/SHRINE2020-691 to develop * commit 'ff0b33b470bfcfc6924f167ce...
dwalenddwalend
dd1c28cbb7aMerge remote-tracking branch 'origin/develop' into feature/SHRINE2020-660
dwalenddwalend
aca40d764c6Rearranged the span tags for SHRINE2020-660 to make chaining the text a bit easier, and fixed the tests to match
Marc-Danie NazaireMarc-Danie Nazaire
48a1b94af83Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-659 # Co...
Marc-Danie NazaireMarc-Danie Nazaire
ebc6ad3bae8SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F...
Marc-Danie NazaireMarc-Danie Nazaire
7bdb8247429SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - R...
Marc-Danie NazaireMarc-Danie Nazaire
0c65ea688daSHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - F...
bcarmenbcarmen
b096a334367mege of 651
bcarmenbcarmen
57ea65389e9Merge branch 'develop' into feature/SHRINE2020-683
Ben CarmenBen Carmen
5e0cee9a340Merge pull request #1094 in SHRINE/shrine from feature/SHRINE2020-651 to feature/SHRINE2020-683 * commit 'ef6b5d2515...
Marc-Danie NazaireMarc-Danie Nazaire
724307ad1b9SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - r...
Marc-Danie NazaireMarc-Danie Nazaire
8889b8de5fbSHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - a...
Marc-Danie NazaireMarc-Danie Nazaire
965f2bd10e4SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - a...
Marc-Danie NazaireMarc-Danie Nazaire
e77e6c1d496SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - r...
Marc-Danie NazaireMarc-Danie Nazaire
a8f49d8513dSHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - r...
Marc-Danie NazaireMarc-Danie Nazaire
e739ce6f034SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - r...
Marc-Danie NazaireMarc-Danie Nazaire
adb3684cf7cSHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - n...
bcarmenbcarmen
ef6b5d2515bFix of resetting date ranges not working.
dwalenddwalend
fb54acf49afSpacing for the readable text in SHRINE2020-660
dwalenddwalend
40c0fa15a84Queries with just timelines now OK for SHRINE2020-660
bcarmenbcarmen
b5ebd38e898Merge branch 'feature/SHRINE2020-657' into feature/SHRINE2020-651
dwalenddwalend
ff0b33b470bTweaked anotehr comment for SHRINE2020-691
dwalenddwalend
394b146c00fComment cleanup for SHRINE2020-691
dwalenddwalend
d7c7601f4dajmeter parameters for testing SHRINE2020-691