 Marc-Danie Nazaire | 5dba73e6dde | Merge branch 'feature/SHRINE2020-499' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
Marc-Danie Nazaire | b735adfc89e | SHRINE2020-499 - Migrate the BREAKDOWN_RESULT table to Slick - Fixed unit test | | |
Marc-Danie Nazaire | cf513ece90d | Merge branch 'feature/SHRINE2020-495' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
 elizah | 6717cc8f72b | shutdown | | |
elizah | 76b329bad2c | log startup on info | | |
elizah | 16389a8ea36 | using QueryId in ShrineQuery | | |
elizah | 5a4d72f07cd | use QueryId not long | | |
 dwalend | ec6447102cf | Changed the existing debug log statement to error for SHRINE2020-514 | | |
 bcarmen | 043d1d6d454 | fix for moving lab terms between groups | | |
 Bamboo User | fd07f5b19b2 | Merge release branch release/3.0.1 into master. | | |
Bamboo User | 248c8d99104 | Update POMs with release version 3.0.1. | | |
Marc-Danie Nazaire | b04e8594b32 | SHRINE2020-495 - Migrate the COUNT_RESULT and ERROR_RESULT table to Slick - added storeErrorResults function | | |
Marc-Danie Nazaire | 11d90c9d46e | SHRINE2020-495 - Migrate the COUNT_RESULT and ERROR_RESULT table to Slick - added storeCountResults function | | |
dwalend | 7786838dce1 | Thread pool didn't make a difference because we hit the AWS throughput limit | | |
elizah | ca42f208a3c | fix query header | | |
elizah | 8937832a545 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-516 | | |
elizah | 5c7564bba9b | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-519 | | |
Marc-Danie Nazaire | d94105f9240 | SHRINE2020-500 - Migrate remaining functions in SquerylAdapterDao to Slick - added botCheck | | |
Marc-Danie Nazaire | 00785bc264f | SHRINE2020-495 - Migrate the COUNT_RESULT and ERROR_RESULT table to Slick - fixed merge duplicate | | |
Marc-Danie Nazaire | 8a631da67bd | Fixed merge | | |
bcarmen | 90d79798959 | quick change to model | | |
bcarmen | 99ccafe0bd2 | Fix of being unable to run other previous queries if one fails | | |
Marc-Danie Nazaire | 8b305fc3e57 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-495
# Co... | | |
dwalend | 458b74eab44 | Logic fix to let results flow | | |
bcarmen | f2b1b39b9b5 | saving work | | |
dwalend | 80d16153e46 | Now using the underlying value - Java is not type safe | | |
dwalend | 6f50969c347 | First attempt at an integrated run | | |
Marc-Danie Nazaire | dbb6cdfeb0b | More updates to reflect changes in develop | | |
Marc-Danie Nazaire | 702beea7797 | Updated to reflect changes in develop | | |
dwalend | 154243be51f | Refined the round trip a lot | | |
dwalend | ddfc3a2685d | rickety prototype of this working in dynamodb with queries | | |
bcarmen | 208fe4680cb | saving work | | |
elizah | 859338ec8c1 | rename | | |
elizah | 8002ae25fc3 | fix name conflict | | |
elizah | 4e7aea3e3b3 | merge develop into branch | | |
elizah | 859237b1716 | in adapter | | |
elizah | 5ad7696355e | test fix | | |
 David Walend | 0c6115ffc06 | Merge pull request #1044 in SHRINE/shrine from feature/SHRINE2020-571 to develop
