SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
dwalenddwalend
9232ec77554Bill's review comments and a jmeter update for SHRINE2020-1362
Marc-Danie NazaireMarc-Danie Nazaire
d83f4d5e37aSHRINE2020-1357-Allow user to select "advanced options" for breakdowns - fixed api call to call data distribution types
Bill SimonsBill Simons
34a8f25000dClean up README
Marc-Danie NazaireMarc-Danie Nazaire
4e16af97eafSHRINE2020-1357-Allow user to select "advanced options" for breakdowns - updated front-end snapshot
Marc-Danie NazaireMarc-Danie Nazaire
a10718879d2SHRINE2020-1357-Allow user to select "advanced options" for breakdowns
Marc-Danie NazaireMarc-Danie Nazaire
eda286febb1SHRINE2020-1364 - Create api call to get the breakdown output types - Added check only parse valid data distribution ...
Marc-Danie NazaireMarc-Danie Nazaire
9961d12d863SHRINE2020-1364 - Create api call to get the breakdown output types - Modified unit test to read expected json from file
Marc-Danie NazaireMarc-Danie Nazaire
a80412788d4SHRINE2020-1364 - Create api call to get the breakdown output types - Added unit test
Bill SimonsBill Simons
a8f8e01d5a9Convert docker dev env to legacy MOM
dwalenddwalend
eff3a432f2fAdded optional item version field to UpdateQueryAtAdapter for SHRINE2020-1366
dwalenddwalend
9148a14bc57Added expectedVersion field to UpdateQueryAtQep commands for SHRINE2020-1366
Xavier HaurieXavier Haurie
808ab01ea5ctemporary push so Dave can have a look
dwalenddwalend
62e8001aff5merging PR changes to the Query class
Marc-Danie NazaireMarc-Danie Nazaire
b0597a02a69SHRINE2020-1364 - Create api call to get the breakdown output types
dwalenddwalend
4c2adb75093Now using the right list of breakdown names for SHRINE2020-1373
dwalenddwalend
a6b90e6950fRemoved unused output fields in json read tests for SHRINE2020-1373
dwalenddwalend
441c66b37bcRemoved the output enum for SHRINE2020-1373
dwalenddwalend
8812795ce7aGetting all the breakdowns in to match current behavior for SHRINE2020-1373
dwalenddwalend
3f152663a9eAdded a list of breakdown names for SHRINE2020-1373
dwalenddwalend
919456b311dMy review pass of SHRINE2020-1362
Marc-Danie NazaireMarc-Danie Nazaire
12b3cf6db39Merge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feat...
Marc-Danie NazaireMarc-Danie Nazaire
1f8ee6c3223Pull request #1374: Bugfix/SHRINE2020 1363 get docker working Merge in SHRINE/shrine from bugfix/SHRINE2020-1363-get...
Marc-Danie NazaireMarc-Danie Nazaire
ee082f76d95SHRINE2020-1363-Get docker working - Cleaned out some kafka and sso related items
dwalenddwalend
bd7605f95d3More renaming of QUEUED query methods and some future tickets for SHRINE2020-1362
dwalenddwalend
9eff10a61b0Renamed to emphasize that the old messages are for QUEUED query updates only for SHRINE2020-1362
dwalenddwalend
8f3e8dbee49Used the new UpdateResult messages in the adapter's not-queued query handling for SHRINE2020-1362
dwalenddwalend
0e27d9a7271Now able to receive and process the UpdateResult messsages for SHRINE2020-1362
dwalenddwalend
43ca49e1966Update with results and try to unwind itemVersion conflicts - now in the hub db for SHRINE2020-1362
Marc-Danie NazaireMarc-Danie Nazaire
4c5b233bbf8SHRINE2020-1364 - Create api call to get the breakdown output types - changed TYPE column from enum to varchar in QUE...
Marc-Danie NazaireMarc-Danie Nazaire
0970bb8d588Merge branch 'bugfix/SHRINE2020-1363-get-docker-working' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine...
Marc-Danie NazaireMarc-Danie Nazaire
211985edf6dSHRINE2020-1363-Get docker working - Removed references to kafka
dwalenddwalend
75610476e2amerging
dwalenddwalend
12270d60bceFirst pass of the new result updates for SHRINE2020-1362
Marc-Danie NazaireMarc-Danie Nazaire
b1215045db0SHRINE2020-1363-Get docker working - Fixed duplicate caused by merge
Xavier HaurieXavier Haurie
b75d8af6350Merge branch 'feature/SHRINE2020-1262' into feature/SHRINE2020-1263
Marc-Danie NazaireMarc-Danie Nazaire
4ba417a22afMerge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugf...
Marc-Danie NazaireMarc-Danie Nazaire
74f2d6c1ef0Revert new changes for breakdowns
David WalendDavid Walend
0d025f45372Pull request #1372: Feature/SHRINE2020 1360 Merge in SHRINE/shrine from feature/SHRINE2020-1360 to develop * commit...
Marc-Danie NazaireMarc-Danie Nazaire
20f527a9d6bMerge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugf...
Marc-Danie NazaireMarc-Danie Nazaire
8c25e8e8f3eRevert new changes for breakdowns
Marc-Danie NazaireMarc-Danie Nazaire
f60d59bc651Merge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugf...
Marc-Danie NazaireMarc-Danie Nazaire
c09bf2a0162Cleared out database update scripts
Marc-Danie NazaireMarc-Danie Nazaire
031c51c4725Fixed POM versions
Marc-Danie NazaireMarc-Danie Nazaire
9254eae8869Merge branch 'feature/Custom_Breakdowns_3_3_0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugf...
Marc-Danie NazaireMarc-Danie Nazaire
4218118e959Fixed POM versions
dwalenddwalend
b355aab84a2Added UpdateResult to actually carry Results for SHRINE2020-1362
dwalenddwalend
4171ec27d89Moved some json test files for SHRINE2020-1362
dwalenddwalend
aaf066e4d3bRenamed existin result updates to BestEffort before creating full-state for SHRINE2020-1362
dwalenddwalend
01b8ed45f25Revert "Added a predicted item version for result updates for SHRINE2020-1362" This reverts commit 2df1f911684d5fc83...
dwalenddwalend
2b9cd1f682aRevert "Added an optional result id to messages about results for SHRINE2020-1362" This reverts commit 96c285d5f353f...
dwalenddwalend
1c4260005ecRevert "Added predictedItemVersion fields to messages about Queries for SHRINE2020-1362" This reverts commit ff5aa77...
Marc-Danie NazaireMarc-Danie Nazaire
9433e0fc7d7SHRINE2020-1364 - Create api call to get the breakdown output types - changed TYPE column from enum to varchar in QUE...
Marc-Danie NazaireMarc-Danie Nazaire
98a3a7a074eSHRINE2020-1363-Get docker working - Cleanup base POM
Marc-Danie NazaireMarc-Danie Nazaire
e967cb1e4f9SHRINE2020-1363-Get docker working - Updated to java 17
Marc-Danie NazaireMarc-Danie Nazaire
132b757889dSHRINE2020-1363-Get docker working - removed docker from base POM
Marc-Danie NazaireMarc-Danie Nazaire
58804e35b2aSHRINE2020-1363-Get docker working
Xavier HaurieXavier Haurie
ece1a0d0fdbfix the spacing between the elements of the timeline links definition UI
Xavier HaurieXavier Haurie
ed67cb4089cmerge SHRINE2020-1262 into SHRINE2020-1263; fix some test failures; change names in f/e from **aggregateOperator** to...
dwalenddwalend
ff5aa77a6ccAdded predictedItemVersion fields to messages about Queries for SHRINE2020-1362
Xavier HaurieXavier Haurie
226c7f8eb77fix spacing of elements in timeline link as per BA review - SHRINE2020-1262
dwalenddwalend
96c285d5f35Added an optional result id to messages about results for SHRINE2020-1362
dwalenddwalend
2df1f911684Added a predicted item version for result updates for SHRINE2020-1362
dwalenddwalend
1665c091149Comment in wrong file for SHRINE2020-1360
Xavier HaurieXavier Haurie
3acff4ac302merge develop, with conflicts
Xavier HaurieXavier Haurie
7f61df45535rename fromStartOrEnd to boundary
Xavier HaurieXavier Haurie
832b6c6d55amerge develop, with conflicts
Xavier HaurieXavier Haurie
674859bc3cdrename "startOrEnd" to "boundary"
David WalendDavid Walend
e2203220561Pull request #1368: Feature/SHRINE2020 1352 Merge in SHRINE/shrine from feature/SHRINE2020-1352 to develop * commit...
Xavier HaurieXavier Haurie
ebf49e3e911rename aggregateOperator* to eventAnchor*
Xavier HaurieXavier Haurie
32f6193cca4rename fromStartOrEnd to boundary
Xavier HaurieXavier Haurie
56cbad26366rename fromStartOrEnd to boundary
Xavier HaurieXavier Haurie
fdf4dfeff95Merge branch 'feature/SHRINE2020-1262' into feature/SHRINE2020-1263
Xavier HaurieXavier Haurie
f4bf7b453c4Merge branch 'develop' into feature/SHRINE2020-1262
David WalendDavid Walend
0ff0b5fe071Pull request #1365: Feature/SHRINE2020 1350 Merge in SHRINE/shrine from feature/SHRINE2020-1350 to develop * commit...
Xavier HaurieXavier Haurie
3aed61581ddminor clean-up
Xavier HaurieXavier Haurie
39cd0121fd0merge 1262 (and hence recent changes to 1350) with conflicts
Xavier HaurieXavier Haurie
2d99cb6073fresolve merge conflicts (merging 1350 into 1262)
dwalenddwalend
e54c7382c57Cleanup for SHRINE2020-1360
Xavier HaurieXavier Haurie
8e3260be725add "Last" option to Event Anchor drop-down and b/e
dwalenddwalend
e0c5db99597Rename and new json encoder for query and result states for SHRINE2020-1360
dwalenddwalend
57264a77574Big move before redefining the json for SHRINE2020-1360
dwalenddwalend
0d601a9b334Last easy case object update I see for SHRINE2020-1360
dwalenddwalend
5be0593fff8Merged
dwalenddwalend
104424d5c9aAnupama's words for SHRINE2020-1352
dwalenddwalend
d305798ca74Merging
dwalenddwalend
cc0b6507004Renamed BookEnd to EventBoundary for SHRINE2020-1350
dwalenddwalend
b997b720589A first pass of SHRINE2020-1360 - better json for case objects
Xavier HaurieXavier Haurie
7d59336260eMerge branch 'feature/SHRINE2020-1350' into feature/SHRINE2020-1262
dwalenddwalend
febbb977a30Merge branch 'feature/SHRINE2020-1350' into feature/SHRINE2020-1352
dwalenddwalend
8fcfe3666cfMerge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1350
dwalenddwalend
82e7a48edfdMix of library dependencies was not playing nice with case objects for SHRINE2020-1350
David WalendDavid Walend
fa832150ed1Pull request #1369: Updated the help link and wiki page for SHRINE 4.2 for SHRINE2020-1346 Merge in SHRINE/shrine fr...
Xavier HaurieXavier Haurie
e55a7ce652badd unit test for time link with book ends
Xavier HaurieXavier Haurie
d8525cf31a7Merge 1350 into this branch; correct query sent to b/e, but b/e times out
Xavier HaurieXavier Haurie
1cb3946e022Modify the query data structure sent by the f/e to the b/e, which fixes the communication bug between the two
Xavier HaurieXavier Haurie
30cecd9fa95take a step back to make the f/e work, without fromStartOrEnd object. Breaks the b/e because of that change.
Xavier HaurieXavier Haurie
3ed9bcb61d7add BookEnd instance as a member of EventConstraint; make bookends non-Optional; update unit tests to handle book-ends,
dwalenddwalend
22008147fe8Nicer json for the new field for SHRINE2020-1352
dwalenddwalend
d81e9a0e8a3merging
dwalenddwalend
9ddc9932607Found a very clean way to have case objects in the protocol for BookEnds for SHRINE2020-1350
dwalenddwalend
d77f9473319Updated the help link and wiki page for SHRINE 4.2 for SHRINE2020-1346
Xavier HaurieXavier Haurie
0bd2251caadclean up js code
dwalenddwalend
8949afc3669Getting things lined up just right with the bookend branch for SHRINE2020-1352
dwalenddwalend
447554ddb1bmerging
Xavier HaurieXavier Haurie
10344188c1eMerge branch 'feature/SHRINE2020-1350' into feature/SHRINE2020-1262
dwalenddwalend
71ebddfaf80Needs an example for the javascript end SHRINE2020-1350
Ansible DeployAnsible Deploy
bdbb15a0e4fMerge release branch release/4.1.0 into master.
Ansible DeployAnsible Deploy
e21ee7bb314Update POMs with release version 4.1.0.
dwalenddwalend
5bc049cd170I think I've got a full pass for SHRINE2020-1352 caveat a good name for this feature
Xavier HaurieXavier Haurie
e00f92e36b3made new drop-downs stateful
dwalenddwalend
590c2882ad4Missed an import for SHRINE2020-1352
dwalenddwalend
393f9ca3efbPlanned work for SHRINE2020-1352
dwalenddwalend
8bd692323a6Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1350
dwalenddwalend
ff461cbc6bbMerge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1352
David WalendDavid Walend
d0fa05f5ed2Pull request #1366: Feature/SHRINE2020 1353 Merge in SHRINE/shrine from feature/SHRINE2020-1353 to develop * commit...
Xavier HaurieXavier Haurie
a4e84fd5e06very first cut at the UI
Xavier HaurieXavier Haurie
b96025fee46add instructions for pushing front-end and back-end code to a local docker instance
dwalenddwalend
78b85a5b9dbOne last easy upgrade and a sad note about circe for SHRINE2020-1353
dwalenddwalend
7d1f187564aMore easy library upgrades for SHRINE2020-1353
dwalenddwalend
b766f8427b7Updated maven parts for SHRINE2020-1353
Xavier HaurieXavier Haurie
da07521426fMerge remote-tracking branch 'origin/develop' into develop
Xavier HaurieXavier Haurie
9af24577f08modifications/fixes to README.md for docker
dwalenddwalend
3f9291523ccCleaned out some yellow flags for SHRINE2020-1350
dwalenddwalend
59e77c9ebeeMarking future work in SHRINE2020-1350
dwalenddwalend
d8f98863ec3Fixed some tests for SHRINE2020-1350
dwalenddwalend
20d15994485Intermediate check of SHRINE2020-1350
David WalendDavid Walend
0d8f7464e9fPull request #1364: More updates to jmeter tests for SHRINE2020-1148 Merge in SHRINE/shrine from SHRINE2020-1148-mor...
dwalenddwalend
383d06bd6dfNotes for how to fix SHRINE2020-1305
dwalenddwalend
324258e179eMerging
dwalenddwalend
763a6365e5fMerging
dwalenddwalend
229385a263aMore updates to jmeter tests for SHRINE2020-1148
dwalenddwalend
c3f797c4892Roll back the RC business in the pom.xml
dwalenddwalend
c4b67f1c581Move develop to shrine 4.2.0
dwalenddwalend
df03d729a9aStart the 4.1.0 release branch with RC1
dwalenddwalend
5621992c85eCleanup of found files for SHRINE2020-1334
dwalenddwalend
7bdfa51d374Initial state of shrine-dev config files for SHRINE2020-1334
David WalendDavid Walend
b5d17ec3b5dPull request #1363: For Kafka - queueusIO should only return the queues used by this shrine networks, not all the que...
David WalendDavid Walend
a975cc1f780Pull request #1362: Feature/SHRINE2020 988 Merge in SHRINE/shrine from feature/SHRINE2020-988 to develop * commit '...
dwalenddwalend
b7020ddfa84For Kafka - queueusIO should only return the queues used by this shrine networks, not all the queues in Kafka SHRINE2...
dwalenddwalend
aec11385c7eBetter logging for picking a MOM system for SHRINE2020-988
Xavier HaurieXavier Haurie
3c976f36a6aset revision back to 4.1.0 in top-level POM file
Xavier HaurieXavier Haurie
7d6461db235Merge branch 'develop' into sso-phase2
dwalenddwalend
f4ba50c5b25Adding the jmeter files used for SHRINE2020-988
dwalenddwalend
33f17e6284fClearing an out-dated error in the log found during SHRINE2020-988
dwalenddwalend
967d0969017merging
Xavier HaurieXavier Haurie
cc32bfcf468remove commented-out setting in sample Tomcat config file
Xavier HaurieXavier Haurie
fdcec03ad05Revert "Revert "remove stale @param's and @throws's from AuthorizationFilter; remove unused maven-compiler-plugin and...
Xavier HaurieXavier Haurie
2bc3be26389Revert "remove stale @param's and @throws's from AuthorizationFilter; remove unused maven-compiler-plugin and junit d...
Xavier HaurieXavier Haurie
f44d8a0b8a9remove stale @param's and @throws's from AuthorizationFilter; remove unused maven-compiler-plugin and junit dependency
Xavier HaurieXavier Haurie
d8640ce3c70PR feedback : create more tickets for postponed work and include their # + summary in the code; more comments
Carl WoolfCarl Woolf
b6b96d27fd7reduce free-standing vals
Carl WoolfCarl Woolf
c64f5330770more compact biz-logic in Filter
Xavier HaurieXavier Haurie
2cfb5b62199remove shrineSP as a config source; add JIRA ticket numbers where changes have been postponed; remove back quotes fro...
Xavier HaurieXavier Haurie
7aa6bf80a0cadd sample config for RegexAuthorizer
Xavier HaurieXavier Haurie
d8129449134add sample config for RegexAuthorizer
Xavier HaurieXavier Haurie
25426800de2move RegexAuthorization class to an example folder
Xavier HaurieXavier Haurie
74cee947c11fix bug in new AuthorizationFilter
Xavier HaurieXavier Haurie
5d4ce684858Add comment to explain how a user is authorized from calling Authorization.AuthorizationCoordinator
Xavier HaurieXavier Haurie
d2da84c0640rename AuthorizationService to AuthorizationCoordinator so it is not mistaken to an HTTP end-point provider
Xavier HaurieXavier Haurie
a01774f1282rewrite the authorization filter such that there is no return within its body nor is there a 'doChain' var to keep tr...
Xavier HaurieXavier Haurie
133c0ff50bfremove fully qualified name where not necessary; move import
Carl WoolfCarl Woolf
0d310336f77simplify innerT assignment. More-descriptive names for helpers
David WalendDavid Walend
ac81509b99dPull request #1361: Bugfix/SHRINE2020 1309 queued queries poller runs forever, for a more even load on the i2b2 CRC ...
Xavier HaurieXavier Haurie
1ca47069d56add more comments
dwalenddwalend
2b9729d5567Logging in ShrineMomClient for SHRINE2020-1305
dwalenddwalend
b8596a6e64cLogging around runTransactionIO for SHRINE2020-1305
dwalenddwalend
2fafae21703Logging around runTransactionIO for SHRINE2020-1305
dwalenddwalend
6d726de77f8Logging around runTransactionIO for SHRINE2020-1305
Xavier HaurieXavier Haurie
8128e8256b1make SQL for creating BW list table more universal
dwalenddwalend
ac87996de2bTry not using blocking() for the database transaction. IO.fromFuture should handle the thread pool issues well. For S...
Xavier HaurieXavier Haurie
7a2a2a1efb5create trait for authorizers which use the black/white list attributes provided by WhiteBlackListAttrProvider
Xavier HaurieXavier Haurie
f0b631dc4c3straggler for previous commit : simplify SQL for black/white attribute provider so as to be compatible with Oracle. (...
Xavier HaurieXavier Haurie
17b53b31ebbsimplify SQL for black/white attribute provider so as to be compatible with Oracle. (i.e. do not use AUTO_INCREMENT)
dwalenddwalend
1ca7e66743aEven more logging to bracket SHRINE2020-1305
dwalenddwalend
5258a27f923Yet more logging in the database to bracket SHRINE2020-1305
dwalenddwalend
a787510f409Even more logging in the database to bracket SHRINE2020-1305
dwalenddwalend
17be4212d36More logging in the database to bracket SHRINE2020-1305
Xavier HaurieXavier Haurie
0afd620746dreinstate configuration of filters in web.xml instead of annotations
dwalenddwalend
76e25fce061More logging - trying to bracket for SHRINE2020-1305
Xavier HaurieXavier Haurie
4919e898a44reinstate configuration of filters in web.xml instead of annotations
Xavier HaurieXavier Haurie
327c1cbc91bMerge remote-tracking branch 'origin/sso-phase2' into sso-phase2
Xavier HaurieXavier Haurie
93770b2314freinstate configuration of filters in web.xml instead of annotations
dwalenddwalend
36c944acddeA little more logging to try to bracket SHRINE2020-1305
David WalendDavid Walend
1088580c512Pull request #1360: Added a unit test to show - for duplicated keys in a typesafe config file - last in wins - SHRINE...
dwalenddwalend
16b56c1215eFix the config and expand the default CRC QUEUED query polling interval for SHRINE2020-1309
Xavier HaurieXavier Haurie
fbc8a635eacsimplify name and return type of AuthorizationService.isUserAuthorized(), and modify AuthorizerFilter code accordingl...
Xavier HaurieXavier Haurie
e6c31cacb82remove wildcard import
Xavier HaurieXavier Haurie
406710cccb8remove wildcard import
Next →