SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
Marc-Danie NazaireMarc-Danie Nazaire
da0178928a6SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - I...
Marc-Danie NazaireMarc-Danie Nazaire
c00c24a8c90Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-659 # Co...
Marc-Danie NazaireMarc-Danie Nazaire
f36ddeae5a6SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - A...
Marc-Danie NazaireMarc-Danie Nazaire
127da12beb3SHRINE2020-659 - Allow a user to run a "advanced" event based query (date ranges, relationship, first of event 2) - A...
David WalendDavid Walend
dd4987c0a25Merge pull request #1098 in SHRINE/shrine from feature/SHRINE2020-658 to develop * commit 'b72cb4d2799cc4753bf57cda0...
Marc-Danie NazaireMarc-Danie Nazaire
7c86490a726Merge pull request #1097 in SHRINE/shrine from feature/SHRINE2020-655 to develop * commit '9136d5770c6a9fe388471b139...
Marc-Danie NazaireMarc-Danie Nazaire
00339d8293dSHRINE2020-666 - Write JMeter scripts for SHRINE 2020 - Removed old jmx files and v3.0 directory
bcarmenbcarmen
dd534dd355dRemoved occurrences from Timeline Options
dwalenddwalend
3f599cc25ebMerge remote-tracking branch 'origin/feature/SHRINE2020-666' into feature/SHRINE2020-691
Marc-Danie NazaireMarc-Danie Nazaire
b72cb4d2799SHRINE2020-658 - Allow a user to run a "simple" event based query (any of event 1 before any of event 2) - Fixed json...
bcarmenbcarmen
8c7c5c730e0Merge branch 'develop' into feature/SHRINE2020-651
dwalenddwalend
e17e6f8064eSet the timestamp in the adapters for SHRINE2020-691
bcarmenbcarmen
f87b603ed7cWill validate the date ranges and occurrences
dwalenddwalend
c293a682a7bExploring and exonerating the QEP for SHRINE2020-691
bcarmenbcarmen
c550703b172Merge branch 'feature/SHRINE2020-651' into feature/SHRINE2020-657
bcarmenbcarmen
a68b364f8e0Merge branch 'feature/SHRINE2020-658' into feature/SHRINE2020-657
Marc-Danie NazaireMarc-Danie Nazaire
1221161fe41SHRINE2020-666 - Write JMeter scripts for SHRINE 2020 - Renamed the hosts text file for running against multiple qeps
Marc-Danie NazaireMarc-Danie Nazaire
d7f34b61d00SHRINE2020-666 - Write JMeter scripts for SHRINE 2020 - File Cleanup
Marc-Danie NazaireMarc-Danie Nazaire
d241cd96502SHRINE2020-666 - Write JMeter scripts for SHRINE 2020 - File Cleanup
Marc-Danie NazaireMarc-Danie Nazaire
33de8e1db15SHRINE2020-666 - Write JMeter scripts for SHRINE 2020 - Performance testing against perftest network jmeter scripts
dwalenddwalend
3960064c52eMoved that test code that's been annoying Marc-Danie for SHRINE2020-658
dwalenddwalend
4cd33986125Added the last bit of panel timing to get event order constraint queries working for SHRINE2020-658
bcarmenbcarmen
f669af663a2removed xdescribe
Marc-Danie NazaireMarc-Danie Nazaire
9136d5770c6SHRINE2020-655- Display a drop down menu to set the gap between events - removed unused TimelineEventLink model
David WalendDavid Walend
6532c9d98b1Merge pull request #1095 in SHRINE/shrine from bugfix/SHRINE2020-685 to develop * commit '541e3e6d4b25304906db88d9f2...
Marc-Danie NazaireMarc-Danie Nazaire
1d465a0e356SHRINE2020-655- Display a drop down menu to set the gap between events - Css tweak to improve scaling
bcarmenbcarmen
453355c1a8bxdescribed a failing test on Dave's box
bcarmenbcarmen
a099d578910Merge branch 'feature/SHRINE2020-698' into feature/SHRINE2020-658
bcarmenbcarmen
b9ed4963cd9added paneltiming back into event
Marc-Danie NazaireMarc-Danie Nazaire
50b5e29e571SHRINE2020-655- Display a drop down menu to set the gap between events - Css tweak
Marc-Danie NazaireMarc-Danie Nazaire
7671f000eb3SHRINE2020-655- Display a drop down menu to set the gap between events - Fixed so that event relationship value is up...
Marc-Danie NazaireMarc-Danie Nazaire
2460543655dSHRINE2020-655- Display a drop down menu to set the gap between events - Fixed so that time unit value is updated
Marc-Danie NazaireMarc-Danie Nazaire
4d911cc2e25Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-655 # Co...
Marc-Danie NazaireMarc-Danie Nazaire
49d1396ac9eSHRINE2020-655- Display a drop down menu to set the gap between events - Updated css
bcarmenbcarmen
6fbe8604ab1Merge branch 'feature/SHRINE2020-698' into feature/SHRINE2020-658
bcarmenbcarmen
dcdef899d88potential formatting to run a query
bcarmenbcarmen
c8ca10bbca8Merge branch 'feature/SHRINE2020-658' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
bcarmenbcarmen
355334c1065Merge branch 'feature/SHRINE2020-698' into feature/SHRINE2020-658
bcarmenbcarmen
10ca5ea4517possible solution to unblock Dave
bcarmenbcarmen
37c86e80692saving json format
bcarmenbcarmen
1b8fffc57edsaving change to dev
David WalendDavid Walend
eab6e1090f4Merge pull request #1091 in SHRINE/shrine from feature/SHRINE2020-689 to develop * commit '08407b14ab6fb0c96ddbe9316...
David WalendDavid Walend
5476c9ed2e4Merge pull request #1096 in SHRINE/shrine from feature/SHRINE2020-698 to feature/SHRINE2020-658 * commit 'e60b130ccc...
bcarmenbcarmen
d78be1f6322fix of enabled date range when switching tabs when there is a demographic.
Ben CarmenBen Carmen
a47b69beba6Merge pull request #1092 in SHRINE/shrine from feature/SHRINE2020-683 to develop * commit '7f0b784f0082d8e485ce82f06...
bcarmenbcarmen
4ed43362d81Merge branch 'feature/SHRINE2020-658' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
bcarmenbcarmen
e60b130cccaallow event queries to be run
dwalenddwalend
541e3e6d4b2Removed curly brace for SHRINE2020-685
Marc-Danie NazaireMarc-Danie Nazaire
921913aef81SHRINE2020-655- Display a drop down menu to set the gap between events - Modified the display names for the drop downs
Marc-Danie NazaireMarc-Danie Nazaire
99a45b007fdSHRINE2020-655- Display a drop down menu to set the gap between events - Fixed so that occurrence value is updated
Marc-Danie NazaireMarc-Danie Nazaire
a49f6440c96SHRINE2020-655- Display a drop down menu to set the gap between events - Fixed so that occurrence value is updated
Marc-Danie NazaireMarc-Danie Nazaire
2d52825b8f0SHRINE2020-655- Display a drop down menu to set the gap between events - Fixed so that occurrence value is updated
dwalenddwalend
15959d1eb18Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-658
Marc-Danie NazaireMarc-Danie Nazaire
a8203b70e63SHRINE2020-655- Display a drop down menu to set the gap between events - added year options
Marc-Danie NazaireMarc-Danie Nazaire
ebf2f705241SHRINE2020-655- Display a drop down menu to set the gap between events - added months option
Marc-Danie NazaireMarc-Danie Nazaire
20d4abed388SHRINE2020-655- Display a drop down menu to set the gap between events
bcarmenbcarmen
39d1b3fbcb3Merge branch 'feature/SHRINE2020-683' into feature/SHRINE2020-658
dwalenddwalend
d7d66889b9eMerge branch 'feature/SHRINE2020-689' into feature/SHRINE2020-658
dwalenddwalend
08407b14ab6Fixed all the tests so that everything has a topic a la SHRINE 3.0 for SHRINE2020-689
bcarmenbcarmen
7f0b784f008Merge branch 'develop' into feature/SHRINE2020-683
bcarmenbcarmen
1ffe0459097updated startQuery query group filter to include timeline groups in the query
bcarmenbcarmen
be3e2780ab8Set any unused QueryTermGroup.timeline elements to null before sending them off
Ben CarmenBen Carmen
9d9fb39e75eMerge pull request #1093 in SHRINE/shrine from feature/SHRINE2020-690 to develop * commit '33ceee1a1ab4e650c22cdec43...
Marc-Danie NazaireMarc-Danie Nazaire
8e9aba84af0SHRINE2020-655- Display a drop down menu to set the gap between events
Marc-Danie NazaireMarc-Danie Nazaire
29bf358e40aMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-655
bcarmenbcarmen
65bd3d71ba2functioning date range component in eventViews
bcarmenbcarmen
dae973efc2dAdded update timeline options action
bcarmenbcarmen
0c6b6b97e6cMerge branch 'feature/SHRINE2020-683' into feature/SHRINE2020-651
bcarmenbcarmen
cb52f7303ddMerge branch 'feature/SHRINE2020-683' into feature/SHRINE2020-658
bcarmenbcarmen
909fae703bbMerge branch 'feature/SHRINE2020-690' into feature/SHRINE2020-683
bcarmenbcarmen
33ceee1a1abchanged to have eventOperatorName be "First" by default
bcarmenbcarmen
11656d1fd9dMerge branch 'feature/SHRINE2020-683' into feature/SHRINE2020-658
bcarmenbcarmen
2f21d213c93quick fix for allowing timeline json to flow to back end
bcarmenbcarmen
ec25fcfee67saving work to merge
bcarmenbcarmen
f5d0395be03Merge branch 'feature/SHRINE2020-683' into 683-658-merge
bcarmenbcarmen
588e104d20bmerge with 690
bcarmenbcarmen
f18fa83a524Merge branch 'feature/SHRINE2020-683' into feature/SHRINE2020-651
bcarmenbcarmen
e6f0468e8f0Merge branch 'feature/SHRINE2020-690' into 683-690-merge
dwalenddwalend
da70ebbd071Merge remote-tracking branch 'origin/feature/SHRINE2020-690' into feature/SHRINE2020-658
bcarmenbcarmen
815ff84cbb7allow import from "model" for Timeline related models
bcarmenbcarmen
d5e89bac758shell of the format for json
Marc-Danie NazaireMarc-Danie Nazaire
20babe57627small change
dwalenddwalend
f329f495e2dmerging with develop
dwalenddwalend
1ebfc9970ccRemoving the bogus constraint for SHRINE2020-689
Marc-Danie NazaireMarc-Danie Nazaire
06e6ee0ab14SHRINE2020-653- Allow a user to specify the relationship between the groups - renamed argument
Marc-Danie NazaireMarc-Danie Nazaire
67cf9a78d0cSHRINE2020-653- Allow a user to specify the relationship between the groups - Added TimelineEventLink model
bcarmenbcarmen
620ede7f685rename to timelineeventconcepts
bcarmenbcarmen
881bfb9c620working reducer for updating timeline event options
Marc-Danie NazaireMarc-Danie Nazaire
b0fe970feeaMerge pull request #1083 in SHRINE/shrine from feature/SHRINE2020-205 to develop * commit 'e67c1cb030095f9aa2316d432...
Marc-Danie NazaireMarc-Danie Nazaire
e67c1cb0300Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-205 # Co...
bcarmenbcarmen
beec8792503added UPDATE_TIMELINE_EVENT_OPTIONS
bcarmenbcarmen
1d92dfa442crenamed updateGroupTerm to updateGroupTermOptions
bcarmenbcarmen
0f5e57ebc40renamed attribute to options
bcarmenbcarmen
a524a32020esaving timelineeventoptions model
bcarmenbcarmen
f2e6d8baea0Merge branch 'develop' into feature/SHRINE2020-683
bcarmenbcarmen
6b243949bf0Merge branch 'feature/SHRINE2020-649' into develop
dwalenddwalend
324a39e503bMerge remote-tracking branch 'origin/develop' into feature/SHRINE2020-689
David WalendDavid Walend
36df84ebe16Merge pull request #1089 in SHRINE/shrine from feature/SHRINE2020-684 to develop * commit 'c182ac58219ed487addaba69d...
dwalenddwalend
13595ccaa92Added obfuscation off override.conf and wired up timeline to QueryNameTopicAndConcepts for SHRINE2020-689
dwalenddwalend
9aa6a6c3efeRefactoring and reworking of QueryNameTopicAndConcepts to get event order constraints in place for SHRINE2020-689
bcarmenbcarmen
9c3e1c9b49ffixed failing unit test
bcarmenbcarmen
3120dcce0abremoved accidental import
bcarmenbcarmen
c503843981arenamed components to Timeline
bcarmenbcarmen
c6c0e4bd2f4refactor of reducers
bcarmenbcarmen
93e0230044cchanged the model TemporalConstraint to Timeline
dwalenddwalend
8a5f8705110Got some nice html for the text of a time constraint query for SHRINE2020-689
bcarmenbcarmen
b842fa6c547refactor
dwalenddwalend
29ca517dfe5Restored the string summary for queries with the new validation code path for SHRINE2020-689
Marc-Danie NazaireMarc-Danie Nazaire
211e977ba76SHRINE2020-653- Allow a user to specify the relationship between the groups - added option to the any dropdown
bcarmenbcarmen
1fea7e12a0aMerge branch 'feature/SHRINE2020-649' into feature/SHRINE2020-683
bcarmenbcarmen
88c0e9459c6Merge branch 'develop' into feature/SHRINE2020-649
bcarmenbcarmen
c9ee6d8821bfully functioning feature...fixed hasDuplicateConcepts method.
bcarmenbcarmen
cf651247ac3fully functioning nested drag and drop
Marc-Danie NazaireMarc-Danie Nazaire
1293dcba5a2SHRINE2020-653- Allow a user to specify the relationship between the groups - change text color to blue for the drop ...
bcarmenbcarmen
f8c56c6cf8cfixed isNull setting for isExcluded...should be false instead.
bcarmenbcarmen
8124a801ce3can drag between groups and events, started work on making sure concepts move to event panel 1 when "when" is selected.
dwalenddwalend
c182ac58219Anupama says there's a bit more complexity to support in this first pass for SHRINE2020-684
dwalenddwalend
ce5fb96ee93Cleanup for the end of SHRINE2020-684
dwalenddwalend
10604afd0bfAdded a test for the query that works for SHINE2020-684
bcarmenbcarmen
659420fa671Merge branch 'develop' into feature/SHRINE2020-683
bcarmenbcarmen
fd8ddd1a230Merge branch 'feature/SHRINE2020-649' into feature/SHRINE2020-683
bcarmenbcarmen
0aa5e8bed05Merge branch 'feature/SHRINE2020-648' into feature/SHRINE2020-649
Ben CarmenBen Carmen
5e20908f2fbMerge pull request #1085 in SHRINE/shrine from feature/SHRINE2020-648 to develop * commit '19907ccd2780ba801c7fb06c2...
dwalenddwalend
2b072996ab2Now getting the right results for the event order constraint for SHRINE2020-684
bcarmenbcarmen
39f70701ac9added, delete and update term props.
Marc-Danie NazaireMarc-Danie Nazaire
2b5b2af070cSHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date - A...
Marc-Danie NazaireMarc-Danie Nazaire
55a3a1b01b7SHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date - A...
bcarmenbcarmen
19907ccd278BA review changes
bcarmenbcarmen
b3335172843saving work
Marc-Danie NazaireMarc-Danie Nazaire
810c9412258SHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date - C...
Marc-Danie NazaireMarc-Danie Nazaire
7f7aa016bf5SHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date - C...
Marc-Danie NazaireMarc-Danie Nazaire
d1190d6af73SHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date - C...
dwalenddwalend
aad7c0165c1Renamed link to timelineLink for SHRINE2020-684
dwalenddwalend
55c8425aec9Tests for serializaing and deserializing BasicQuery with a Timeline for SHRINE2020-684
David WalendDavid Walend
6977c7178e9Merge pull request #1086 in SHRINE/shrine from bugfix/SHRINE2020-674 to develop * commit 'deed6f5fe4d268733d14d25ea9...
David WalendDavid Walend
a512caad6dcMerge pull request #1088 in SHRINE/shrine from feature/SHRINE2020-682 to develop * commit '9b7b6d9ce155d057413d505ab...
dwalenddwalend
d52622d6dfbGot query results from a timing constraint for SHRINE2020-684 by hardcoding the constraint in the QEP
bcarmenbcarmen
d00163754e9added UPDATE_QUERY_GROUP_TEMPORAL_CONCEPTS action
dwalenddwalend
e31a1be2b8aMoved translation of concept groups into expressions into ConceptGroup, and added interpretation of a timeline to Bas...
bcarmenbcarmen
7a82478cf3cMerge branch 'feature/SHRINE2020-649' into feature/SHRINE2020-683
bcarmenbcarmen
bdc4d644c4dMerge branch 'feature/SHRINE2020-648' into feature/SHRINE2020-649
bcarmenbcarmen
8899ff27083recommended BA review changes
bcarmenbcarmen
7215246ce4eChanged Inclusion to InclusionExclusion
dwalenddwalend
e9047a11893Factored the Trys out of the a method for SHRINE2020-684
bcarmenbcarmen
1e1baa354b2refactor of actions
dwalenddwalend
01bf0826201Moved a test to BasicQueryTest - to model for event order constraints for SHRINE2020-684
dwalenddwalend
9b7b6d9ce15Review comments from Marc-Danie for SHRINE2020-682
dwalenddwalend
83142310930Added tests of the link constraint for SHRIN
dwalenddwalend
60144eab3a0Added timeline field to BasicQuery for SHRINE2020-682
Marc-Danie NazaireMarc-Danie Nazaire
fb3c5fedcfcMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-205
bcarmenbcarmen
ffd08852d3afunctioning drag and drop and droppable
Marc-Danie NazaireMarc-Danie Nazaire
f4e0654d33aSHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date - M...
bcarmenbcarmen
6c0b2d5c2b8functioning drag and drop
bcarmenbcarmen
d67599d1f4fMerge branch 'feature/SHRINE2020-648' into feature/SHRINE2020-649
bcarmenbcarmen
f18d4d6272efix of style error
bcarmenbcarmen
7df93a3349eMerge branch 'feature/SHRINE2020-648' into feature/SHRINE2020-649
bcarmenbcarmen
22d41e8cb31Merge branch 'develop' into feature/SHRINE2020-648
dwalenddwalend
deed6f5fe4dMerge remote-tracking branch 'origin/develop' into bugfix/SHRINE2020-674
bcarmenbcarmen
d248384d976removed unused import
bcarmenbcarmen
a96a46e3e35Merge branch 'feature/SHRINE2020-648' into feature/SHRINE2020-649
dwalenddwalend
0425257daa6My review pass for SHRINE2020-674
dwalenddwalend
378c0b1a36dLast bit of cleanup for SHRINE2020-674
David WalendDavid Walend
3c1aff4d1beMerge pull request #1082 in SHRINE/shrine from bugfix/SHRINE2020-646 to develop * commit '34725c4bda1c35538ddf7a59a6...
bcarmenbcarmen
d0af32e91d2next round of BA review
dwalenddwalend
0b3e9c55904More cleanup putting SHRINE2020-674 back together again
bcarmenbcarmen
b91bac59e93Merge branch 'develop' into feature/SHRINE2020-648
dwalenddwalend
449831b9400Separated out running a query into more reasonable steps for SHRINE2020-674
dwalenddwalend
15ed0cb44eaMoving toward a sane IO model for SHRINE2020-674
dwalenddwalend
5ca4511417dNow getting the right error message, start of conversion to not use Try for SHRINE2020-674
Marc-Danie NazaireMarc-Danie Nazaire
c3a774982c9SHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date - R...
bcarmenbcarmen
f32f906ecccsaving disabled styles.
bcarmenbcarmen
44ed633b0b6feature is working
dwalenddwalend
c5869c6918eSeeing the unmapped terms again for SHRINE2020-674
dwalenddwalend
35a0543df6bNow seeing the stack trace flow for SHRINE2020-674
Marc-Danie NazaireMarc-Danie Nazaire
a4c9499926dSHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date - R...
Marc-Danie NazaireMarc-Danie Nazaire
06e51e6c885SHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date - I...
Marc-Danie NazaireMarc-Danie Nazaire
6cff67dd855SHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date - M...
bcarmenbcarmen
0bc6d0ec11eMerge branch 'feature/SHRINE2020-648' into feature/SHRINE2020-649
dwalenddwalend
5fb0a3e1aecOnly one thing gets to be named translate for SHRINE2020-674
dwalenddwalend
8a86065d082Wayfinding for SHRINE2020-674
David WalendDavid Walend
b7669c7602eMerge pull request #1084 in SHRINE/shrine from feature/SHRINE2020-672 to develop * commit '84108a972ce7bb7f2146d7ed1...
bcarmenbcarmen
ff4c9f2ce27refactored work
bcarmenbcarmen
db7945b6d81fixed unit tests
Marc-Danie NazaireMarc-Danie Nazaire
58a19a78cb9SHRINE2020-666 - Write JMeter scripts for SHRINE 2020
Marc-Danie NazaireMarc-Danie Nazaire
3f712117782SHRINE2020-666 - Write JMeter scripts for SHRINE 2020
bcarmenbcarmen
69478976292functioning event panel
dwalenddwalend
84108a972ceRemoved an unused field for SHRINE2020-672
dwalenddwalend
fb887452d06First round of refactoring for SHRINE2020-672
Next →