SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
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.
bendcarmenbendcarmen
c069b562ec1Tweaks to pop-up menu
bendcarmenbendcarmen
0ef471e4c4aFunctioning right click menu and call to load previous query into query viewer
bendcarmenbendcarmen
3d1198dbf4clatest
David WalendDavid Walend
ad8d71e09b7networkIds as strings for SHRINE-2029
bendcarmenbendcarmen
f3a8c9cf163first crack at loading a previous query from plugin
bendcarmenbendcarmen
1b259b5cce9merge of branches/1.22.3-SNAPSHOT
David WalendDavid Walend
116ed0a57a1Some cleanup of command line output for SHRINE-2021
David WalendDavid Walend
db4f7a91d82Main of a tool to create fake query results to test the previous query table. SHRINE-2021
bendcarmenbendcarmen
638adaac8ceFix of SHRINE-1954
bendcarmenbendcarmen
e803a1743c9fix of SHRINE-1875
TyTy
0357890d962deleted happy, fixed mvn
bendcarmenbendcarmen
171c27b3986Fix of SHRINE-2012
TyTy
bba2e9300d6Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
bc60ca68b25some optimization
David WalendDavid Walend
26924254f26Possible fix for SHRINE-2013, missing db config for problem db
David WalendDavid Walend
c1eb5b8afcdPossible fix for SHRINE-2013, missing db config for problem db
David WalendDavid Walend
2431c34a12dMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
e36085362b0Possible fix for SHRINE-1956, sets akka { //don't kill the jvm if something goes wrong in akka jvm-exit-on-fatal-...
bendcarmenbendcarmen
397cca580e3Fix of SHRINE-1952
Sam TsoiSam Tsoi
628da7f02bdRemoved acceptAllCerts line from shrine.conf
David WalendDavid Walend
3c0ac219a7dMade trustModelIsHub = true the default in a new reference.conf for SHRINE-1957
bendcarmenbendcarmen
a6759ea2bb9fix of styles for max vs. min query viewer
bendcarmenbendcarmen
b108060ca33latest css changes
bendcarmenbendcarmen
4b0f7df8b91Fix of max and min styles for query viewer
bendcarmenbendcarmen
6307592ffd7addition of i2b2 API service, subscribed to resize and history refresh events
bendcarmenbendcarmen
cf3e8013313Fix of SHRINE-1996
bendcarmenbendcarmen
14df74d37aaFix of SHRINE-1992
David WalendDavid Walend
5942067c2e9Created the 1.23.2 branch for QA. Moved the pom.xml to 1.23.2.4
bendcarmenbendcarmen
7e04492295bChanged the version from 1.22.2.3 to 1.22.3.1
bendcarmenbendcarmen
18c2f9d0b2cabsolute latest, with fix for displaying 10 or fewer
bendcarmenbendcarmen
6f2dcb7338aFix of SHRINE-1991
bendcarmenbendcarmen
e0ad650c191added more unit tests
bendcarmenbendcarmen
d12aa03378cClear sessionStorage on logout
bendcarmenbendcarmen
fbb2c78e1a7Fix of removing sessionStorage too soon
bendcarmenbendcarmen
451416f277clatest and greatest
bendcarmenbendcarmen
eccb23cc030Refactor of UI for performance
bendcarmenbendcarmen
8316bf2400dRefactored repo
TyTy
9f8a697c2b0Made x509 TrustManager failure in HttpClient more robust
bendcarmenbendcarmen
da9db3280e8Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
8514d6a5052Fix of the repository url
TyTy
4cc83d16fc7Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
TyTy
7ac952d2b9bHTTPS clients will now fall back to java installed CA Certs
bendcarmenbendcarmen
f3b6e3f1fdaQuery Viewer code is added
Ansible DeployAnsible Deploy
eac506817f4Merge release branch branches/1.22.7 into master.
Ansible DeployAnsible Deploy
1b66bad9fe1Update POMs with release version 1.22.8.
Mike CherryMike Cherry
7ac374920f0Updating version number in *all* poms, recursively
Mike CherryMike Cherry
674440432d4Updating version number to 1.22.8 in preparation for running GitFlow release
David HummelDavid Hummel
d9a18a675f3Revert test <distributionManagement/> section. (ITEAM-390)
TyTy
f3bedf49b42triple equality
TyTy
996c4274c87added missing import statements
TyTy
b57de39a11akeystore panel displays Yes/No instead of true/false
TyTy
b34ae2e71a3Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
TyTy
3fdcd37f54cfurther work on json storage and representation
David WalendDavid Walend
7148491ad19Human-readable output from the new qep service, thanks to Ty. SHRINE-1980
David WalendDavid Walend
c2c6f3dd9c1Less in the json to help Ben read it. SHRINE-1980
David WalendDavid Walend
6219afa7fc7More for SHRINE-1981, shrine.war needs slf4j-log4j
David WalendDavid Walend
e35a041e123More for SHRINE-1981, shrine.war needs slf4j-log4j
David WalendDavid Walend
51975eaa076Removed slf4j-simple for SHRINE-1981
David WalendDavid Walend
44c1bedf7a7pom.xml file fix for SHRINE-1981, only slf4j-log4j in the war files
David WalendDavid Walend
21b0f90c22bTy's changes to handle dashboard downstream port numbers from develop
Simon ChangSimon Chang
7ffc8bc5787Merge pull request #6 in SHRINE/shrine from ~SCHANG/shrine:release/1.23.2.3 to develop * commit '88fb1927364033aca2d...
David WalendDavid Walend
c9ad75857e9Removed slf4j-simple for SHRINE-1981
David WalendDavid Walend
ddd77424e95Removing extra debug logging
Simon ChangSimon Chang
88fb1927364Change test location to directory on local file system. (ITEAM-390)
David WalendDavid Walend
f97ae384453Logging in the database layer to debug why it is so slow
David WalendDavid Walend
0805adc914bTrace logging for SHRINE-1963, plus a missing default config value.
David WalendDavid Walend
f61baf7e8fbMoving a missing reference.conf property to where it is needed
bendcarmenbendcarmen
4eee2a84f05started styling the status of pending and error
David WalendDavid Walend
c282fd006a4Not the prettiest json, but should be good enough for testing. SHRINE-1964
David WalendDavid Walend
963b2811b33Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
9f8e49b83c3Wrap up SHRINE-1963, db testing work, and most of SHRINE-1964
bendcarmenbendcarmen
b7c36216461merge of branch feature/sprint2 - which is the branch used for the query viewer
bendcarmenbendcarmen
fb149f6ed4bmerged develop into feature/sprint2
David WalendDavid Walend
5ab58d36d9eUpdating to 1.23.2.3-SNAPSHOT
bendcarmenbendcarmen
80fd54e90ceshrine plugin parent child iframe route selection
David WalendDavid Walend
21feb334cb3Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
df5b3b56fa8Code changes to get data flowing for SHRINE-1963
bendcarmenbendcarmen
5e7831451f6Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
4e832185eb7added yui files
TyTy
de28626f3ffMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
TyTy
a2c6fe2924dTesting with different drivers, wrote cross table query and can produce it in json
bendcarmenbendcarmen
e24f5086badlatest
David WalendDavid Walend
973b92b4eb0Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
6284d114017DB changes to support previous queries view (for now) SHRINE-1963
Next →