t Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
Description
Description
Details
Details
- Committed
Ty <Ty_Coghlan@hms.harvard.dedu> Jul 29 2016, 21:37 - Pushed
mickmis Mar 14 2017, 15:12 - Parents
- R2664:8f6d4c16aef9: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
R2664:ed1a5582c105: alterted ddls - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 8f6d4c16aef9 | Benjamin Carmen | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Jul 29 2016 | |||
| b72388e695f8 | Benjamin Carmen | trying to resolve conflict | Jul 29 2016 | |||
| 70223dbe04d2 | Benjamin Carmen | whitespace causing merge conflict | Jul 29 2016 | |||
| 3f782d449aa6 | Benjamin Carmen | merge of gulp and refactor for data steward app | Jul 29 2016 | |||
| 5a3124874133 | Benjamin Carmen | latest version of commit | Jul 29 2016 | |||
| b955447ca3b4 | Benjamin Carmen | latest version of topics module | Jul 28 2016 | |||
| 377684fbd0c0 | Benjamin Carmen | fixed steward menu | Jul 28 2016 | |||
| 9cd21ef1a008 | Benjamin Carmen | latest version | Jul 28 2016 | |||
| 28b278ac0caf | Benjamin Carmen | latest version of the gulp feature. todo: fix top menu layout | Jul 19 2016 | |||
| 97b3dde60948 | Benjamin Carmen | fixed mystery compile issue, leading "$" in configureHttpProvider method. | Jul 19 2016 | |||
| 4ae81f6ffd23 | Benjamin Carmen | latest version | Jul 18 2016 | |||
| 86ddbac34a31 | Benjamin Carmen | created mock server for running locally | Jul 18 2016 | |||
| 381dc634da74 | Benjamin Carmen | fixed gulp build process to include font-awesome fonts directory | Jul 18 2016 | |||
| 7f6163e350e2 | Benjamin Carmen | commit of updated login logic | Jul 15 2016 | |||
| 838f7c7c08d0 | Benjamin Carmen | commit of default routing to login when user not verified. | Jul 15 2016 | |||
| 898b8427d201 | Benjamin Carmen | commit of 07/14/2016 work on login module | Jul 15 2016 | |||
| 993d83796cfe | Benjamin Carmen | added types service | Jul 14 2016 | |||
| 8bc98f28db1e | Benjamin Carmen | added all files | Jul 13 2016 |