merge conflicts
Description
Description
Details
Details
- Committed
Ty <Ty_Coghlan@hms.harvard.edu> Oct 12 2016, 20:29 - Pushed
mickmis Mar 14 2017, 15:12 - Parents
- R2664:a4d8984aa64f: actual gitignore update w/out cruft
R2664:44c1fa42c880: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| a4d8984aa64f | Ty | actual gitignore update w/out cruft | Sep 29 2016 | |||
| 0f6215c6fe34 | Ty | Revert "gitignore update" | Sep 29 2016 | |||
| 7038d86193c1 | Ty | gitignore update | Sep 29 2016 | |||
| 38bafa7a76a5 | Ty | Merge branch 'release/1.22.1' of https://open.med.harvard. | Sep 29 2016 | |||
| 29775c4e5224 | Ty | updating to 1.22.1.4-SNAPSHOT | Sep 29 2016 | |||
| 8b069cb547bd | ben-carmen | Fix of SHRINE-SHRINE-1470 [Webclient] Define order of Events dropdown is… | Sep 28 2016 | |||
| 351e4f4d9721 | ben-carmen | Fix of SHRINE-1446 Application is returning results in case of incorrect Date… | Sep 28 2016 | |||
| f41185671ba3 | Ty | fixed epoch caching | Sep 28 2016 | |||
| aef223a13fc3 | Ty | cleaned up log in problems; changed startup command in dashboard | Sep 27 2016 | |||
| d16cecb11fcf | Ty | Merge branch 'release/1.22.1' of https://open.med.harvard. | Sep 27 2016 | |||
| ea1e3b2b7e39 | Ty | updated poms to 1.22.1.3 | Sep 27 2016 | |||
| 3f460cfac253 | ben-carmen | commit of latest changes | Sep 26 2016 | |||
| cfed12df5ca2 | Ty | Merge branch 'release/1.22.1' of https://open.med.harvard. | Sep 26 2016 | |||
| 5388fae1d8b3 | Ty | changed input to a button, updated steward query call | Sep 26 2016 | |||
| f0c2a9106c50 | ben-carmen | fix for SHRINE-1436 "Dropdown Name Temporal Constraint is Missing" | Sep 26 2016 | |||
| 7b956a7867f4 | ben-carmen | fix for SHRINE-1436 "Dropdown Name Temporal Constraint is Missing" | Sep 26 2016 | |||
| a75c497fab02 | ben-carmen | fix for SHRINE-1436 "Dropdown Name Temporal Constraint is Missing" | Sep 26 2016 | |||
| 799e1b5ca584 | ben-carmen | fix for SHRINE-1436 "Dropdown Name Temporal Constraint is Missing" | Sep 26 2016 | |||
| ae1ce427adc0 | ben-carmen | Researcher is unable to see Approved and Rejected Topics. | Sep 26 2016 | |||
| 72289cac5716 | ben-carmen | Fix of SHRINE-1612 "Statistics Tab, the date for "Start Date" is not set for 7… | Sep 26 2016 | |||
| 72c4fe2b8ec1 | Ty | merging | Sep 23 2016 | |||
| 976f23f69cfb | Ty | Mt push erge branch 'release/1.22.1' of https://open.med.harvard. | Sep 23 2016 | |||
| 256455139bf1 | Ty | fixing lines if else error | Sep 23 2016 | |||
| 3379f48f7086 | ben-carmen | Merge branch 'release/1.22.1' of https://open.med.harvard. | Sep 23 2016 | |||
| 28efe25db0f1 | ben-carmen | Fix for SHRINE-1610: User is unable to see the Approved and Rejected topics | Sep 23 2016 | |||
| d95aaad2009d | Ty | fix ie11 jump-to-home bug and pointer styles w/out cruft | Sep 23 2016 | |||
| 6d14a491bd3e | Ty | Revert "fix ie11 jump-to-home bug and pointer styles" | Sep 23 2016 | |||
| 383fb493a8e0 | Ty | fix ie11 jump-to-home bug and pointer styles | Sep 23 2016 | |||
| 5a87d9f5bea2 | Ty | changing npm version to install for steward/pom.xml w/out other cruft | Sep 22 2016 | |||
| e5d94ef52337 | Ty | Revert "changing npm version to install for steward/pom.xml" | Sep 22 2016 | |||
| bd7500fac79d | Ty | changing npm version to install for steward/pom.xml | Sep 22 2016 | |||
| 627b61288562 | Ty | pom update | Sep 22 2016 | |||
| 17ec67012e8a | Ty | ie11 doesn't support string includes | Sep 22 2016 | |||
| 4d310f0bd738 | Ty | fixed navigating back to page 1 | Sep 22 2016 | |||
| bbc0b00e4713 | Ty | Arrows will no longer appear on dashboard for first or last page | Sep 21 2016 | |||
| aed22519d20e | Ty | updated problem log to rememebr the last settings it was used with | Sep 21 2016 | |||
| b7df22244101 | Ty | flipped equality sign on pagination | Sep 20 2016 | |||
| 13f889775ad9 | Ty | removed in from parse stack trace | Sep 20 2016 | |||
| d19f66b6e1d6 | Ty | updated pagination to not violate ellipses | Sep 20 2016 | |||
| ffa78ea7641c | Ty | 300 em -> 50 em | Sep 20 2016 | |||
| d6355705904c | Ty | updated placeholder | Sep 20 2016 | |||
| 9c1ae09fe51e | Ty | fixed config test resources | Sep 20 2016 | |||
| c3cba37cbe7d | Ty | added min height to calendar | Sep 20 2016 | |||
| 54180ec8348f | Ty | Merge branch 'release-temp' into release/1.22.1 | Sep 20 2016 | |||
| a2e6e04c9b12 | Ty | removed default date to implement responsive button | Sep 20 2016 | |||
| 84b84da66ff1 | Ty | removed ng-idle from bower | Sep 20 2016 | |||
| 0c742bcbc173 | Ty | Revert "removed ng-idle" | Sep 20 2016 | |||
| 27eb7a491068 | Ty | removed ng-idle | Sep 20 2016 | |||
| eac8b2ac20ed | ben-carmen | Fix of SHRINE-1482 | Sep 20 2016 | |||
| 8e8f599fdccf | Ty | temp | Sep 20 2016 |