Homec4science
Diffusion SHRINE MedCo Fork febd06d7ffec

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
febd06d7ffec
Actions

Authored by David Walend <david_walend@hms.harvard.edu> on May 4 2017, 16:57.

Description

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop

Details

Committed
David Walend <david_walend@hms.harvard.edu>May 4 2017, 16:57
Pushed
mickmisOct 25 2017, 14:31
Parents
R2664:44acd1545090: Overriding eq is a bad idea. Renamed to sameStatus.
R2664:c069b562ec16: Tweaks to pop-up menu
Branches
Unknown
Tags
Unknown

Event Timeline

David Walend <david_walend@hms.harvard.edu> committed R2664:febd06d7ffec: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by David Walend <david_walend@hms.harvard.edu>).May 4 2017, 16:57

Merged Changes

CommitAuthorDetailsCommitted
c069b562ec16bendcarmen
Tweaks to pop-up menu 
May 4 2017
0ef471e4c4a5bendcarmen
Functioning right click menu and call to load previous query into query viewer 
May 3 2017
3d1198dbf4cebendcarmen
latest 
May 3 2017

Changes (27)

Path
Mapps/steward-app/src/main/js/app/assets/css/shrine.css
Mshrine-webclient/src/main/js/client/js-shrine/assets/css/styles.css
Mshrine-webclient/src/main/js/client/js-shrine/config.js
Ashrine-webclient/src/main/js/client/js-shrine/dist/app-build.js
Pshrine-webclient/src/main/js/client/js-shrine/dist/aurelia.js
Copied from shrine-webclient/src/main/js/client/js-shrine/export/dist/aurelia.js
A(dir)shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/context-menu/
Ashrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/context-menu/context-menu.html
Ashrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/context-menu/context-menu.js
Ashrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/context-menu/context-menu.js.map
Mshrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.html
Mshrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.js
Mshrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.js.map
Mshrine-webclient/src/main/js/client/js-shrine/export/assets/css/styles.css
Mshrine-webclient/src/main/js/client/js-shrine/export/config.js
Mshrine-webclient/src/main/js/client/js-shrine/export/dist/app-build.js
Pshrine-webclient/src/main/js/client/js-shrine/export/dist/aurelia.js
Copied to shrine-webclient/src/main/js/client/js-shrine/dist/aurelia.js
Mshrine-webclient/src/main/js/client/js-shrine/export/index.html
Mshrine-webclient/src/main/js/client/js-shrine/gulp/bundles.js
Mshrine-webclient/src/main/js/client/js-shrine/index.html
Mshrine-webclient/src/main/js/client/js-shrine/package.json
A(dir)shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/context-menu/
Ashrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/context-menu/context-menu.html
Ashrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/context-menu/context-menu.js
Ashrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/context-menu/context-menu.scss
Mshrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.html
Mshrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.js
Mshrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.scss

R2664:febd06d7ffec

View Options

apps/steward-app/src/main/js/app/assets/css/shrine.css

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/assets/css/styles.css

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/config.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/app-build.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/aurelia.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/context-menu/context-menu.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/context-menu/context-menu.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/context-menu/context-menu.js.map

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/query-viewer.js.map

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/export/assets/css/styles.css

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/export/config.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/export/dist/app-build.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/export/dist/aurelia.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/export/index.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/gulp/bundles.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/index.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/package.json

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/context-menu/context-menu.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/context-menu/context-menu.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/context-menu/context-menu.scss

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.scss

Loading...
c4science · Help