Merge remote-tracking branch 'origin/develop' into develop
- Conflicts:
- apps/dashboard-app/src/main/scala/net/shrine/dashboard/DashboardService.scala
Description
Description
Details
Details
- Committed
Ben Carmen <benjamin_carmen@hms.harvard.edu> Jan 12 2016, 00:50 - Pushed
mickmis Mar 14 2017, 15:12 - Parents
- R2664:3ad3fc618d32: Commit of POSO stuff for Dashboard Status...also, commit of tests.
R2664:3542b6d3ba3a: Try a comma as a delimiter - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 3542b6d3ba3a | David Walend | Try a comma as a delimiter | Jan 11 2016 | |||
| 3227a28cd7b3 | David Walend | An attempt to circumvent Spray looking for key value pairs. Not sure if its the… | Jan 11 2016 | |||
| 6a1a0a66245b | David Walend | Took colons out of headers | Jan 8 2016 | |||
| f5edcb1f071d | David Walend | Need to try the file system to get the keystore. | Jan 8 2016 | |||
| 219ab95646db | David Walend | Minor test for a remote dashboard. | Jan 8 2016 | |||
| b0acc5b62e9c | David Walend | Should be wired up for urls to call into a remote dashboard. We'll see tomorrow. | Jan 7 2016 | |||
| d755340cd8b7 | David Walend | Should have something that can call a remote dashboard. Getting the right urll… | Jan 7 2016 | |||
| d0e05a36c555 | David Walend | Extracted a method to make the new auth header | Jan 7 2016 | |||
| 61e4d9640c22 | David Walend | A few more tests for server-side jwts | Jan 7 2016 | |||
| fef97f84cc40 | David Walend | Using some bits from jwts to validate and prevent replay attacks. | Jan 7 2016 |