SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
TyTy
b3ea22479cedug the modified date out of the class path for mappings file
TyTy
5e79894fc65Merge branch 'develop' into feature/new-crypto
TyTy
e2e0d9be493merge conflicts in problems controller
TyTy
60468efc7bfmerge conflicts in diagnostic
TyTy
cea3654e998fixed conflict in dashboard pom
TyTy
24d092ff3bbMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
TyTy
980c37ec1famerge conflicts
ben-carmenben-carmen
f8ef7d8ca29created ontology-term.service.js and ontology-term.factory.js and related tests
TyTy
ef27c9e7786initial import of bouncy-castle/cryptacular, style changes
ben-carmenben-carmen
2cd8e14505blatest
ben-carmenben-carmen
e62c2f2dbc1added getUserQueryHistory method to statistics.model.js along with unit test in statistics.model.spec.js
David WalendDavid Walend
49e4df31197Found commons-email in the pom.xml, which we don't use.
ben-carmenben-carmen
54727f32614added unit tests for statistics.model.js
ben-carmenben-carmen
950c6fe2cc1adding unit tests for statistics.model.js
ben-carmenben-carmen
10ecc7d15d7cleanup
ben-carmenben-carmen
8ee0161d87dcleanup of statistics module
TyTy
44c1fa42c88Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
TyTy
814d167d7e5uncommented test, change formatting/comments
ben-carmenben-carmen
743418b93bacleanup of statistics module
ben-carmenben-carmen
3c6e04f36c9cleanup of steward app
David WalendDavid Walend
0b351780dd7Fix for SHRINE-1640. Better error message for nothing to aggregate.
David WalendDavid Walend
9562909834eMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
2d39d6dbc95Added a comment about the bounds of obfuscation
ben-carmenben-carmen
8364b69a03eFix for SHRINE-1382: QA tier: Query tool: Drop down appearing below Query Name is getting truncated
TyTy
45e08dbe92aMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
TyTy
9c5c81272a5Change to throw a ConfigError on parsing incorrect objects from config
ben-carmenben-carmen
43095f57cc2Fix for SHRINE-1446
David WalendDavid Walend
6f4a465cb2cQuick fix for a test bug in SHRINE-1714
David WalendDavid Walend
56e8ed44989Fix for SHRINE-1644 - better error message when a delete query request has a non-number id
TyTy
0b5c006001cbutton change
TyTy
3afea8008d6Problem log slight error reporting improvement
TyTy
07a31ad30f4Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
TyTy
aba13b45b20Added max date to datepicker, fixed datepicker not popping up
David WalendDavid Walend
f270ca92266Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
ed462ed3289More for SHRINE-1714, tests for small and smallish results.
TyTy
af06a62fb58title change, remove logs from idle, description field change
TyTy
0e645633336Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
TyTy
0261ef7df2afixed Authorization/tomcat7:run issue
David WalendDavid Walend
75e56789a08More for SHRINE-1714, better behavior for small results.
David WalendDavid Walend
21a9370b972Possible fix for SHRINE-1689
David WalendDavid Walend
c62a028c02dPossible fix for SHRINE-1689
David WalendDavid Walend
6e9fcf61a01First step of fixing SHRINE-1714
TyTy
0df33e44371trying to fix optionalParts Authorization header
Ben CarmenBen Carmen
f571d119036Merge pull request #4 in SHRINE/shrine from ~NWATTANASIN/shrine:feature/i2b2-merge to feature/i2b2-merge-to-develop ...
TyTy
c055b3789edrewired the Dashboard to use the Status backend
TyTy
beb14e86bc8updated Status summary call to display query response
ben-carmenben-carmen
6aee660c8daFix of SHRINE-1446 was not allowing calendar to select date
TyTy
b6a8f85e90fMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
TyTy
a4d8984aa64actual gitignore update w/out cruft
TyTy
0f6215c6fe3Revert "gitignore update" This reverts commit 7038d86193c120d14a898a839c0b5b1a1b03a504.
TyTy
7038d86193cgitignore update
TyTy
38bafa7a76aMerge branch 'release/1.22.1' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.22.1
TyTy
29775c4e522updating to 1.22.1.4-SNAPSHOT
TyTy
c280bbdfd30further work on hooking up to SubStatus service
ben-carmenben-carmen
8b069cb547bFix of SHRINE-SHRINE-1470 [Webclient] Define order of Events dropdown is overlapping with other operator and instruct...
ben-carmenben-carmen
351e4f4d972Fix of SHRINE-1446 Application is returning results in case of incorrect Date filter also
TyTy
00636da75a8setup backend status routes and tests
David WalendDavid Walend
6c457a4beddFix for SHRINE-1684 - typo in obfuscation
TyTy
9e168cf6967actual epoch fix
TyTy
f41185671bafixed epoch caching
TyTy
0a45747e2c1pagination after date search fix
TyTy
577223e2bceclose to replacing happy, need to fix summary and adapter
TyTy
7599681d68achanging front end to use Substatus Service
TyTy
0034ac01bbemerging steward changes
TyTy
aef223a13fccleaned up log in problems; changed startup command in dashboard
TyTy
d16cecb11fcMerge branch 'release/1.22.1' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.22.1
TyTy
ea1e3b2b7e3updated poms to 1.22.1.3
ben-carmenben-carmen
3f460cfac25commit of latest changes
NichNich
5a20337973eGraph improvements
TyTy
f9a4dca10afmerging datepicker/steward call changes
TyTy
cfed12df5caMerge branch 'release/1.22.1' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.22.1
TyTy
5388fae1d8bchanged input to a button, updated steward query call
ben-carmenben-carmen
f0c2a9106c5fix for SHRINE-1436 "Dropdown Name Temporal Constraint is Missing"
ben-carmenben-carmen
7b956a7867ffix for SHRINE-1436 "Dropdown Name Temporal Constraint is Missing"
ben-carmenben-carmen
a75c497fab0fix for SHRINE-1436 "Dropdown Name Temporal Constraint is Missing"
ben-carmenben-carmen
799e1b5ca58fix for SHRINE-1436 "Dropdown Name Temporal Constraint is Missing"
ben-carmenben-carmen
ae1ce427adcResearcher is unable to see Approved and Rejected Topics.
ben-carmenben-carmen
72289cac571Fix of SHRINE-1612 "Statistics Tab, the date for "Start Date" is not set for 7 days before the current date.
TyTy
72c4fe2b8ecmerging
TyTy
976f23f69cfMt push erge branch 'release/1.22.1' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.22.1
TyTy
256455139bffixing lines if else error
ben-carmenben-carmen
3379f48f708Merge branch 'release/1.22.1' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.22.1
ben-carmenben-carmen
28efe25db0fFix for SHRINE-1610: User is unable to see the Approved and Rejected topics
TyTy
d95aaad2009fix ie11 jump-to-home bug and pointer styles w/out cruft
TyTy
6d14a491bd3Revert "fix ie11 jump-to-home bug and pointer styles" This reverts commit 383fb493a8e023d8d5ba96287ca6576e4433e150.
TyTy
383fb493a8efix ie11 jump-to-home bug and pointer styles
TyTy
1496a137710updated pointers
TyTy
bd1904e8750trying to remove #
TyTy
efb69fe42d6debugging ie11
TyTy
5a87d9f5beachanging npm version to install for steward/pom.xml w/out other cruft
TyTy
e5d94ef5233Revert "changing npm version to install for steward/pom.xml" This reverts commit bd7500fac79d4a4cc05c6f754b3ebc8bd2d...
TyTy
bd7500fac79changing npm version to install for steward/pom.xml
TyTy
627b6128856pom update
TyTy
77180bc3019removing debug statement from test
TyTy
74d6556290cmerging
TyTy
10d213d74a2debugging ie11
ben-carmenben-carmen
b00e009a575adding the steward query term demo source
ben-carmenben-carmen
53c9adb14edcommit of latest /shrine/tools/js/
ben-carmenben-carmen
b77b87cd692created i2b2 msg parser project
ben-carmenben-carmen
f1f28ca8314latest
ben-carmenben-carmen
b181db5db14adding /js/ direcotry
ben-carmenben-carmen
c006c8a550dlatest version, trying to add a directory for js
ben-carmenben-carmen
14de6430039moved /js/ directory to shrine root instead of tools
ben-carmenben-carmen
e869af5ff45added /js-tools/ directory to shrine/tools/
TyTy
d940e2bd1edie11 doesn't support string includes
TyTy
17ec67012e8ie11 doesn't support string includes
TyTy
4d310f0bd73fixed navigating back to page 1
TyTy
ee82862e97bexplicit checking if something is null, instead of relying on truthiness
TyTy
522428426c4Arrows will no longer appear on dashboard for first or last page
TyTy
bbc0b00e471Arrows will no longer appear on dashboard for first or last page
TyTy
aed22519d20updated problem log to rememebr the last settings it was used with
TyTy
07bdd6dfd34typos
TyTy
c0513641dfemade problems into a closure to save state of last page
TyTy
b7df2224410flipped equality sign on pagination
TyTy
5aa798ca187flipped equality sign on pagination
TyTy
13f889775adremoved in from parse stack trace
TyTy
97df42b4b38removed in from parse stack trace
TyTy
a3b8f99e9c3merging release/1.22.1 problem log changes
TyTy
d19f66b6e1dupdated pagination to not violate ellipses
TyTy
ffa78ea7641300 em -> 50 em
TyTy
d6355705904updated placeholder
TyTy
9c1ae09fe51fixed config test resources
TyTy
c3cba37cbe7added min height to calendar
TyTy
54180ec8348Merge branch 'release-temp' into release/1.22.1
TyTy
a2e6e04c9b1removed default date to implement responsive button
TyTy
84b84da66ffremoved ng-idle from bower
TyTy
0c742bcbc17Revert "removed ng-idle" This reverts commit 27eb7a491068de845b65cb5a597ddcc8407580b4.
TyTy
27eb7a49106removed ng-idle
TyTy
eb3865fe393removed ng-idle from bower
TyTy
4f5a0750684Revert "uncommented pom" This reverts commit d4c783fc43303ed3d1b904199508053df15fe626.
TyTy
d4c783fc433uncommented pom
TyTy
7f580688cadupdated pom versions
ben-carmenben-carmen
eac8b2ac20eFix of SHRINE-1482
TyTy
0dd8b597ef8Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
TyTy
8e8f599fdcctemp
TyTy
50054468ccfQA dashboard revisions
TyTy
ad52afb8f40WIP on getting reactive button
ben-carmenben-carmen
3897a61ced6latest version
ben-carmenben-carmen
26b9c7866adMerge branch 'release/1.22.1' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.22.1
ben-carmenben-carmen
3c0cad851e4fix of SHRINE-1670 and SHRINE-1671
TyTy
d67a321607avertically aligned paginator elements
ben-carmenben-carmen
9d1b4bc7af8update of .gitigore file to universally ignore all bower and node_package libraries, and to ignore js client build ar...
ben-carmenben-carmen
5fc4fce58d9added a /js/ directory under shrine/tools/ this directory will contain all node and js libraries that are not for a ...
TyTy
0f3d1533ea0increased z-index for footer
TyTy
a68151aa88dplaceholder date text
TyTy
1d1553f1787changed close text of date picker
TyTy
8991107f5d5paginator background color
TyTy
449aa1f47dabackground color change
Keith DwyerKeith Dwyer
0bbc3afab22mvn versions:set -DnewVersion=1.22.1.1-SNAPSHOT (preparation for next QA cycle)
TyTy
8750ddeceeaactually returning string from status config call
TyTy
2feac7947f4added back necessary config fields for other tabs
TyTy
ceaf26301d2deleted ng-idle
TyTy
32b57ee2a2dshows all of config, sorts keys
TyTy
7630d7f027fremoved filter
TyTy
7587c0f87e9submit calendar button
TyTy
e1b87e2334eMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
bd3ea25a98cMore logging for SHRINE-1546
TyTy
1fcba059038bug fix on preprocess, was duplicating leaf term
David WalendDavid Walend
b1fa113c406Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
7b3e29d4f54Added a bit of logging
TyTy
903f82730b6preprocess front end to pull apart periods
TyTy
d16247d6c3fremoved get config
TyTy
09308937ad7revert factory
TyTy
5b30638276ausing a different config factory
TyTy
0f9c825e460replacing shrine key filter
TyTy
adb140154baremoved peeling away layer of config
TyTy
aa04ae25376Testing sending all of config
TyTy
89d2fde5f45Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
TyTy
2e7d44a01b2path was truncuated, changed lookup from shrine.networkStatusQuery to just networkStatusQuery
David WalendDavid Walend
995af4a8428Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
TyTy
08a6ec401c8dashboard debugging config route
David WalendDavid Walend
2b47beaab25Configurable obfuscation, SHRINE-1546
TyTy
56bf185f053Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
TyTy
21d52767075removed debug statements
TyTy
68df4be316bremoving filter
Keith DwyerKeith Dwyer
295b75ff7dare-adding vestigial pom.xml to quell a merge conflict
TyTy
0fec3e1b232testing dashboard endpoint
TyTy
6c63f142e20detailed debug info
TyTy
9e9398125d2further debugging of JSON serialization
TyTy
a5b67989473further debugging
TyTy
5c0a3c52cd9debug printing
TyTy
89647506343removed erroneous trait
TyTy
a3f8290535efixed a test working off of dashboard.conf
TyTy
1fc83309c01renamed steward.confs to shrine.conf
TyTy
ceefcb24e13switched configs to use shrine.conf
TyTy
3abbd69515bremoved typo
TyTy
344bb8b14c0made merge script work with up to 3 files at once
TyTy
616ee0233e2added merge script
Next →