SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
Marc-Danie NazaireMarc-Danie Nazaire
4144d45231dsmall change
dwalenddwalend
ee9fddb6fc8merging with develop
dwalenddwalend
ee2483abc06Removing the bogus constraint for SHRINE2020-689
Marc-Danie NazaireMarc-Danie Nazaire
4d0a7d78ba4SHRINE2020-653- Allow a user to specify the relationship between the groups - renamed argument
Marc-Danie NazaireMarc-Danie Nazaire
2ee85734538SHRINE2020-653- Allow a user to specify the relationship between the groups - Added TimelineEventLink model
bcarmenbcarmen
2eb55a2212arename to timelineeventconcepts
bcarmenbcarmen
b95c45cee27working reducer for updating timeline event options
Marc-Danie NazaireMarc-Danie Nazaire
6f87dd4fa4fMerge pull request #1083 in SHRINE/shrine from feature/SHRINE2020-205 to develop * commit 'ebc89252d100bc3db717ea297...
Marc-Danie NazaireMarc-Danie Nazaire
ebc89252d10Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-205 # Co...
bcarmenbcarmen
be693b603d2added UPDATE_TIMELINE_EVENT_OPTIONS
bcarmenbcarmen
1e2e44a443erenamed updateGroupTerm to updateGroupTermOptions
bcarmenbcarmen
31548cdf531renamed attribute to options
bcarmenbcarmen
28dff841a10saving timelineeventoptions model
bcarmenbcarmen
90d3bb48b93Merge branch 'develop' into feature/SHRINE2020-683
bcarmenbcarmen
ce8d8f82ce0Merge branch 'feature/SHRINE2020-649' into develop
dwalenddwalend
d6ac9c4e401Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-689
David WalendDavid Walend
1fcd6f4464eMerge pull request #1089 in SHRINE/shrine from feature/SHRINE2020-684 to develop * commit '5f4416b23a9f1352a109163db...
dwalenddwalend
5c06f710783Added obfuscation off override.conf and wired up timeline to QueryNameTopicAndConcepts for SHRINE2020-689
dwalenddwalend
2dc2d7e2d16Refactoring and reworking of QueryNameTopicAndConcepts to get event order constraints in place for SHRINE2020-689
bcarmenbcarmen
8186ad7a429fixed failing unit test
bcarmenbcarmen
0c0d62fc7f3removed accidental import
bcarmenbcarmen
dbb319dacdarenamed components to Timeline
bcarmenbcarmen
2ad7d70673crefactor of reducers
bcarmenbcarmen
05595b3b9bcchanged the model TemporalConstraint to Timeline
dwalenddwalend
c5d676c7a7fGot some nice html for the text of a time constraint query for SHRINE2020-689
bcarmenbcarmen
a4a13980d66refactor
dwalenddwalend
9cd2b098a47Restored the string summary for queries with the new validation code path for SHRINE2020-689
Marc-Danie NazaireMarc-Danie Nazaire
bf11da5d9c8SHRINE2020-653- Allow a user to specify the relationship between the groups - added option to the any dropdown
bcarmenbcarmen
f7a12521f45Merge branch 'feature/SHRINE2020-649' into feature/SHRINE2020-683
bcarmenbcarmen
e8431ce3e33Merge branch 'develop' into feature/SHRINE2020-649
bcarmenbcarmen
3175263e27cfully functioning feature...fixed hasDuplicateConcepts method.
bcarmenbcarmen
22e38b19d8dfully functioning nested drag and drop
Marc-Danie NazaireMarc-Danie Nazaire
cd4547c5d9aSHRINE2020-653- Allow a user to specify the relationship between the groups - change text color to blue for the drop ...
bcarmenbcarmen
067bebaff3afixed isNull setting for isExcluded...should be false instead.
bcarmenbcarmen
a3ed0b47c0acan drag between groups and events, started work on making sure concepts move to event panel 1 when "when" is selected.
dwalenddwalend
5f4416b23a9Anupama says there's a bit more complexity to support in this first pass for SHRINE2020-684
dwalenddwalend
55b7bc2e8caCleanup for the end of SHRINE2020-684
dwalenddwalend
09df27829dbAdded a test for the query that works for SHINE2020-684
bcarmenbcarmen
2bafb9427f5Merge branch 'develop' into feature/SHRINE2020-683
bcarmenbcarmen
5b407bf4af0Merge branch 'feature/SHRINE2020-649' into feature/SHRINE2020-683
bcarmenbcarmen
7031d8976cbMerge branch 'feature/SHRINE2020-648' into feature/SHRINE2020-649
Ben CarmenBen Carmen
67d249e59b8Merge pull request #1085 in SHRINE/shrine from feature/SHRINE2020-648 to develop * commit '68aba0eb6e15968f3e3a6a4b6...
dwalenddwalend
e10315d4949Now getting the right results for the event order constraint for SHRINE2020-684
bcarmenbcarmen
50b0b314de2added, delete and update term props.
Marc-Danie NazaireMarc-Danie Nazaire
acd9ba4c19aSHRINE2020-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
8bf79fa0a33SHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date - A...
bcarmenbcarmen
68aba0eb6e1BA review changes
bcarmenbcarmen
58ce127c97esaving work
Marc-Danie NazaireMarc-Danie Nazaire
1776fdd237eSHRINE2020-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
c239e5dd188SHRINE2020-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
86328169713SHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date - C...
dwalenddwalend
c4c345767b0Renamed link to timelineLink for SHRINE2020-684
dwalenddwalend
be50acc3216Tests for serializaing and deserializing BasicQuery with a Timeline for SHRINE2020-684
David WalendDavid Walend
e296ff27f29Merge pull request #1086 in SHRINE/shrine from bugfix/SHRINE2020-674 to develop * commit '2ee48b549ff0ca52d50b49f116...
David WalendDavid Walend
474cfd6bed5Merge pull request #1088 in SHRINE/shrine from feature/SHRINE2020-682 to develop * commit 'ae86b14e09e8139cf719d730f...
dwalenddwalend
7f0a4be319eGot query results from a timing constraint for SHRINE2020-684 by hardcoding the constraint in the QEP
bcarmenbcarmen
b7392dcf18badded UPDATE_QUERY_GROUP_TEMPORAL_CONCEPTS action
dwalenddwalend
21b902833afMoved translation of concept groups into expressions into ConceptGroup, and added interpretation of a timeline to Bas...
bcarmenbcarmen
93cddec0604Merge branch 'feature/SHRINE2020-649' into feature/SHRINE2020-683
bcarmenbcarmen
eb9351309d1Merge branch 'feature/SHRINE2020-648' into feature/SHRINE2020-649
bcarmenbcarmen
06174d10e22recommended BA review changes
bcarmenbcarmen
c95ef4b6bb6Changed Inclusion to InclusionExclusion
dwalenddwalend
0ce16568aa5Factored the Trys out of the a method for SHRINE2020-684
bcarmenbcarmen
ef7ee45c280refactor of actions
dwalenddwalend
58fa2149ad4Moved a test to BasicQueryTest - to model for event order constraints for SHRINE2020-684
dwalenddwalend
ae86b14e09eReview comments from Marc-Danie for SHRINE2020-682
dwalenddwalend
7d9097e3f31Added tests of the link constraint for SHRIN
dwalenddwalend
03a400ddb79Added timeline field to BasicQuery for SHRINE2020-682
Marc-Danie NazaireMarc-Danie Nazaire
07036b42208Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-205
bcarmenbcarmen
52bd357f4cefunctioning drag and drop and droppable
Marc-Danie NazaireMarc-Danie Nazaire
6dd4b9579faSHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date - M...
bcarmenbcarmen
11bfa8276c9functioning drag and drop
bcarmenbcarmen
4237a0d63a2Merge branch 'feature/SHRINE2020-648' into feature/SHRINE2020-649
bcarmenbcarmen
8810fbf0c48fix of style error
bcarmenbcarmen
93d80fc507bMerge branch 'feature/SHRINE2020-648' into feature/SHRINE2020-649
bcarmenbcarmen
10454c59346Merge branch 'develop' into feature/SHRINE2020-648
dwalenddwalend
2ee48b549ffMerge remote-tracking branch 'origin/develop' into bugfix/SHRINE2020-674
bcarmenbcarmen
a6f907f441bremoved unused import
bcarmenbcarmen
00a31e38443Merge branch 'feature/SHRINE2020-648' into feature/SHRINE2020-649
dwalenddwalend
1906297a6deMy review pass for SHRINE2020-674
dwalenddwalend
c4ca9649f9bLast bit of cleanup for SHRINE2020-674
David WalendDavid Walend
35e82ea1d1aMerge pull request #1082 in SHRINE/shrine from bugfix/SHRINE2020-646 to develop * commit 'fa40be3624ffdc5b2e82c704d2...
bcarmenbcarmen
8f01ec00febnext round of BA review
dwalenddwalend
6f1b77ece6fMore cleanup putting SHRINE2020-674 back together again
bcarmenbcarmen
8d21ae364f6Merge branch 'develop' into feature/SHRINE2020-648
dwalenddwalend
8ab45753443Separated out running a query into more reasonable steps for SHRINE2020-674
dwalenddwalend
83c277df5efMoving toward a sane IO model for SHRINE2020-674
dwalenddwalend
8a128df7827Now getting the right error message, start of conversion to not use Try for SHRINE2020-674
Marc-Danie NazaireMarc-Danie Nazaire
ebbc627daa4SHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date - R...
bcarmenbcarmen
b39217d2629saving disabled styles.
bcarmenbcarmen
12f55373101feature is working
dwalenddwalend
a47b545b703Seeing the unmapped terms again for SHRINE2020-674
dwalenddwalend
f525fd3bad7Now seeing the stack trace flow for SHRINE2020-674
Marc-Danie NazaireMarc-Danie Nazaire
8f67f13c71eSHRINE2020-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
ce078aca4eeSHRINE2020-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
4a3961ff695SHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date - M...
bcarmenbcarmen
f2580f1da47Merge branch 'feature/SHRINE2020-648' into feature/SHRINE2020-649
dwalenddwalend
b6006fd45eeOnly one thing gets to be named translate for SHRINE2020-674
dwalenddwalend
06590041589Wayfinding for SHRINE2020-674
David WalendDavid Walend
951c4667868Merge pull request #1084 in SHRINE/shrine from feature/SHRINE2020-672 to develop * commit 'ff89b2b8e8b835890b52b2608...
bcarmenbcarmen
0e65f59da0erefactored work
bcarmenbcarmen
f8d4b9d1200fixed unit tests
Marc-Danie NazaireMarc-Danie Nazaire
75ec4fd2456SHRINE2020-666 - Write JMeter scripts for SHRINE 2020
Marc-Danie NazaireMarc-Danie Nazaire
5081a4d4f3fSHRINE2020-666 - Write JMeter scripts for SHRINE 2020
bcarmenbcarmen
589224be290functioning event panel
dwalenddwalend
ff89b2b8e8bRemoved an unused field for SHRINE2020-672
dwalenddwalend
640095ff9d8First round of refactoring for SHRINE2020-672
bcarmenbcarmen
7de6f773069refactor to allow for better reusability of smaller components
bcarmenbcarmen
82c022a35casaving functioning header
bcarmenbcarmen
861eb68782cadd status constant to query term group
dwalenddwalend
fa40be3624fAdded overrides to the test kit for SHRINE2020-646
Marc-Danie NazaireMarc-Danie Nazaire
b3364d1461aSHRINE2020-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
94bed10074eSHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date - F...
Marc-Danie NazaireMarc-Danie Nazaire
51f8a2d3832SHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date - F...
Marc-Danie NazaireMarc-Danie Nazaire
d1adde86a76Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-205
Marc-Danie NazaireMarc-Danie Nazaire
1c561c007f5SHRINE2020-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
7055cd2d3a1SHRINE2020-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
1d2362b557eSHRINE2020-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
1ab6a3a7841SHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date -
dwalenddwalend
57fe797c321Removed an unused methdo for SHRINE2020-646
dwalenddwalend
6d401960beaMerge remote-tracking branch 'origin/develop' into bugfix/SHRINE2020-646
dwalenddwalend
c34a7cdfdefUnit test for OverdueResultsPoller for SHRINE2020-626
bcarmenbcarmen
eb10cce1774Merge branch 'feature/SHRINE2020-581' into develop
Ben CarmenBen Carmen
2bcb0052098Merge pull request #1077 in SHRINE/shrine from bugfix/SHRINE2020-590 to develop * commit '0db61c1f1c2f1c8da4039334c5...
dwalenddwalend
8595636651bMerge remote-tracking branch 'origin/develop' into bugfix/SHRINE2020-626
Marc-Danie NazaireMarc-Danie Nazaire
b4dc1e723a9Merge pull request #1079 in SHRINE/shrine from bugfix/SHRINE2020-595 to develop * commit '8e891c9844575815651e39c330...
dwalenddwalend
573179f1c11Merge branch 'develop' into bugfix/SHRINE2020-626
dwalenddwalend
9e3d9c2a717Added some logging so I can see it work on shrine dev for SHRINE2020-626
dwalenddwalend
7190c02a938Update the overdue queries in batches
bcarmenbcarmen
1295ab3e93eMerge branch 'feature/SHRINE2020-580' into feature/SHRINE2020-581
bcarmenbcarmen
7d0c4d4c36aMerge branch 'develop' into feature/SHRINE2020-580
bcarmenbcarmen
3449c543050change per code review
Marc-Danie NazaireMarc-Danie Nazaire
b83c67702f8SHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date - F...
David WalendDavid Walend
32f010cf8a1Merge pull request #1080 in SHRINE/shrine from bugfix/SHRINE2020-314 to develop * commit '4764161eb96a94ac455cb57341...
elizahelizah
e790a09eb14use sagas
bcarmenbcarmen
b0c607722c0Merge branch 'feature/SHRINE2020-580' into feature/SHRINE2020-581
elizahelizah
f47ede8a160use simple link
elizahelizah
5db291491b5add api stub
elizahelizah
93cb8604b05condense forceExpand and forceClose
bcarmenbcarmen
44d1213ce95fixed enabling disabling submit button
bcarmenbcarmen
d04ddf3187fmoved containsDemographic to queryTermGroup model so that it can determine if submit button is disabled
elizahelizah
6ab9bff2146rm force open/close
elizahelizah
a0831d23067seperate DisableRangeOccurrenceHelpTooltip
dwalenddwalend
4764161eb96Put in the correct value for endDate for SHRINE2020-314
elizahelizah
65997b1b120Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-580
David WalendDavid Walend
56b1e711e69Merge pull request #1076 in SHRINE/shrine from feature/SHRINE2020-552 to develop Got the OK from Bill * commit '33f...
Marc-Danie NazaireMarc-Danie Nazaire
8e891c98445SHRINE2020-595 - Sorting node names is broken in 3.1 (but fine in 3.0)
David WalendDavid Walend
b76e16f896dMerge pull request #1075 in SHRINE/shrine from bugfix/SHRINE2020-626 to develop * commit 'e7d25239010f6da2d6ab64437f...
bcarmenbcarmen
0db61c1f1c2Potential solution for reloading a query and also resetting the Query Definition when the tutorial completes.
dwalenddwalend
33f529313f9Need these compile settings for shrine 2.12
dwalenddwalend
ab37711fdfcMore notes on upgrading http4s as part of SHRINE2020-552
dwalenddwalend
57e451e6d5eUpdating tickets for SHRINE2020-552 before a last round of tests
dwalenddwalend
c50e1ee25a6SHRINE2020-552 also fixes SHRINE2020-558
dwalenddwalend
b18457e797cWalking back the lucene upgrade in SHRINE2020-552. It's big enough to rate its own ticket
elizahelizah
1fa45bff0e9force close aft reset:
elizahelizah
4f241bfb67brm reset when demo removed
elizahelizah
d85fecc182aMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-580
dwalenddwalend
fe17d284f52Updated lucene, scopt, and assembly plugins for SHRINE2020-552
dwalenddwalend
9a35ea37be2Updated circe, twirl, and exec-maven-plugin for SHRINE2020-552
dwalenddwalend
5dc39eba1aeUpdated easymock, opencsv, and slick for SHRINE2020-552
dwalenddwalend
0fcac906790Updated typesafe config and h2 for SHRINE2020-552
dwalenddwalend
34cdca3a171Upgraded xml and junit for SHRINE2020-552
dwalenddwalend
1ae49d13972Upgraded to scala 2.12.12 for SHRINE2020-552
dwalenddwalend
e7d25239010Stray todo in SHRINE2020-626
dwalenddwalend
161f95e5a84Got a nice error result to propagate accross the network if the auditDB can't record that a query has arrived for SHR...
dwalenddwalend
82c736867dba little cleanup after testing SHRINE2020-626
dwalenddwalend
27d532c782aHopefully the fix for SHRINE2020-626
dwalenddwalend
8847ba50a01Planning for SHRINE202-626 - better error handling for the AdapterDB
Eliza HuangEliza Huang
46c1fa0f6b2Merge pull request #1052 in SHRINE/shrine from feature/SHRINE2020-507 to develop * commit '6a20630b8ecb9cbebd7b51336...
elizahelizah
6a20630b8ecfix snap
David WalendDavid Walend
4a0a75add21Merge pull request #1073 in SHRINE/shrine from bugfix/SHRINE2020-538-bad-config-value-did-not-result to develop * co...
Eliza HuangEliza Huang
36424883bd5Merge pull request #1039 in SHRINE/shrine from feature/SHRINE2020-508 to develop * commit '4105a4899f4122747face788f...
elizahelizah
4105a4899f4to info
elizahelizah
d8149a4adf3change level
elizahelizah
590b2771536merge develop
David WalendDavid Walend
e318cd10173Merge pull request #1074 in SHRINE/shrine from bugfix/SHRINE2020-625 to develop * commit '565e919feec4e4c29ca7248c43...
dwalenddwalend
565e919feecA bit cleaner formatting than the IDE gave me for SHRINE2020-625
dwalenddwalend
9c2d6d8f712Found the most evil white space puzzler of the release in SHRINE2020-625
David WalendDavid Walend
08b76577297Merge pull request #1071 in SHRINE/shrine from feature/SHRINE2020-513 to develop * commit '3ace84865bb119869bdbad93b...
dwalenddwalend
eba20ec3dc7Test that we get a good error message for a bad URI from config for SHRINE2020-538
Eliza HuangEliza Huang
36f9593ccd8Merge pull request #1040 in SHRINE/shrine from feature/SHRINE2020-516 to develop * commit '458299db2fd6845024d837b5c...
elizahelizah
a778dbffd2drm outdated break down
elizahelizah
0926c1f074emove to index
elizahelizah
18f36beb1e5fix merge conflict
elizahelizah
8a4aa117888Merge branch 'devet push origin HEAD 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feat...
David WalendDavid Walend
4b9f50bcdcfMerge pull request #1069 in SHRINE/shrine from feature/SHRINE2020-515 to develop * commit 'e3d2863835e012226c42a3429...
elizahelizah
5fdcf8b8529merge dev
elizahelizah
458299db2fdMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-516
Next →