SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
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
bcarmenbcarmen
3d29fdad239refactor to allow for better reusability of smaller components
bcarmenbcarmen
fcbd3c56291saving functioning header
bcarmenbcarmen
4d40c21455badd status constant to query term group
dwalenddwalend
34725c4bda1Added overrides to the test kit for SHRINE2020-646
Marc-Danie NazaireMarc-Danie Nazaire
c4f8f6478b1SHRINE2020-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
58aa0a13cf9SHRINE2020-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
6d5bb27183fSHRINE2020-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
ded88160cc1Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-205
Marc-Danie NazaireMarc-Danie Nazaire
67d522e8604SHRINE2020-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
7ccfb6c7780SHRINE2020-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
38955456edbSHRINE2020-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
730b9ad7e41SHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date -
dwalenddwalend
88e4059a130Removed an unused methdo for SHRINE2020-646
dwalenddwalend
05b2f853ca8Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE2020-646
dwalenddwalend
106fe18f5e5Unit test for OverdueResultsPoller for SHRINE2020-626
bcarmenbcarmen
8242f2304e8Merge branch 'feature/SHRINE2020-581' into develop
Ben CarmenBen Carmen
7c00b8090f6Merge pull request #1077 in SHRINE/shrine from bugfix/SHRINE2020-590 to develop * commit '8da1d97bee6adfc98cdbd9a532...
dwalenddwalend
dcfc1ec86f4Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE2020-626
Marc-Danie NazaireMarc-Danie Nazaire
fd6b1851d92Merge pull request #1079 in SHRINE/shrine from bugfix/SHRINE2020-595 to develop * commit '92e196a775f8c70495fa784d9d...
dwalenddwalend
7dfb23f4d52Merge branch 'develop' into bugfix/SHRINE2020-626
dwalenddwalend
cf2e6dbbde5Added some logging so I can see it work on shrine dev for SHRINE2020-626
dwalenddwalend
c753d48082aUpdate the overdue queries in batches
bcarmenbcarmen
daaa899b966Merge branch 'feature/SHRINE2020-580' into feature/SHRINE2020-581
bcarmenbcarmen
d047129ee83Merge branch 'develop' into feature/SHRINE2020-580
bcarmenbcarmen
e7b27519b89change per code review
Marc-Danie NazaireMarc-Danie Nazaire
14966e8600fSHRINE2020-205 - Make the API call and server side work to generate the CSV based on the currently available date - F...
David WalendDavid Walend
210cb920619Merge pull request #1080 in SHRINE/shrine from bugfix/SHRINE2020-314 to develop * commit 'b21065d2e1217deb92684fe7a3...
elizahelizah
66bdd79dca2use sagas
bcarmenbcarmen
550d8fdb6eaMerge branch 'feature/SHRINE2020-580' into feature/SHRINE2020-581
elizahelizah
3d5683fe153use simple link
elizahelizah
1af575d3ba0add api stub
elizahelizah
6d3addfa133condense forceExpand and forceClose
bcarmenbcarmen
b32fcbcb437fixed enabling disabling submit button
bcarmenbcarmen
3d3cd7fb0c3moved containsDemographic to queryTermGroup model so that it can determine if submit button is disabled
elizahelizah
1b864474026rm force open/close
elizahelizah
b7c6abbc9bfseperate DisableRangeOccurrenceHelpTooltip
dwalenddwalend
b21065d2e12Put in the correct value for endDate for SHRINE2020-314
elizahelizah
7f948733ba5Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-580
David WalendDavid Walend
31bd70a9a51Merge pull request #1076 in SHRINE/shrine from feature/SHRINE2020-552 to develop Got the OK from Bill * commit 'e4c...
Marc-Danie NazaireMarc-Danie Nazaire
92e196a775fSHRINE2020-595 - Sorting node names is broken in 3.1 (but fine in 3.0)
David WalendDavid Walend
9b05fa1cb99Merge pull request #1075 in SHRINE/shrine from bugfix/SHRINE2020-626 to develop * commit '1c0db65f8ffa1dc08bd77571f9...
bcarmenbcarmen
8da1d97bee6Potential solution for reloading a query and also resetting the Query Definition when the tutorial completes.
dwalenddwalend
e4c78cfedffNeed these compile settings for shrine 2.12
dwalenddwalend
26e0fa95314More notes on upgrading http4s as part of SHRINE2020-552
dwalenddwalend
e2b2f63594cUpdating tickets for SHRINE2020-552 before a last round of tests
dwalenddwalend
3163dccf077SHRINE2020-552 also fixes SHRINE2020-558
dwalenddwalend
d69c792f450Walking back the lucene upgrade in SHRINE2020-552. It's big enough to rate its own ticket
elizahelizah
494bb3e2021force close aft reset:
elizahelizah
06d1c0267f9rm reset when demo removed
elizahelizah
3b00b5c8a2dMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-580
dwalenddwalend
f692424207cUpdated lucene, scopt, and assembly plugins for SHRINE2020-552
dwalenddwalend
60662c70cd9Updated circe, twirl, and exec-maven-plugin for SHRINE2020-552
dwalenddwalend
84b864d7bd2Updated easymock, opencsv, and slick for SHRINE2020-552
dwalenddwalend
e7aea0274a0Updated typesafe config and h2 for SHRINE2020-552
dwalenddwalend
e9d7ea723e2Upgraded xml and junit for SHRINE2020-552
dwalenddwalend
d89c23e77caUpgraded to scala 2.12.12 for SHRINE2020-552
dwalenddwalend
1c0db65f8ffStray todo in SHRINE2020-626
dwalenddwalend
78c0e80ed72Got a nice error result to propagate accross the network if the auditDB can't record that a query has arrived for SHR...
dwalenddwalend
ae7d35a85eea little cleanup after testing SHRINE2020-626
dwalenddwalend
66f93c7524eHopefully the fix for SHRINE2020-626
dwalenddwalend
a5bdad8cc0bPlanning for SHRINE202-626 - better error handling for the AdapterDB
Eliza HuangEliza Huang
7310da30b4cMerge pull request #1052 in SHRINE/shrine from feature/SHRINE2020-507 to develop * commit 'e2c9d2924a301d64911c2453e...
elizahelizah
e2c9d2924a3fix snap
David WalendDavid Walend
a8e108e207dMerge pull request #1073 in SHRINE/shrine from bugfix/SHRINE2020-538-bad-config-value-did-not-result to develop * co...
Eliza HuangEliza Huang
090d9c951b5Merge pull request #1039 in SHRINE/shrine from feature/SHRINE2020-508 to develop * commit 'e661a6280612e269bf33eda75...
elizahelizah
e661a628061to info
elizahelizah
651d8a99285change level
elizahelizah
f03c34c3d31merge develop
David WalendDavid Walend
83e2e51b3a0Merge pull request #1074 in SHRINE/shrine from bugfix/SHRINE2020-625 to develop * commit 'e35af59af96d0cc88a17fa8614...
dwalenddwalend
e35af59af96A bit cleaner formatting than the IDE gave me for SHRINE2020-625
dwalenddwalend
2256e0524dfFound the most evil white space puzzler of the release in SHRINE2020-625
David WalendDavid Walend
f2ebe0c4961Merge pull request #1071 in SHRINE/shrine from feature/SHRINE2020-513 to develop * commit 'f00f9e6af4954aedc61d01c8c...
dwalenddwalend
c168caf797dTest that we get a good error message for a bad URI from config for SHRINE2020-538
Eliza HuangEliza Huang
483abb3e6caMerge pull request #1040 in SHRINE/shrine from feature/SHRINE2020-516 to develop * commit '4beb8745a8ece67925e4c461b...
elizahelizah
a7360f169d4rm outdated break down
elizahelizah
e6f2996f29dmove to index
elizahelizah
67566ba5043fix merge conflict
elizahelizah
f502fb657a5Merge branch 'devet push origin HEAD 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feat...
David WalendDavid Walend
05c4f0b358eMerge pull request #1069 in SHRINE/shrine from feature/SHRINE2020-515 to develop * commit 'ea96d11ac42d74e2b1262fdcd...
elizahelizah
c4145e64008merge dev
elizahelizah
4beb8745a8eMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-516
elizahelizah
1aae4a3228dMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-508
Eliza HuangEliza Huang
d43c39ed6b1Merge pull request #1050 in SHRINE/shrine from feature/SHRINE2020-510 to develop * commit '2847ccc28d539ca301e398a53...
Marc-Danie NazaireMarc-Danie Nazaire
03c3a490726SHRINE2020-590 - Edit criteria functionality is not working
Marc-Danie NazaireMarc-Danie Nazaire
190c2092c96Merge pull request #1064 in SHRINE/shrine from bugfix/SHRINE2020-599 to develop * commit '9274ef867cbc37c45f014615f8...
dwalenddwalend
ea96d11ac42Marc-Danie found some squeryl code that crept back into SHRINE2020-515
dwalenddwalend
4ca1fa5b88fMerging
David WalendDavid Walend
0c54bcbc997Merge pull request #1067 in SHRINE/shrine from feature/SHRINE2020-570 to develop * commit '759a23738163f749f071e601e...
elizahelizah
3807e42fa78cleanup
elizahelizah
981d8792387force expand on demographic
elizahelizah
7021f182e2bMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-580
dwalenddwalend
759a2373816Rename from code review of SHRINE2020-570
dwalenddwalend
8ea291edb11Merge branch 'develop' into feature/SHRINE2020-570
dwalenddwalend
7116d25615cmerging develop
Bill SimonsBill Simons
2c65e6831d8Merge pull request #1066 in SHRINE/shrine from bugfix/SHRINE2020-614 to develop * commit '1c80cfe3672e227c9be64ebbbd...
dwalenddwalend
a48b412aec5Marc-Danie review comments for SHRINE2020-515
dwalenddwalend
f00f9e6af49Added ability to test that 500 errors produce logs when they come from inside our servlet for SHRINE2020-513
Bill SimonsBill Simons
1c80cfe3672rename index to keep consistent suffix
Marc-Danie NazaireMarc-Danie Nazaire
1565961fc10Merge pull request #1065 in SHRINE/shrine from feature/SHRINE2020-506 to develop * commit '96730094b596be9dae62855a9...
Next →