SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
Marc-Danie NazaireMarc-Danie Nazaire
7f3c05c9b6dSHRINE2020-495 - Migrate the COUNT_RESULT and ERROR_RESULT table to Slick - fixed merge duplicate
Marc-Danie NazaireMarc-Danie Nazaire
ac52626fa33Fixed merge
bcarmenbcarmen
5694e8e9502quick change to model
bcarmenbcarmen
0d35ea9cd71Fix of being unable to run other previous queries if one fails
Marc-Danie NazaireMarc-Danie Nazaire
f9bc69d8ab6Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-495 # Co...
dwalenddwalend
a66600709d6Logic fix to let results flow
bcarmenbcarmen
ec0e1923c58saving work
dwalenddwalend
6a1438517f8Now using the underlying value - Java is not type safe
dwalenddwalend
4307bcade5bFirst attempt at an integrated run
Marc-Danie NazaireMarc-Danie Nazaire
dbb6cdfeb0bMore updates to reflect changes in develop
Marc-Danie NazaireMarc-Danie Nazaire
702beea7797Updated to reflect changes in develop
dwalenddwalend
916f8843719Refined the round trip a lot
dwalenddwalend
ab6bfa57033rickety prototype of this working in dynamodb with queries
bcarmenbcarmen
b65e847003bsaving work
elizahelizah
4d0af50448erename
elizahelizah
84b8387cbc3fix name conflict
elizahelizah
fd6ee235fa1merge develop into branch
elizahelizah
ff18538847ein adapter
elizahelizah
7d20dd2c17ftest fix
David WalendDavid Walend
ad6cfe2db71Merge pull request #1044 in SHRINE/shrine from feature/SHRINE2020-571 to develop * commit '0253cbf79595302696ec2d853...
elizahelizah
fb9e5226c42Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-519
David WalendDavid Walend
b8029ee484aMerge pull request #1043 in SHRINE/shrine from feature/SHRINE2020-567 to develop * commit 'c5e38a676cb06c178b67083c6...
Marc-Danie NazaireMarc-Danie Nazaire
c5a5547487aMerge pull request #1019 in SHRINE/shrine from feature/SHRINE2020-494 to develop * commit 'e881cd0f0d95537a16ffc732a...
Marc-Danie NazaireMarc-Danie Nazaire
e881cd0f0d9SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - added types to the variables
Marc-Danie NazaireMarc-Danie Nazaire
196709c1ee1SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - removed unused run function
Marc-Danie NazaireMarc-Danie Nazaire
f5097b5985eSHRINE2020-500 - Migrate remaining functions in SquerylAdapterDao to Slick - Added withUpdatedFlag and withUpdatedName
Marc-Danie NazaireMarc-Danie Nazaire
b77465d1c52SHRINE2020-500 - Migrate remaining functions in SquerylAdapterDao to Slick - Added renaming query
Marc-Danie NazaireMarc-Danie Nazaire
7d5adfa08d4SHRINE2020-500 - Migrate remaining functions in SquerylAdapterDao to Slick - Added flag and unflagging
dwalenddwalend
561be3e9249Revert "Renamed some .ddl files to .sql while doing SHRINE2020-539" This reverts commit cbe0e248a69f2b2c94852aa4e2a8...
dwalenddwalend
cbe0e248a69Renamed some .ddl files to .sql while doing SHRINE2020-539
dwalenddwalend
605da58f353Changes to .sql to add indexes for better QEP performance for SHRINE2020-539
elizahelizah
c64e231f93ein qep
Marc-Danie NazaireMarc-Danie Nazaire
a8a5dc323fdRemoved commented out code
Marc-Danie NazaireMarc-Danie Nazaire
8e8f43690f5Merge with develop branch
Marc-Danie NazaireMarc-Danie Nazaire
dfbae9ec616Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-500
Marc-Danie NazaireMarc-Danie Nazaire
cc8719f2474Merge with develop branch
elizahelizah
cfbee540c5ein commons
elizahelizah
cc5c77a5a42in adapter
dwalenddwalend
0253cbf7959Added an unbounded threadpool for all database work for SHRINE2020-571
elizahelizah
5b5c73ecec8change in adapter dao
bcarmenbcarmen
e20f9b089eafixed failing unit test
bcarmenbcarmen
30880add933saving work
Marc-Danie NazaireMarc-Danie Nazaire
24657a69314Merge branches 'develop' and 'feature/SHRINE2020-494' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine in...
David WalendDavid Walend
d5254c0020dMerge pull request #1041 in SHRINE/shrine from bugfix/SHRINE2020-550 to release/3.0.1 * commit '4034593dd6f86018a671...
dwalenddwalend
c5e38a676cbRemoved a few more stray bits for SHRINE2020-567
dwalenddwalend
2f48b65ce9eMore directory cleanup for SHRINE2020-567
bcarmenbcarmen
e520e7ac95eupdated snapshot test
bcarmenbcarmen
49f412bded7updated snapshot test and package.json
bcarmenbcarmen
b4b6ac401f7saving work
bcarmenbcarmen
e31f1a0c14afixed unit test
bcarmenbcarmen
1094fe30b23saving work
dwalenddwalend
4034593dd6fFixing the versino magic in the pom.xml for SHRINE2020-550
dwalenddwalend
4c0d353aed2Updated version number in the pom.xml
dwalenddwalend
91627d2c29eSome database indexes and an unbounded threadpool for the hub database for SHRINE2020-550
David WalendDavid Walend
9ca1bfbcaf1Merge pull request #1034 in SHRINE/shrine from feature/SHRINE2020-464 to develop * commit 'b32e071de46517e5e4153a749...
elizahelizah
0d84b607e8frm default test
elizahelizah
cb63c65839fset refernce conf log level to info
elizahelizah
5e4563a1bf0get level from config
elizahelizah
05ed6840c55add log levels
dwalenddwalend
b32e071de46Another try at the PM cell url
dwalenddwalend
b870505541eRight path for i2b2 services
dwalenddwalend
a681e810768Built the merge
elizahelizah
44f3213918eMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-516
elizahelizah
4f88fa1d7c5remove api-root log
elizahelizah
016939258e3default to info level
Eliza HuangEliza Huang
518bcc10ef2Merge pull request #989 in SHRINE/shrine from feature/SHRINE2020-435 to develop * commit 'a7be60555a8d87aaf6c118f6db...
elizahelizah
a7be60555a8Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-435
elizahelizah
8811d168ebfmerge develop into this branch
Eliza HuangEliza Huang
8b2c27868b4Merge pull request #1022 in SHRINE/shrine from feature/SHRINE2020-170 to develop * commit '134d79ee086ab93c0bb24e18c...
elizahelizah
134d79ee086merge develop into this branch
bcarmenbcarmen
31f8bd7fdfdfixed failing snapshot test
elizahelizah
f5c4bc13915Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-508
elizahelizah
1ea6bc624fdMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-516
Bill SimonsBill Simons
ffafdef874bminor name cleanup on dsa front end. Move test output to target for gitignore and easy mvn clean
Marc-Danie NazaireMarc-Danie Nazaire
c887a80555aMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-494
Marc-Danie NazaireMarc-Danie Nazaire
857e5961b2bMerge pull request #1026 in SHRINE/shrine from feature/SHRINE2020-456 to develop * commit 'faafbf0fcff83463a75500c33...
elizahelizah
a6eb1c37cfdMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-399
Ben CarmenBen Carmen
ba64730dbfdMerge pull request #1028 in SHRINE/shrine from feature/SHRINE2020-505 to develop * commit '5aa0abbdce14a320fa6173605...
Marc-Danie NazaireMarc-Danie Nazaire
faafbf0fcffSHRINE2020-456 - Simplify shrine.conf with default values - modified to use buildURI in EndpointConfig
Marc-Danie NazaireMarc-Danie Nazaire
34b76329813SHRINE2020-456 - Simplify shrine.conf with default values - replace .map.getOrElse with orElse
bcarmenbcarmen
5aa0abbdce1fixed snapshot test
Ben CarmenBen Carmen
c36c70325ffMerge pull request #1038 in SHRINE/shrine from bugfix/SHRINE2020-363 to develop * commit '64d1edbf1251cafaef38700e74...
bcarmenbcarmen
a8565d4c21dchanged styles based on BA review feedback
dwalenddwalend
c16d879107fRename from review comments from Marc-Danie for SHRINE2020-464
Marc-Danie NazaireMarc-Danie Nazaire
fb3665d4fb9SHRINE2020-456 - Simplify shrine.conf with default values - modified to use buildURI in ConfigExtensions
Marc-Danie NazaireMarc-Danie Nazaire
e3a2933f644SHRINE2020-456 - Simplify shrine.conf with default values - removed trailing slash
dwalenddwalend
f575cb2bde4Missed an important dependency for SHRINE2020-464
Marc-Danie NazaireMarc-Danie Nazaire
07d3358fa33SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - modified i2b2BaseUrl to look like a fake...
dwalenddwalend
e52396f9ff2Deleted some stray test output files for SHRINE2020-464
dwalenddwalend
b851133d8ddAdded front end parts as a dependency for SHRINE2020-464
Marc-Danie NazaireMarc-Danie Nazaire
5f613fa590eSHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - removed selectAllQueryHistoryForNetworkI...
dwalenddwalend
6371d6fd4e0Merge with develop for SHRINE2020-464
dwalenddwalend
7bf2262bd96Merge branch 'develop' into feature/SHRINE2020-464 # Conflicts: # frontend/shrine-webclient/v1/dev-server/data/selec...
Marc-Danie NazaireMarc-Danie Nazaire
31e8139a2f9SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - reverting changes
Marc-Danie NazaireMarc-Danie Nazaire
a0502cc749cSHRINE2020-456 - Simplify shrine.conf with default values - removed trailing slash
Marc-Danie NazaireMarc-Danie Nazaire
678b69e4caaSHRINE2020-456 - Simplify shrine.conf with default values - Modified to use .map.getOrElse
bcarmenbcarmen
720703b7928saving work
bcarmenbcarmen
5d08f9ee461Merge branch 'develop' into feature/SHRINE2020-532
elizahelizah
ec1c5062bb9combine api and root
elizahelizah
27a8174d689wrong log
elizahelizah
a5c651cbf33combine log files
dwalenddwalend
dff13eac876Renamed the long-named-indexing-tool to something shroter for SHRINE2020-464
Marc-Danie NazaireMarc-Danie Nazaire
42aa28933bbSHRINE2020-456 - Simplify shrine.conf with default values - Fixed StaticDataServiceTest
Marc-Danie NazaireMarc-Danie Nazaire
4757c91b123SHRINE2020-456 - Simplify shrine.conf with default values - Added default value for webclient.nextStepsUrl
Marc-Danie NazaireMarc-Danie Nazaire
f8a8d04e25eSHRINE2020-456 - Simplify shrine.conf with default values - Added default value for networkStatusQuery
Marc-Danie NazaireMarc-Danie Nazaire
38a53eb2aa9SHRINE2020-456 - Simplify shrine.conf with default values - Added default value for networkStatusQuery
dwalenddwalend
52fe41f329dFirst batch of Bill's review comments for SHRINE2020-464
elizahelizah
1698b2763bdadd tests
elizahelizah
a6ca9d8257aadd default logger
Marc-Danie NazaireMarc-Danie Nazaire
db6f02ba729SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Made networkId the primary key in the SH...
Marc-Danie NazaireMarc-Danie Nazaire
308cef163c9SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Removed unused deleteQueryIO function
bcarmenbcarmen
4837b8e9752Merge branch 'develop' into feature/SHRINE2020-534
bcarmenbcarmen
64d1edbf125updated unit test, fixed prop name
elizahelizah
ab9d6c21287remove ripple effects
elizahelizah
f2b251d8648rename to SelectionContext
elizahelizah
cb86ce402e7cleanup
elizahelizah
950936a193eremove useCallback
elizahelizah
8dbc4f705d6move event handler
elizahelizah
ae9d018f38ccleanup reducer
bcarmenbcarmen
16f7e78320bsaving work
elizahelizah
b5a99064c41centralize prompt
elizahelizah
67b8704a40adrop area style change
elizahelizah
e3ee709c498indicate drag region
bcarmenbcarmen
7eac3889b0cMerge branch 'develop' into bugfix/SHRINE2020-363
elizahelizah
68e57e2ef8badd snapshot
elizahelizah
8c259dd47e9remove group when all moved out
Eliza HuangEliza Huang
3a790f611f0Merge pull request #1037 in SHRINE/shrine from bugfix/SHRINE2020-537 to develop * commit '722bf89b2db02f42e30344f062...
elizahelizah
3098b620953correct equality
elizahelizah
bfd80052306Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-170
bcarmenbcarmen
1823add354csaving work
Marc-Danie NazaireMarc-Danie Nazaire
23561a43083SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Added return type for toMillis function
Marc-Danie NazaireMarc-Danie Nazaire
70e014c4f5fMerge branches 'develop' and 'feature/SHRINE2020-494' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine in...
elizahelizah
722bf89b2dbclear view mode on logout
bcarmenbcarmen
13fdcae15b3saving work
Eliza HuangEliza Huang
54c38c72b7eMerge pull request #1029 in SHRINE/shrine from bugfix/SHRINE2020-384 to develop * commit '1adaa493314dc36dea0b7ea5fa...
bcarmenbcarmen
1ad3ce88034saving work
bcarmenbcarmen
b8b2fe372ccsaving work
bcarmenbcarmen
f7b4336b3dfsaving updated snapshot test
bcarmenbcarmen
52f06513711saving work
Marc-Danie NazaireMarc-Danie Nazaire
7a4c01b7bdcSHRINE2020-456 - Simplify shrine.conf with default values - Fix retrieval of hub.client.serverUrl
Marc-Danie NazaireMarc-Danie Nazaire
28d5f82c2a5SHRINE2020-456 - Simplify shrine.conf with default values - Removed debug statement
elizahelizah
9f0ac8b1101cleanup
elizahelizah
d872a8d3d96display a download link
elizahelizah
7a0a885254eMerge branch 'feature/SHRINE2020-505' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
elizahelizah
412fd599552place
Marc-Danie NazaireMarc-Danie Nazaire
483e7cb925eSHRINE2020-456 - Simplify shrine.conf with default values - Set createTopicsMode = Pending in shrine.conf for unit te...
elizahelizah
47e47e22252rm todo
elizahelizah
64d50ecfd93fix tests
elizahelizah
a6651ed891dcleanup context reducer
elizahelizah
020f8b6cc32remove logs
elizahelizah
65235fa10aerename addGroupTerms
elizahelizah
6c963f65ba8rename insertTerms
elizahelizah
1a31f60d3e6fix tutorial
elizahelizah
8de7ccae920working
elizahelizah
006f5ffa431change selection color
elizahelizah
5b67a537831selection color style
elizahelizah
7c4cf8d7a39change on mousedown
elizahelizah
f96a6df14acinsert term
elizahelizah
5b243ddd50bselect with shift
marc-daniemarc-danie
2600cbd10bbSHRINE2020-456 - Simplify shrine.conf with default values - Set default for createTopicsMode to Approved in the shrin...
Bill SimonsBill Simons
c2e2891a308account for directory restructuring in dockerignore
bcarmenbcarmen
9155e4a9698updated package-lock for legacy
bcarmenbcarmen
927adfe3099updated .gitignore
bcarmenbcarmen
672fc62b9efadded package.lock files
bcarmenbcarmen
c46bd8f4fd3added package-lock.json
elizahelizah
583e927d68ause selection context
marc-daniemarc-danie
82d7e7c18deMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-456
marc-daniemarc-danie
339b7d61753SHRINE2020-468 - Passwords in shrine.conf make support difficult - Modified the shrine.conf's units tests to use the ...
marc-daniemarc-danie
85e0e410192SHRINE2020-468 - Passwords in shrine.conf make support difficult - Added password.conf to docker, unit tests, and rem...
bcarmenbcarmen
9c3972f9601added front end build for network health
elizahelizah
aebc8fafb9erm unused import
bcarmenbcarmen
815e176cadcupdated changes
bcarmenbcarmen
975535a81d4removed bloop artifact
elizahelizah
85c199c9c04update snapchat
bcarmenbcarmen
3b4580b47f0updated .gitignore
bcarmenbcarmen
1dc683bf1b9updated .gitignore
bcarmenbcarmen
f7131bf4f36updated primary .gitignore
bcarmenbcarmen
239dfd6bb56saving work
dwalenddwalend
4aadb748ed8Folded Receiver into the shrine-api-app directory, alongside Bootstrap for SHRINE-464
elizahelizah
54a2582e62cfixing tests
dwalenddwalend
c120396226fMoved the MOM system into the hub for SHRINE2020-464
elizahelizah
82ecb92d88bfix typo
elizahelizah
17e941a18fdcheck if concept exits
elizahelizah
4a59172e708move between groups
Eliza HuangEliza Huang
a190e03b2cdMerge pull request #1018 in SHRINE/shrine from feature/SHRINE2020-468 to feature/SHRINE2020-456 * commit '52f33dd83d...
dwalenddwalend
db475ce3478Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-464
marc-daniemarc-danie
52f33dd83d9SHRINE2020-468 - Passwords in shrine.conf make support difficult - Added more test password.conf file
elizahelizah
6ad07d7d8d8move drag-dropable area
Next →