* commit '55a14817a0f0d9ce91e9cab6b... | | |
elizah | d9f40892d58 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-519 | | |
David Walend | 3ac2306a54f | Merge pull request #1043 in SHRINE/shrine from feature/SHRINE2020-567 to develop
* commit 'e759de2971419d88e868b88c6... | | |
Marc-Danie Nazaire | 5745dfe1ca8 | Merge pull request #1019 in SHRINE/shrine from feature/SHRINE2020-494 to develop
* commit '1261ff8a34109c2fb231245c5... | | |
Marc-Danie Nazaire | 1261ff8a341 | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - added types to the variables | | |
Marc-Danie Nazaire | 8df993dd019 | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - removed unused run function | | |
Marc-Danie Nazaire | 40c54b06a59 | SHRINE2020-500 - Migrate remaining functions in SquerylAdapterDao to Slick - Added withUpdatedFlag and withUpdatedName | | |
Marc-Danie Nazaire | 439c0f3eed2 | SHRINE2020-500 - Migrate remaining functions in SquerylAdapterDao to Slick - Added renaming query | | |
Marc-Danie Nazaire | 559c806c9d7 | SHRINE2020-500 - Migrate remaining functions in SquerylAdapterDao to Slick - Added flag and unflagging | | |
dwalend | 2538fe40d5d | Revert "Renamed some .ddl files to .sql while doing SHRINE2020-539"
This reverts commit d5b17d6445c5bd8e9cafd75bbaa8... | | |
dwalend | d5b17d6445c | Renamed some .ddl files to .sql while doing SHRINE2020-539 | | |
dwalend | 2f40193596b | Changes to .sql to add indexes for better QEP performance for SHRINE2020-539 | | |
elizah | fcc6b285061 | in qep | | |
Marc-Danie Nazaire | 779b4e0203e | Removed commented out code | | |
Marc-Danie Nazaire | 309ec664fbb | Merge with develop branch | | |
Marc-Danie Nazaire | 2dd62ba8da9 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-500 | | |
Marc-Danie Nazaire | 6b5045f1e77 | Merge with develop branch | | |
elizah | 725c5fb24a0 | in commons | | |
elizah | abd4c493e37 | in adapter | | |
dwalend | 55a14817a0f | Added an unbounded threadpool for all database work for SHRINE2020-571 | | |
elizah | ccb72f2cf91 | change in adapter dao | | |
bcarmen | aa69956b8a6 | fixed failing unit test | | |
bcarmen | 981b00061de | saving work | | |
Marc-Danie Nazaire | cec89215cbb | Merge branches 'develop' and 'feature/SHRINE2020-494' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine in... | | |
David Walend | d5254c0020d | Merge pull request #1041 in SHRINE/shrine from bugfix/SHRINE2020-550 to release/3.0.1
* commit '4034593dd6f86018a671... | | |
dwalend | e759de29714 | Removed a few more stray bits for SHRINE2020-567 | | |
dwalend | e68c6140eb1 | More directory cleanup for SHRINE2020-567 | | |
bcarmen | bfc0f908bdd | updated snapshot test | | |
bcarmen | 109d636de3a | updated snapshot test and package.json | | |
bcarmen | e694612ff52 | saving work | | |
bcarmen | 895b8a0ad21 | fixed unit test | | |
bcarmen | 6c21acd402b | saving work | | |
dwalend | 4034593dd6f | Fixing the versino magic in the pom.xml for SHRINE2020-550 | | |
dwalend | 4c0d353aed2 | Updated version number in the pom.xml | | |
dwalend | 91627d2c29e | Some database indexes and an unbounded threadpool for the hub database for SHRINE2020-550 | | |
David Walend | 0003f4ce30f | Merge pull request #1034 in SHRINE/shrine from feature/SHRINE2020-464 to develop
* commit 'b387de92c0a3afb0246701711... | | |
elizah | 959aad02f2c | rm default test | | |
elizah | 00ad1c626a4 | set refernce conf log level to info | | |
elizah | afb73fe7479 | get level from config | | |
elizah | da8dc3938d2 | add log levels | | |
dwalend | b387de92c0a | Another try at the PM cell url | | |
dwalend | 109ea7347b9 | Right path for i2b2 services | | |
dwalend | 71d01b808d7 | Built the merge | | |
elizah | 1a0f14c17dc | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-516 | | |
elizah | 4cc5b750c58 | remove api-root log | | |
elizah | 483a0653636 | default to info level | | |
 Eliza Huang | 0f794fced17 | Merge pull request #989 in SHRINE/shrine from feature/SHRINE2020-435 to develop
* commit '1cc374786bdac8decd8d71a66d... | | |
elizah | 1cc374786bd | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-435 | | |
elizah | fda3509bb56 | merge develop into this branch | | |
Eliza Huang | e842d9c3472 | Merge pull request #1022 in SHRINE/shrine from feature/SHRINE2020-170 to develop
* commit '42ec14b9436d730e71128397a... | | |
elizah | 42ec14b9436 | merge develop into this branch | | |
bcarmen | 31f8bd7fdfd | fixed failing snapshot test | | |
elizah | df2742fc820 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-508 | | |
elizah | 4861ef63d95 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-516 | | |
 Bill Simons | ffafdef874b | minor name cleanup on dsa front end. Move test output to target for gitignore and easy mvn clean | | |
