Diffusion SHRINE MedCo Fork 70210fb82f2b

shrine…
70210fb82f2b
Actions

Authored by Ty <Ty_Coghlan@hms.harvard.edu> on Mar 15 2017, 17:31.

Description

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

Details

Committed

Ty <Ty_Coghlan@hms.harvard.edu>

Mar 15 2017, 17:31

Pushed

mickmis

Oct 25 2017, 14:31

Parents

R2664:974499085847: storage cleanup
R2664:4a2a889d46aa: bundled webclient

Branches

Unknown

Tags

Unknown

Event Timeline

Ty <Ty_Coghlan@hms.harvard.edu> committed R2664:70210fb82f2b: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by Ty <Ty_Coghlan@hms.harvard.edu>).Mar 15 2017, 17:31

Merged Changes

Commit	Author	Details	Committed
4a2a889d46aa	bendcarmen	bundled webclient	Mar 8 2017
cd5cf9d6cc90	bendcarmen	fix of .gitignore to not include jspm_packages	Mar 8 2017
afec901a0acd	bendcarmen	merged develop into this branch	Mar 8 2017
ac154af7a377	bendcarmen	cleaned up pom.xml formatting	Mar 8 2017
245a6c5733dc	bendcarmen	cleaned up pom.xml formatting	Mar 8 2017
5697e018f0c3	bendcarmen	merge of release/1.23.1 into develop	Mar 8 2017
57401fcde4b1	bendcarmen	fix of test build	Mar 8 2017
843045e3d057	bendcarmen	changed name of build directory go "gulp"	Mar 7 2017
d6626c24f0bd	bendcarmen	additio of grunt-watch with grunt-serve	Mar 7 2017
12852005f0ff	bendcarmen	latest	Mar 7 2017
fa4a3bce1172	bendcarmen	Javascript build process using JSPM, System.JS and Aurelia	Mar 7 2017
36f35dd12ceb	bendcarmen	update of aurelia-jspm template	Mar 6 2017
ebcb468441d1	bendcarmen	Updated the version from 1.23.1.2-SNAPSHOT to 1.23.1.3-SNAPSHOT	Mar 3 2017
1fecb66f051c	bendcarmen	Fix of SHRINE-1875	Mar 3 2017
9db8e6509f4e	bendcarmen	fix of karma and browser path inconstencies	Mar 2 2017
d74ab7bc8656	ben-carmen	working template for aurelia jspm	Mar 2 2017
15e9de01f268	ben-carmen	added aurelia project template	Mar 2 2017
e2b53b26d01e	ben-carmen	adding javascript templates	Mar 2 2017
1550ad7f5812	ben-carmen	creation of git tools dir	Mar 2 2017
442a769dd29e	ben-carmen	fix of accidental check in of experimental code	Mar 1 2017
52de1444d29e	ben-carmen	fix of SHRINE-1916	Mar 1 2017
3d7d599a7869	ben-carmen	Updated the 1.23.1.1-SNAPSHOT to 1.23.1.2-SNAPSHOT for this deployment	Mar 1 2017
826b86b26dfa	ben-carmen	This is a better fix for SHRINE-1923	Feb 27 2017
960a1eb87237	ben-carmen	Fix for SHRINE-1923	Feb 27 2017
171d073a4e52	ben-carmen	Fix of SHRINE-1911	Feb 27 2017

