SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
bendcarmenbendcarmen
886e6e535cbremoved some dev code.
bendcarmenbendcarmen
06b17693315Added breakdowns
David WalendDavid Walend
44d44f5479aMerge pull request #17 in SHRINE/shrine from bugfix/SHRINE-2155-seeing-the-same-message-multiple to develop * commit...
David WalendDavid Walend
5060c9fcc45Review fix for SHRINE-2155
David WalendDavid Walend
9863c5706ebFix for SHRINE-2155 messages can be received once
bendcarmenbendcarmen
af281addf29UI cleanup
bendcarmenbendcarmen
5d0119037d5Added 10 seceond timeout to test current queryStatus service
bendcarmenbendcarmen
3b81697dc7aWireup status attempt #2
bendcarmenbendcarmen
487af02e495Begin wiring up with back end
David WalendDavid Walend
df6bc6f04a9Data version and timeout parameters for SHRINE-2145
bendcarmenbendcarmen
3633de146a6Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
c72b44b468cFixed an error in shrine.controller
David WalendDavid Walend
6c6484d7666Merge branch 'develop' into feature/SHRINE-2145-add-an-optional-changes-since
David WalendDavid Walend
cf8e7f2f363Merge pull request #15 in SHRINE/shrine from feature/SHRINE-2140-quickly-return-the-network-query to develop * commi...
David WalendDavid Walend
e33082ad98fAdded a comment to pin down just what queryHub does.
bendcarmenbendcarmen
49f6aa8d9dfThis is an attempt to get the network id!
David WalendDavid Walend
15a29e91802Todos for SHRINE-2145
bendcarmenbendcarmen
d809b4dbf23Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
9591bdee34bMerge pull request #16 in SHRINE/shrine from bugfix/SHRINE-2150-add-breakdowns-to-the-json-structure to develop * co...
David WalendDavid Walend
9b4754bdf4fReusing the ResultOutputType for now in SHRINE-2150
David WalendDavid Walend
b4c47c9d13fGot breakdowns into a structure to deliver for SHRINE-2150
bendcarmenbendcarmen
fa2340a9550Fix of steward create new topic
bendcarmenbendcarmen
220cf9f0e0aMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
e51e94c6c21Code cleanup...removal of some testing code and dead code
yifan xingyifan xing
565e4e6ac5cfixed bug in vagrant_deploy.sh
bendcarmenbendcarmen
fa3b9f2ba39code cleanup
bendcarmenbendcarmen
37d75e2f04eMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
aff46c445a6Polling and UI wired up
David WalendDavid Walend
9ea8edcc1c0Merge branch 'develop' into feature/SHRINE-2140-quickly-return-the-network-query
David WalendDavid Walend
faaefafae22Added problem recording for SHRINE-2140
David WalendDavid Walend
47c757c0380AbstractQepService no longer waits for a response from the hub before replying to the web client. SHRINE-2144
Yifan XingYifan Xing
7c1ca895f39Merge pull request #14 in SHRINE/shrine from ~YXING/shrine:mavenpom to develop * commit 'c02fe11625ae64faf138c014de7...
yifan xingyifan xing
c02fe11625aAdded shrine-node1 to machines
David WalendDavid Walend
f47bff5d7d7Assembles a new, result-free reply for SHRINE-2140
yifan xingyifan xing
24c2672e984shell script
yifan xingyifan xing
d21f782ab95use maven to trigger the script, which automatically deploy app to vagrant box
David WalendDavid Walend
10ae225a0ccFirst step of SHRINE-2140. I'm able to change the statusTypeName element in the i2b2 xml (need to verify)
David WalendDavid Walend
8a42eba8490Merge pull request #12 in SHRINE/shrine from feature/SHRINE-2141-give-the-qep-the-ability-to-send to develop This ch...
David WalendDavid Walend
b8ae2e5f984Quick fix for a minor blit. This should really be end-of-path as we take the rest of the details from request paramet...
David WalendDavid Walend
a896ddb9235Main body of work for SHRINE-2141 . I added new web API and database calls to provide the latest results for just one...
David WalendDavid Walend
d70a69cf0d2First step of SHRINE-2141 - rename the existing API to the more precise queryResultsTable. I also cleared up a cut/pa...
bendcarmenbendcarmen
a7351024772UI Bidning and scaffolding for query status
yifan xingyifan xing
e49eab71f53added new exec plugin in maven pom file, for triggering local shell script, not sure if it will work
bendcarmenbendcarmen
1ac33115ca1Sprint 5, removal of query status
David WalendDavid Walend
ef6dcf5654aMerge pull request #10 in SHRINE/shrine from feature/SHRINE-2117-integrate-hornetq-with-the-rest to develop * commit...
David WalendDavid Walend
2f5f136c16bQuick update of a todo to wrap up SHRINE-2118
David WalendDavid Walend
13fd9598924stopping after running all tests
David WalendDavid Walend
d8ba6ffc36bNow only creates queus if they are absent
David WalendDavid Walend
fa3998db96fDelete queue for SHRINE-2118
David WalendDavid Walend
263faa512f3List queues for SHRINE-2118
David WalendDavid Walend
3ee4b1f9b34Got complete in place for SHRINE-2118
David WalendDavid Walend
42a9d82483fCode cleanup for SHRINE-2118
David WalendDavid Walend
5ab29e8c863Got receive working for SHRINE-2118
David WalendDavid Walend
70e640fc6c0Got send working. Was configured to ask for a commit before sending in the example session. SHRINE-2118
David WalendDavid Walend
052ef964fd1More pieces and progress toward SHRINE-2118. Create a Queue and the beginnings of deleting a queue and sending a mess...
David WalendDavid Walend
86735426cf1Separatd the stopping code for SHRINE-2117.
David WalendDavid Walend
30ec6409eefWrapping up work for SHRINE-2117. HornetQ is starting to come together for us.
David WalendDavid Walend
e636b50e0ebGot a message to flow in a test case for SHRINE-2117
David WalendDavid Walend
55b8efc3b08Added HornetQ to the works. SHRINE-2117
bendcarmenbendcarmen
a8e9767611bBump of the version from 1.23.4.1-SNAPSHOT to 1.23.5.1-SNAPSHOT
bendcarmenbendcarmen
728b3a41015Query Status completed, tooltip adjusts placcement if mouse is over the topmost element in the query viewer
Yifan XingYifan Xing
548174965b3Merge pull request #9 in SHRINE/shrine from ~YXING/shrine:deleteabout to develop * commit '08ef03c56bc7e4c86a21e084f...
yifan xingyifan xing
08ef03c56bcdeleted about in route
yifan xingyifan xing
9271095c008Merge branch 'deleteabout' of https://open.med.harvard.edu/stash/scm/~yxing/shrine into deleteabout
yifan xingyifan xing
11624c9440bdeleted 'About'
Yifan XingYifan Xing
30ba7bb8652Merge pull request #8 in SHRINE/shrine from webapi to develop * commit '7383efedea43fea4e0ecdc1600b88aaeec62ef31': ...
yifan xingyifan xing
4d4dbf68583deleted 'About'
bendcarmenbendcarmen
0b51a84afdfAddition of query status and tooltip
yifan xingyifan xing
7383efedea4used org.json4s.native.Serialization for unit testing
David WalendDavid Walend
b1317c6d508Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
521fe95cc68Fix for SHRINE-1455 - default value of authorizationType from a reference.conf
bendcarmenbendcarmen
bbf3435c639Start of the status component for query viewer
David WalendDavid Walend
f721d24d0d5Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
5fe2d958b26Database indexing to speed up previous queries for SHRINE-2084.
yifan xingyifan xing
f5b8266bd4cused custom apply() to construct AppVersion
David WalendDavid Walend
a7688cb5ae2Merge pull request #7 in SHRINE/shrine from davePullRequests to develop * commit '0948b86c3c08ee61c1c67cfa1e3cfe7bff...
David WalendDavid Walend
6211cb1c218Revert "Added some temporary logging to see what is slow" This reverts commit c8f2b15dce4100afc6c86538c9af8a1eea9de2c5.
David WalendDavid Walend
c8f2b15dce4Added some temporary logging to see what is slow
yifan xingyifan xing
6d6a0955e57revert code format
yifan xingyifan xing
5eca769840boptimized imports and cleaned up code format
yifan xingyifan xing
86e45da8a82added web api call to check the current version of the app, implmented tests
David WalendDavid Walend
0948b86c3c0Merge branch 'develop' into davePullRequests
David WalendDavid Walend
546ba881845Added ProblemDigests to json for the new table for SHRINE-2096
bendcarmenbendcarmen
0141e09a80cMore cleanup of style layout for query viewer
David WalendDavid Walend
ee6a33ad8e3Moved the query flag infomration from a map appended to the data structure to a component of the query cell. SHRINE-2094
bendcarmenbendcarmen
cd7ed6aefb8Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
b78767bdd96Updates to query viewer HTML
David WalendDavid Walend
7e35dade7e1Fix for SHRINE-2051 , no need for downstreamNodes section in shrine.conf
David WalendDavid Walend
cfd8749587aCleaning up some todos before mothballing SHRINE-2055
David WalendDavid Walend
5e347575f08Cleaning up some todos before mothballing SHRINE-2055
bendcarmenbendcarmen
a245d83b4b9Added pagination
bendcarmenbendcarmen
d2b81dbff05Merge of refactored performance optimized query viewer
bendcarmenbendcarmen
4522b86b886Merge branch 'feature/performance-refactor' into develop
bendcarmenbendcarmen
6e24f34904cWOrking
LukeLuke
f2b3826d37dMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
LukeLuke
3a0188ae7afThis commit is for seting up previous queries for custom test cases
bendcarmenbendcarmen
6a43f33c58cPerformance Refactor
bendcarmenbendcarmen
4919444d783accidentally removed parent version from pom.xml in shrine-adapter client
bendcarmenbendcarmen
67e4fa8df61Merge of 1.23.3 into 1.23.4.1
bendcarmenbendcarmen
fd384588394Potential fix of SHRINE-1954
bendcarmenbendcarmen
7948385f5acBumped version from 1.23.3.2-SNAPSHOT to 1.23.3.3-SNAPSHOT
bendcarmenbendcarmen
a8f55b8b87dFix of missing scroll bar
bendcarmenbendcarmen
f8c02d495fdFix of SHRINE-2033
bendcarmenbendcarmen
197162d8fe1Fix for SHRINE-2019
bendcarmenbendcarmen
b989026a9adSHRINE-2083
bendcarmenbendcarmen
36d65dc81f8Fix of SHINE-2083
bendcarmenbendcarmen
4edd0bfddebRoll in the fix of 2047
bendcarmenbendcarmen
1bc822146besome debug cleanup
bendcarmenbendcarmen
b5656a70525Fix of SHRINE-2061
bendcarmenbendcarmen
6d4b0391cffMerge of release/1.23.3 in order to make sure nothing was paved over.
bendcarmenbendcarmen
ccbb55214eaMerge branch 'release/1.23.3' into develop
bendcarmenbendcarmen
b7d87204371Potential fix of SHRINE-2061
bendcarmenbendcarmen
7e3852574e3Fix of SHRINE-2047
bendcarmenbendcarmen
e2f34881af2Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
734fd84a912Fix of SHRINE-2408
David WalendDavid Walend
e0465830b18Removing the old combined ddl files for SHRINE-2065
David WalendDavid Walend
dced80ee359Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
859070ddbf9Cleaned up some todos. Added shrine's version. SHRINE-2055
bendcarmenbendcarmen
dfc22142371Update pom file to 1.23.3.2-SNAPSHOT
bendcarmenbendcarmen
39857013e33updated POM from 1.23.3.2-SNAPSHOT to 1.23.4.1-SNAPSHOT
bendcarmenbendcarmen
a8847140d2dupdated POM from 1.23.3.1-SNAPSHOT to 1.23.3.2-SNAPSHOT
bendcarmenbendcarmen
8cd73ec081cMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
e946c7a14cbAddition of pop up for errors
David WalendDavid Walend
40692c8cb1cFound where exceptions went for SHRINE-2055
David WalendDavid Walend
10ef0e1b310Have almost all of an optimistic transaction for SHRINE-2055
David WalendDavid Walend
cfead617c8eMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
627efa00cd3More tests for SHRINE-2055
David WalendDavid Walend
5eda0ba2da9More tests for SHRINE-2055
David WalendDavid Walend
70deb41aea5More tests for SHRINE-2055
David WalendDavid Walend
c2533be3d05More tests for SHRINE-2055
bendcarmenbendcarmen
4d5377f1f5eFix of some erroneous logic
bendcarmenbendcarmen
300a533ac3bUtilizing rowCount when calculating when to run update on scroll
David WalendDavid Walend
a869ab868ecSome API cleanup for SHRINE-2055
David WalendDavid Walend
41a2f264e66Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
c44fe20b950Existence tests for shrine results for SHRINE-2055
bendcarmenbendcarmen
baee7a5f50aMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
b2982d63925Updated infinite scroll hanlder
David WalendDavid Walend
0375fbc294bAlmost ready to test low-level db operations for SHRINE-2055
David WalendDavid Walend
946405a34dfSome work on the test shrine.conf has to be merged for SHRINE-2057
David WalendDavid Walend
71525b6eae7Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
a79d8dafc67Some work on the test shrine.conf has to be merged for SHRINE-2057
David WalendDavid Walend
b40f08975a6Added row count and offset to ResultsTable for SHRINE-2072
bendcarmenbendcarmen
7c4fe1667eePrevent scroll from initiating fetch call if another is already running.
bendcarmenbendcarmen
c86a179e712Compiled
bendcarmenbendcarmen
6dda462f775Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
7f904fb6724Test of infinite scroll on dev1
David WalendDavid Walend
285654fb068First pass at database code. Next up is some unit tests, then more code for SHRINE-2055
David WalendDavid Walend
6f14502337bMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
4a722814aaeHarvard head of IT security asked us to purge default i2b2 password. SHRINE-2067
David WalendDavid Walend
036d819e29aHarvard head of IT security asked us to purge default i2b2 password. SHRINE-2067
David WalendDavid Walend
afda99b0b70Harvard head of IT security asked us to purge default i2b2 password. SHRINE-2067
David WalendDavid Walend
0cb1698aa21Harvard head of IT security asked us to purge default i2b2 password. SHRINE-2067
David WalendDavid Walend
e92c2f29419Harvard head of IT security asked us to purge default i2b2 password. SHRINE-2067
David WalendDavid Walend
a44899ee713Harvard head of IT security asked us to purge default i2b2 password. SHRINE-2067
David WalendDavid Walend
5659006e202Harvard head of IT security asked us to purge default i2b2 password. SHRINE-2067
bendcarmenbendcarmen
94ad40fc756simplified i2b2 service
bendcarmenbendcarmen
7ce558f34c3cleaned up verison of the i2b2 service
bendcarmenbendcarmen
1b8fce6d045Proof of concept for update queries on scroll
bendcarmenbendcarmen
44ede140257Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
b2187a0659fpossible solution for seeing queries immediatley in viewer
David WalendDavid Walend
107a830bdd2Created separate ddl files for shrine_query_history and adapterAuditDB as step 1 of SHRINE-2065
David WalendDavid Walend
cc852424e19Updated scala to 2.11.11 SHRINE-1982
David WalendDavid Walend
c7c0b97cc2fProject structure for json store, SHRINE-2055
bendcarmenbendcarmen
c62afdd5bb6This MIGHT be the solution for showing queries that are running immediatley
bendcarmenbendcarmen
4d80287f935Fix of parsing data coming back from i2b2 query init
bendcarmenbendcarmen
ff6b1c10f73latest
bendcarmenbendcarmen
811c7d15e7fproof of concept for handling query start from i2b2
David WalendDavid Walend
a91c2c99f5fMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
d04f9f7f029First try at SHRINE-2053, gather up all the install files in one zip file
bendcarmenbendcarmen
af27705278ePossible fix of scoping issue when SHRINE controller overrides i2b2 _queryRun method
bendcarmenbendcarmen
e43ea79d8e1this one makes more sense
bendcarmenbendcarmen
1381aee2a5da little easier on the eyes version of i2b2.service
bendcarmenbendcarmen
97b361bf7c4latest version
bendcarmenbendcarmen
8076f0be9baRefactored i2b2.service.js to incorporate ramda library
bendcarmenbendcarmen
fd55efb62f2Addition of Ramda library
bendcarmenbendcarmen
d66141e121blatest version
bendcarmenbendcarmen
41fe5b24fd9change to gitignore
bendcarmenbendcarmen
5d065c23a11Addition of font awesome
bendcarmenbendcarmen
eeaf7c7b15dcommit of export/jspm_packages/
bendcarmenbendcarmen
1c3eda6a68eMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
84696737021Added refresh to context menu
David WalendDavid Walend
089054f771cPossible fix for SHRINE-2043 and maybe the last piece of ITEAM-1432
bendcarmenbendcarmen
19cb2b62cebmore loader refinement
bendcarmenbendcarmen
21a8fdea77crefined loading bar
bendcarmenbendcarmen
9e9f46a014aMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
158d72bb403Added a loading bar
David WalendDavid Walend
febd06d7ffeMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
44acd154509Overriding eq is a bad idea. Renamed to sameStatus.
Next →