Homec4science
Diffusion SHRINE MedCo Fork 1055499b8d49

Merge branch 'release/1.23.5' into feature/SHRINE-2148-define-the-statuses-to…
1055499b8d49
Actions

Authored by David Walend <david_walend@hms.harvard.edu> on Sep 7 2017, 19:13.

Description

Merge branch 'release/1.23.5' into feature/SHRINE-2148-define-the-statuses-to-be-used

Details

Committed
David Walend <david_walend@hms.harvard.edu>Sep 7 2017, 19:13
Pushed
mickmisOct 25 2017, 14:31
Parents
R2664:d5100ce6fff1: Plans for statuses in SHRINE-2148 and the start of envelopes for SHRINE-2177
R2664:e9aa58f63eff: Fix of SHRINE-2219
Branches
Unknown
Tags
Unknown

Event Timeline

David Walend <david_walend@hms.harvard.edu> committed R2664:1055499b8d49: Merge branch 'release/1.23.5' into feature/SHRINE-2148-define-the-statuses-to… (authored by David Walend <david_walend@hms.harvard.edu>).Sep 7 2017, 19:13

Merged Changes

CommitAuthorDetailsCommitted
e9aa58f63effbendcarmen
Fix of SHRINE-2219 
Sep 7 2017
7639f3cd3807bendcarmen
Fix of SHRINE-22223 
Sep 7 2017
fef2a2f814abbendcarmen
fix of SHRINE-2194 
Sep 7 2017
e52283603928bendcarmen
Fix of SHRINE-2207 
Sep 7 2017
eca09173784cbendcarmen
Fix of SHRINE-2209 
Sep 7 2017

Changes (40)

Path
Mshrine-webclient/src/main/js/client/js-i2b2/cells/SHRINE/shrine.plugin.js
Mshrine-webclient/src/main/js/client/js-shrine/assets/css/styles.css
Mshrine-webclient/src/main/js/client/js-shrine/config.js
Mshrine-webclient/src/main/js/client/js-shrine/dist/app-build.js
Mshrine-webclient/src/main/js/client/js-shrine/dist/resources/custom/error/error.html
Mshrine-webclient/src/main/js/client/js-shrine/dist/resources/custom/error/error.js
Mshrine-webclient/src/main/js/client/js-shrine/dist/resources/custom/error/error.js.map
Mshrine-webclient/src/main/js/client/js-shrine/dist/resources/custom/node-result/node-result.html
Mshrine-webclient/src/main/js/client/js-shrine/dist/views/query-status/query-status.html
Dshrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/loading-bar
Vshrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/{ → result-row}/loading-bar/loading-bar.html
Vshrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/{ → result-row}/loading-bar/loading-bar.js
Dshrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/loading-bar/loading-bar.js.map
Pshrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/loading-bar/row-loader.html
Deleted after being copied to multiple locations:
shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/result-row/loading-bar/row-loader.html
shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/result-row/loading-bar/row-loader.html
A(dir)shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/result-row/
A(dir)shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/result-row/loading-bar/
Vshrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/{result-row ← }/loading-bar/loading-bar.html
Vshrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/{result-row ← }/loading-bar/loading-bar.js
Ashrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/result-row/loading-bar/loading-bar.js.map
Pshrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/result-row/loading-bar/row-loader.html
Copied from shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/loading-bar/row-loader.html
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
Mshrine-webclient/src/main/js/client/js-shrine/src/resources/custom/error/error.html
Mshrine-webclient/src/main/js/client/js-shrine/src/resources/custom/error/error.js
Mshrine-webclient/src/main/js/client/js-shrine/src/resources/custom/node-result/node-result.html
Mshrine-webclient/src/main/js/client/js-shrine/src/views/query-status/query-status.html
Ashrine-webclient/src/main/js/client/js-shrine/src/views/query-status/query-status.scss
V(dir)shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/{loading-bar/ → result-row/loading-bar}
Vshrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/{ → result-row}/loading-bar/loading-bar.html
Vshrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/{ → result-row}/loading-bar/loading-bar.js
Vshrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/{ → result-row}/loading-bar/loading-bar.scss
Vshrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/{loading-bar/row-loader.html → query-viewer.scss}
Vshrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/{query-viewer.scss ← loading-bar/row-loader.html}
A(dir)shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/result-row/
V(dir)shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/{result-row/loading-bar/ ← loading-bar}
Vshrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/{result-row ← }/loading-bar/loading-bar.html
Vshrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/{result-row ← }/loading-bar/loading-bar.js
Vshrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/{result-row ← }/loading-bar/loading-bar.scss
Vshrine-webclient/src/main/js/client/js-shrine/{src/views/query-viewer/result-row ← dist/views/query-viewer}/loading-bar/row-loader.html

R2664:1055499b8d49

View Options

shrine-webclient/src/main/js/client/js-i2b2/cells/SHRINE/shrine.plugin.js

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/resources/custom/error/error.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/resources/custom/error/error.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/resources/custom/error/error.js.map

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/resources/custom/node-result/node-result.html

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/loading-bar/row-loader.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/result-row/loading-bar/loading-bar.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/result-row/loading-bar/loading-bar.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/result-row/loading-bar/loading-bar.js.map

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/result-row/loading-bar/row-loader.html

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/src/resources/custom/error/error.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/resources/custom/error/error.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/resources/custom/node-result/node-result.html

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/loading-bar/row-loader.html

Loading...
View Options

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

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/result-row/loading-bar/loading-bar.html

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/result-row/loading-bar/loading-bar.js

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/result-row/loading-bar/loading-bar.scss

Loading...
View Options

shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/result-row/loading-bar/row-loader.html

Loading...
c4science · Help