Merge branch 'release/1.22.0' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.22.0
Description
Description
Details
Details
- Committed
Benjamin Carmen <ben.hms.harvard@gmail.com> Aug 3 2016, 21:21 - Pushed
mickmis Mar 14 2017, 15:12 - Parents
- R2664:34389254ce4f: Merge branch 'release/1.22.0' of https://open.med.harvard.
R2664:134d73de80ae: fix of flashing content while app is loading - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
34389254ce4f | Ty | Merge branch 'release/1.22.0' of https://open.med.harvard. | Aug 3 2016 | |||
5c0208c630df | Ty | fixed floorMod bug | Aug 3 2016 | |||
0cd8aa9e1566 | Ty | Merge branch 'release/1.22.0' of https://open.med.harvard. | Aug 3 2016 | |||
d712a7a89c95 | Ty | removed typo in problemsDashboard | Aug 2 2016 | |||
20f414c779bc | Ty | removed inserting dummy problems | Aug 2 2016 | |||
acd0aaa11bf1 | Ty | fixed problem serialization to serialize as object instead of string | Aug 2 2016 | |||
229ee91b9d0e | Ty | changed how problems override Abstract Problem, using lazy vals instead of vals | Aug 2 2016 | |||
c72c1da2fc88 | Ty | typo that led to infinite loop | Aug 1 2016 | |||
ee8459a1c441 | Ty | seeing if secondary path contains values | Aug 1 2016 | |||
a2634474e2a2 | Ty | java hashets don't support foreach | Aug 1 2016 | |||
e6507620f9e1 | Ty | further exploratory logging | Aug 1 2016 | |||
85d0f7bb0687 | Ty | secondary lookup to see what part of path blows | Aug 1 2016 | |||
2353511efbd0 | Ty | trying to log intiial context | Aug 1 2016 | |||
7a4cecda9eff | Ty | removed typo | Aug 1 2016 | |||
3f35e14a81f1 | Ty | redid conf files for problems | Aug 1 2016 | |||
cf3ae5e3ebdc | Ty | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Aug 1 2016 | |||
cb07c39a90fa | Ty | attempts at fixing intialization error | Aug 1 2016 | |||
5c8d8988dd16 | Benjamin Carmen | updated package.json with specific versioning | Aug 1 2016 | |||
0d6df44c71b6 | Benjamin Carmen | latest version...needs fix for pagination | Aug 1 2016 | |||
fba0e1040678 | Benjamin Carmen | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Jul 30 2016 | |||
751204752e62 | Benjamin Carmen | commit of fix for statistics module | Jul 30 2016 | |||
03aee456066c | Ty | needed brackets | Jul 29 2016 | |||
eb0edd32a234 | Ty | explicitly creating problems object | Jul 29 2016 | |||
a01dd534f075 | Ty | Check for path before getting createTableOnStart | Jul 29 2016 | |||
4d9f7b8192ed | Ty | t Merge branch 'develop' of https://open.med.harvard. | Jul 29 2016 | |||
ed1a5582c105 | Ty | alterted ddls | Jul 29 2016 | |||
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 | |||
f0e68e2056a9 | Ty | TurnOffConnector to more test class | Jul 29 2016 | |||
36602333a1ad | Ty | TurnOffConnector in HMSAuthServiceTest | Jul 29 2016 | |||
19b45c875370 | Ty | Typo in return result of floorDiv | Jul 29 2016 | |||
5b703e60aca0 | Ty | Had to inline floorMod until Bamboo uses java8 | Jul 29 2016 | |||
02b3853fe207 | Ty | Set epoch to zero for testProblems, as existing testsignore it in equality… | Jul 29 2016 | |||
bee545011314 | Ty | Fixed problemDigest test to expect epoch in xml | Jul 29 2016 | |||
671d3fc19880 | Ty | Added TurnOffProblemConnector trait for non database tests | Jul 29 2016 | |||
5c17d36d2455 | Ty | added util and config as a dependency to data-commons | Jul 28 2016 | |||
f2e1507fe467 | Ty | removed protocl dependency from data-commons | Jul 28 2016 | |||
625e0e84d2ea | Ty | pom typo | Jul 28 2016 | |||
341299d2772e | Ty | conf typo | Jul 28 2016 | |||
7770ead49f4e | Ty | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Jul 28 2016 | |||
a384fbafb8eb | Ty | Chagned get url, moved problems to data-commons | Jul 28 2016 | |||
9dbc9813b08d | Keith Dwyer | [webclient] revert default urlProxy to shrine-proxy | Jul 28 2016 | |||
f8d46aeaaac9 | Keith Dwyer | [webclient] add updated webclient help PDF | Jul 28 2016 | |||
43ea50b774ac | Keith Dwyer | [Webclient] Re-merge dev-shrine-webclient v1.7.07-SHRINE-4 (f04178162d5) | Jul 28 2016 | |||
c91e57553014 | Ty | incorporated project meeting feedback | Jul 27 2016 | |||
e6d55c7d96d3 | Ty | removed log files | Jul 26 2016 | |||
82258d143fa9 | Ty | finished front end, moved back end to utils | Jul 26 2016 | |||
b8a62ee67696 | Ty | finished front end, moved back end to utils | Jul 26 2016 | |||
3064b8ec05dd | Ty | Super preliminary sketch | Jul 25 2016 | |||
b79bb772f5be | Ty | Move serializer | Jul 22 2016 |