Diffusion SHRINE MedCo Fork 855f6dd4db69

shrine…
855f6dd4db69
Actions

Authored by David Walend <david_walend@hms.harvard.edu> on Oct 19 2016, 20:48.

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>

Oct 19 2016, 20:48

Pushed

mickmis

Mar 14 2017, 15:12

Parents

R2664:bf7da259beec: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
R2664:d56c305a81a8: Added what I think is a viable config for AWS SES for SHRINE-1703

Branches

Unknown

Tags

Unknown

Event Timeline

David Walend <david_walend@hms.harvard.edu> committed R2664:855f6dd4db69: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by David Walend <david_walend@hms.harvard.edu>).Oct 19 2016, 20:48

Merged Changes

	Commit			Author	Details	Committed
	bf7da259beec			ben-carmen	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Oct 19 2016
	ec65d463a5d4			ben-carmen	update of steward mock API and mock server	Oct 19 2016

Changes (29)

		Path
M		apps/steward-app/src/main/js/app/client/statistics/directives/statistics-graph/statistics-graph.js
M		apps/steward-app/src/main/js/app/client/statistics/directives/statistics-graph/statistics-graph.service.js
M		apps/steward-app/src/main/js/app/client/statistics/directives/statistics-graph/statistics-graph.service.spec.js
A		apps/steward-app/src/main/js/app/client/statistics/directives/statistics-graph/test.js
A	(dir)	apps/steward-app/src/main/js/app/mock/
V	(dir)	apps/steward-app/src/main/js/app/{mock/data/ ← server/data}
V		apps/steward-app/src/main/js/app/{mock ← server}/data/query-history.js
V		apps/steward-app/src/main/js/app/{mock ← server}/data/query-result.js
V		apps/steward-app/src/main/js/app/{mock ← server}/data/steward-data.js
V		apps/steward-app/src/main/js/app/{mock ← server}/data/topic.js
V		apps/steward-app/src/main/js/app/{mock ← server}/query-history-result.js
V		apps/steward-app/src/main/js/app/{mock ← server}/shrine-mock.service.js
V		apps/steward-app/src/main/js/app/{mock ← server}/steward-mock.service.js
A		apps/steward-app/src/main/js/app/mock/test.js
V	(dir)	apps/steward-app/src/main/js/app/{server/data/ → mock/data}
V		apps/steward-app/src/main/js/app/{server → mock}/data/query-history.js
V		apps/steward-app/src/main/js/app/{server → mock}/data/query-result.js
V		apps/steward-app/src/main/js/app/{server → mock}/data/steward-data.js
V		apps/steward-app/src/main/js/app/{server → mock}/data/topic.js
M		apps/steward-app/src/main/js/app/server/package.json
V		apps/steward-app/src/main/js/app/{server → mock}/query-history-result.js
V		apps/steward-app/src/main/js/app/{server → mock}/shrine-mock.service.js
V		apps/steward-app/src/main/js/app/server/{steward-api.js ← steward-mock.js}
V		apps/steward-app/src/main/js/app/server/{steward-mock.js → steward-api.js}
V		apps/steward-app/src/main/js/app/{server → mock}/steward-mock.service.js
D		apps/steward-app/src/main/js/app/server/test.js
M		apps/steward-app/src/main/js/gulp.config.js
M		apps/steward-app/src/main/js/karma.conf.js
M		apps/steward-app/src/main/js/package.json