Changes (108)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		.gitignore
M		apps/dashboard-app/src/main/js/pom.xml
M		apps/steward-app/src/main/js/app/client/steward.runner.js
A	(dir)	js-tools/
A	(dir)	js-tools/templates/
A	(dir)	js-tools/templates/aurelia-jspm/
A		js-tools/templates/aurelia-jspm/.gitignore
A		js-tools/templates/aurelia-jspm/config.js
A		js-tools/templates/aurelia-jspm/favicon.ico
A		js-tools/templates/aurelia-jspm/gulpfile.js
A		js-tools/templates/aurelia-jspm/index.html
A		js-tools/templates/aurelia-jspm/jsconfig.json
A		js-tools/templates/aurelia-jspm/karma.conf.js
A		js-tools/templates/aurelia-jspm/package.json
A	(dir)	js-tools/templates/aurelia-jspm/src/
A		js-tools/templates/aurelia-jspm/src/.eslintrc.json
A		js-tools/templates/aurelia-jspm/src/app.html
A		js-tools/templates/aurelia-jspm/src/app.js
A	(dir)	js-tools/templates/aurelia-jspm/styles/
A		js-tools/templates/aurelia-jspm/styles/styles.css
A	(dir)	js-tools/templates/aurelia-jspm/test/
A	(dir)	js-tools/templates/aurelia-jspm/test/unit/
A		js-tools/templates/aurelia-jspm/test/unit/.eslintrc
A		js-tools/templates/aurelia-jspm/test/unit/app.spec.js
A		js-tools/templates/aurelia-jspm/test/unit/setup.js
M		shrine-webclient/src/main/assembly/assembly.xml
M		shrine-webclient/src/main/js/client/js-i2b2/cells/SHRINE/shrine.plugin.js
A		shrine-webclient/src/main/js/client/js-shrine/.gitignore
A	(dir)	shrine-webclient/src/main/js/client/js-shrine/assets/
A	(dir)	shrine-webclient/src/main/js/client/js-shrine/assets/css/
A		shrine-webclient/src/main/js/client/js-shrine/assets/css/styles.css
A		shrine-webclient/src/main/js/client/js-shrine/config.js
A	(dir)	shrine-webclient/src/main/js/client/js-shrine/dist/
A		shrine-webclient/src/main/js/client/js-shrine/dist/app-build.js
A		shrine-webclient/src/main/js/client/js-shrine/dist/aurelia.js
A		shrine-webclient/src/main/js/client/js-shrine/dist/main.js
A		shrine-webclient/src/main/js/client/js-shrine/dist/main.js.map
A		shrine-webclient/src/main/js/client/js-shrine/dist/shell.html
A		shrine-webclient/src/main/js/client/js-shrine/dist/shell.js
A		shrine-webclient/src/main/js/client/js-shrine/dist/shell.js.map
A	(dir)	shrine-webclient/src/main/js/client/js-shrine/dist/views/
A	(dir)	shrine-webclient/src/main/js/client/js-shrine/dist/views/mailto/
A		shrine-webclient/src/main/js/client/js-shrine/dist/views/mailto/mailto.config.js
A		shrine-webclient/src/main/js/client/js-shrine/dist/views/mailto/mailto.config.js.map
A		shrine-webclient/src/main/js/client/js-shrine/dist/views/mailto/mailto.html
A		shrine-webclient/src/main/js/client/js-shrine/dist/views/mailto/mailto.js
A		shrine-webclient/src/main/js/client/js-shrine/dist/views/mailto/mailto.js.map
A		shrine-webclient/src/main/js/client/js-shrine/dist/views/mailto/mailto.service.js
A		shrine-webclient/src/main/js/client/js-shrine/dist/views/mailto/mailto.service.js.map
A	(dir)	shrine-webclient/src/main/js/client/js-shrine/export/
A	(dir)	shrine-webclient/src/main/js/client/js-shrine/export/assets/
A	(dir)	shrine-webclient/src/main/js/client/js-shrine/export/assets/css/
A		shrine-webclient/src/main/js/client/js-shrine/export/assets/css/styles.css
A		shrine-webclient/src/main/js/client/js-shrine/export/config.js
A	(dir)	shrine-webclient/src/main/js/client/js-shrine/export/dist/
A		shrine-webclient/src/main/js/client/js-shrine/export/dist/app-build.js
A		shrine-webclient/src/main/js/client/js-shrine/export/dist/aurelia.js
A		shrine-webclient/src/main/js/client/js-shrine/export/favicon.ico
A		shrine-webclient/src/main/js/client/js-shrine/export/index.html
A	(dir)	shrine-webclient/src/main/js/client/js-shrine/export/jspm_packages/
A		shrine-webclient/src/main/js/client/js-shrine/export/jspm_packages/system-csp-production.js
A		shrine-webclient/src/main/js/client/js-shrine/export/jspm_packages/system-polyfills.js
A		shrine-webclient/src/main/js/client/js-shrine/export/jspm_packages/system.js
A		shrine-webclient/src/main/js/client/js-shrine/favicon.ico
A	(dir)	shrine-webclient/src/main/js/client/js-shrine/gulp/
A		shrine-webclient/src/main/js/client/js-shrine/gulp/.eslintrc.json
A		shrine-webclient/src/main/js/client/js-shrine/gulp/args.js
A		shrine-webclient/src/main/js/client/js-shrine/gulp/babel-options.js
A		shrine-webclient/src/main/js/client/js-shrine/gulp/bundles.js
A		shrine-webclient/src/main/js/client/js-shrine/gulp/export.js
A		shrine-webclient/src/main/js/client/js-shrine/gulp/paths.js
A	(dir)	shrine-webclient/src/main/js/client/js-shrine/gulp/tasks/
A		shrine-webclient/src/main/js/client/js-shrine/gulp/tasks/build.js
A		shrine-webclient/src/main/js/client/js-shrine/gulp/tasks/bundle.js
A		shrine-webclient/src/main/js/client/js-shrine/gulp/tasks/clean.js
A		shrine-webclient/src/main/js/client/js-shrine/gulp/tasks/dev.js
A		shrine-webclient/src/main/js/client/js-shrine/gulp/tasks/export-release.js
A		shrine-webclient/src/main/js/client/js-shrine/gulp/tasks/lint.js
A		shrine-webclient/src/main/js/client/js-shrine/gulp/tasks/prepare-release.js
A		shrine-webclient/src/main/js/client/js-shrine/gulp/tasks/serve.js
A		shrine-webclient/src/main/js/client/js-shrine/gulp/tasks/test.js
A		shrine-webclient/src/main/js/client/js-shrine/gulp/tasks/watch.js
A		shrine-webclient/src/main/js/client/js-shrine/gulpfile.js
M		shrine-webclient/src/main/js/client/js-shrine/index.html
D		shrine-webclient/src/main/js/client/js-shrine/jquery.min.js
A		shrine-webclient/src/main/js/client/js-shrine/jsconfig.json
A		shrine-webclient/src/main/js/client/js-shrine/karma.conf.js
D		shrine-webclient/src/main/js/client/js-shrine/mailto.js
M		shrine-webclient/src/main/js/client/js-shrine/package.json
M		shrine-webclient/src/main/js/client/js-shrine/shrine.plugin.html
A	(dir)	shrine-webclient/src/main/js/client/js-shrine/src/
A		shrine-webclient/src/main/js/client/js-shrine/src/.eslintrc.json
A		shrine-webclient/src/main/js/client/js-shrine/src/main.js
A		shrine-webclient/src/main/js/client/js-shrine/src/shell.html
A		shrine-webclient/src/main/js/client/js-shrine/src/shell.js
A	(dir)	shrine-webclient/src/main/js/client/js-shrine/src/views/
A	(dir)	shrine-webclient/src/main/js/client/js-shrine/src/views/mailto/
A		shrine-webclient/src/main/js/client/js-shrine/src/views/mailto/mailto.config.js
A		shrine-webclient/src/main/js/client/js-shrine/src/views/mailto/mailto.html
A		shrine-webclient/src/main/js/client/js-shrine/src/views/mailto/mailto.js
A		shrine-webclient/src/main/js/client/js-shrine/src/views/mailto/mailto.scss
A		shrine-webclient/src/main/js/client/js-shrine/src/views/mailto/mailto.service.js
A	(dir)	shrine-webclient/src/main/js/client/js-shrine/test/
A	(dir)	shrine-webclient/src/main/js/client/js-shrine/test/unit/
A		shrine-webclient/src/main/js/client/js-shrine/test/unit/.eslintrc
A	(dir)	shrine-webclient/src/main/js/client/js-shrine/test/unit/mailto/
A		shrine-webclient/src/main/js/client/js-shrine/test/unit/mailto/mailto.spec.js
A		shrine-webclient/src/main/js/client/js-shrine/test/unit/setup.js