Marc-Danie Nazaire | 6467b4cfd81 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-494 | | |
Marc-Danie Nazaire | 7bfea8c0f0f | Merge pull request #1026 in SHRINE/shrine from feature/SHRINE2020-456 to develop
* commit '3afbee02f9a019b2d54999133... | | |
elizah | a6eb1c37cfd | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-399 | | |
 Ben Carmen | ba64730dbfd | Merge pull request #1028 in SHRINE/shrine from feature/SHRINE2020-505 to develop
* commit '5aa0abbdce14a320fa6173605... | | |
Marc-Danie Nazaire | 3afbee02f9a | SHRINE2020-456 - Simplify shrine.conf with default values - modified to use buildURI in EndpointConfig | | |
Marc-Danie Nazaire | 92eed9553c4 | SHRINE2020-456 - Simplify shrine.conf with default values - replace .map.getOrElse with orElse | | |
bcarmen | 5aa0abbdce1 | fixed snapshot test | | |
Ben Carmen | c36c70325ff | Merge pull request #1038 in SHRINE/shrine from bugfix/SHRINE2020-363 to develop
* commit '64d1edbf1251cafaef38700e74... | | |
bcarmen | a8565d4c21d | changed styles based on BA review feedback | | |
dwalend | c16d879107f | Rename from review comments from Marc-Danie for SHRINE2020-464 | | |
Marc-Danie Nazaire | f4098658143 | SHRINE2020-456 - Simplify shrine.conf with default values - modified to use buildURI in ConfigExtensions | | |
Marc-Danie Nazaire | 9d6f3efe3c1 | SHRINE2020-456 - Simplify shrine.conf with default values - removed trailing slash | | |
dwalend | f575cb2bde4 | Missed an important dependency for SHRINE2020-464 | | |
Marc-Danie Nazaire | 07e2e295c4e | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - modified i2b2BaseUrl to look like a fake... | | |
dwalend | e52396f9ff2 | Deleted some stray test output files for SHRINE2020-464 | | |
dwalend | b851133d8dd | Added front end parts as a dependency for SHRINE2020-464 | | |
Marc-Danie Nazaire | 5f613fa590e | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - removed selectAllQueryHistoryForNetworkI... | | |
dwalend | 6371d6fd4e0 | Merge with develop for SHRINE2020-464 | | |
dwalend | 7bf2262bd96 | Merge branch 'develop' into feature/SHRINE2020-464
# Conflicts:
# frontend/shrine-webclient/v1/dev-server/data/selec... | | |
Marc-Danie Nazaire | 31e8139a2f9 | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - reverting changes | | |
Marc-Danie Nazaire | 904f74dee3f | SHRINE2020-456 - Simplify shrine.conf with default values - removed trailing slash | | |
Marc-Danie Nazaire | 69064eada49 | SHRINE2020-456 - Simplify shrine.conf with default values - Modified to use .map.getOrElse | | |
bcarmen | 720703b7928 | saving work | | |
bcarmen | 5d08f9ee461 | Merge branch 'develop' into feature/SHRINE2020-532 | | |
elizah | ec1c5062bb9 | combine api and root | | |
elizah | 27a8174d689 | wrong log | | |
elizah | a5c651cbf33 | combine log files | | |
dwalend | dff13eac876 | Renamed the long-named-indexing-tool to something shroter for SHRINE2020-464 | | |
Marc-Danie Nazaire | 805cb9688e9 | SHRINE2020-456 - Simplify shrine.conf with default values - Fixed StaticDataServiceTest | | |
Marc-Danie Nazaire | 80790c455d2 | SHRINE2020-456 - Simplify shrine.conf with default values - Added default value for webclient.nextStepsUrl | | |
Marc-Danie Nazaire | ee19bd22da0 | SHRINE2020-456 - Simplify shrine.conf with default values - Added default value for networkStatusQuery | | |
Marc-Danie Nazaire | 38a53eb2aa9 | SHRINE2020-456 - Simplify shrine.conf with default values - Added default value for networkStatusQuery | | |
dwalend | 52fe41f329d | First batch of Bill's review comments for SHRINE2020-464 | | |
elizah | 1698b2763bd | add tests | | |
elizah | a6ca9d8257a | add default logger | | |
Marc-Danie Nazaire | db6f02ba729 | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Made networkId the primary key in the SH... | | |
Marc-Danie Nazaire | 308cef163c9 | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Removed unused deleteQueryIO function | | |
bcarmen | 4837b8e9752 | Merge branch 'develop' into feature/SHRINE2020-534 | | |
bcarmen | 64d1edbf125 | updated unit test, fixed prop name | | |
elizah | ab9d6c21287 | remove ripple effects | | |
elizah | f2b251d8648 | rename to SelectionContext | | |
elizah | cb86ce402e7 | cleanup | | |
elizah | 950936a193e | remove useCallback | | |
elizah | 8dbc4f705d6 | move event handler | | |
elizah | ae9d018f38c | cleanup reducer | | |
bcarmen | 16f7e78320b | saving work | | |
elizah | b5a99064c41 | centralize prompt | | |
elizah | 67b8704a40a | drop area style change | | |
elizah | e3ee709c498 | indicate drag region | | |
bcarmen | 7eac3889b0c | Merge branch 'develop' into bugfix/SHRINE2020-363 | | |
elizah | 68e57e2ef8b | add snapshot | | |
elizah | 8c259dd47e9 | remove group when all moved out | | |
Eliza Huang | 3a790f611f0 | Merge pull request #1037 in SHRINE/shrine from bugfix/SHRINE2020-537 to develop
* commit '722bf89b2db02f42e30344f062... | | |
elizah | 3098b620953 | correct equality | | |
elizah | bfd80052306 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-170 | | |
bcarmen | 1823add354c | saving work | | |
Marc-Danie Nazaire | 23561a43083 | SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Added return type for toMillis function | | |
Marc-Danie Nazaire | 70e014c4f5f | Merge branches 'develop' and 'feature/SHRINE2020-494' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine in... | | |
elizah | 722bf89b2db | clear view mode on logout | | |
bcarmen | 13fdcae15b3 | saving work | | |
Eliza Huang | 54c38c72b7e | Merge pull request #1029 in SHRINE/shrine from bugfix/SHRINE2020-384 to develop
* commit '1adaa493314dc36dea0b7ea5fa... | | |
bcarmen | 1ad3ce88034 | saving work | | |
bcarmen | b8b2fe372cc | saving work | | |
bcarmen | f7b4336b3df | saving updated snapshot test | | |
bcarmen | 52f06513711 | saving work | | |
Marc-Danie Nazaire | 85fb83f660c | SHRINE2020-456 - Simplify shrine.conf with default values - Fix retrieval of hub.client.serverUrl | | |
Marc-Danie Nazaire | 716a9cdf1a6 | SHRINE2020-456 - Simplify shrine.conf with default values - Removed debug statement | | |
elizah | 9f0ac8b1101 | cleanup | | |
elizah | d872a8d3d96 | display a download link | | |
elizah | 7a0a885254e | Merge branch 'feature/SHRINE2020-505' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
elizah | 412fd599552 | place | | |
Marc-Danie Nazaire | 5ec4b4603b4 | SHRINE2020-456 - Simplify shrine.conf with default values - Set createTopicsMode = Pending in shrine.conf for unit te... | | |
elizah | 47e47e22252 | rm todo | | |
elizah | 64d50ecfd93 | fix tests | | |
elizah | a6651ed891d | cleanup context reducer | | |
elizah | 020f8b6cc32 | remove logs | | |
elizah | 65235fa10ae | rename addGroupTerms | | |
elizah | 6c963f65ba8 | rename insertTerms | | |
elizah | 1a31f60d3e6 | fix tutorial | | |
elizah | 8de7ccae920 | working | | |
elizah | 006f5ffa431 | change selection color | | |
elizah | 5b67a537831 | selection color style | | |
elizah | 7c4cf8d7a39 | change on mousedown | | |
elizah | f96a6df14ac | insert term | | |
elizah | 5b243ddd50b | select with shift | | |
 marc-danie | 13035eb94fd | SHRINE2020-456 - Simplify shrine.conf with default values - Set default for createTopicsMode to Approved in the shrin... | | |
Bill Simons | ab80770e868 | account for directory restructuring in dockerignore | | |
bcarmen | 9155e4a9698 | updated package-lock for legacy | | |
bcarmen | 927adfe3099 | updated .gitignore | | |
bcarmen | 672fc62b9ef | added package.lock files | | |
bcarmen | c46bd8f4fd3 | added package-lock.json | | |
elizah | 583e927d68a | use selection context | | |
marc-danie | b7d33ed0e99 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-456 | | |
marc-danie | 7def3a76b03 | SHRINE2020-468 - Passwords in shrine.conf make support difficult - Modified the shrine.conf's units tests to use the ... | | |
marc-danie | b1dc43d78d4 | SHRINE2020-468 - Passwords in shrine.conf make support difficult - Added password.conf to docker, unit tests, and rem... | | |
bcarmen | 9c3972f9601 | added front end build for network health | | |
| Next → |
