merge conflict with reference.conf in dashboard-app:
Description
Description
Details
Details
- Committed
Ty <Ty_Coghlan@hms.harvard.edu> Aug 5 2016, 16:35 - Pushed
mickmis Mar 14 2017, 15:12 - Parents
- R2664:7ebc75fa1a6a: Merge branch 'release/1.22.0' of https://open.med.harvard.
R2664:d197251b57b6: rewrote problem database query to avoid using a join - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 7ebc75fa1a6a | Ty | Merge branch 'release/1.22.0' of https://open.med.harvard. | Aug 5 2016 | |||
| 11891ae9e8a6 | Ty | reset mysql.ddl, added varchar(max) to mssql.ddl, added clob to oracle.ddl | Aug 5 2016 | |||
| 2ba05d4e5027 | Benjamin Carmen | fix for capitalized username issue SHRINE-1247 | Aug 5 2016 | |||
| 64fd8b13ed34 | Benjamin Carmen | fix for incorrect error message issue SHRINE-1603 | Aug 5 2016 | |||
| c68b3dbe032d | Benjamin Carmen | fix of missing role in drop down SHRINE-1596 | Aug 5 2016 | |||
| e43431da9eae | Benjamin Carmen | fix of missing help link SHRINE-1597 | Aug 5 2016 | |||
| e3f2063c5ba8 | Benjamin Carmen | Merge branch 'release/1.22.0' of https://open.med.harvard. | Aug 5 2016 | |||
| b592d2fda7a4 | Benjamin Carmen | fix of login centering issue SHRINE-1598 | Aug 5 2016 | |||
| 28587f4ad72f | Ty | Merge remote-tracking branch 'origin/release/1.22.0' into release/1.22.0 | Aug 5 2016 | |||
| ed6bf09e2626 | Ty | Further testing of ddl hypothesis | Aug 5 2016 | |||
| f51020e527e9 | Benjamin Carmen | fix of mysterious redirect on logout SHRINE-1602 | Aug 5 2016 | |||
| 42f903655edf | Ty | Further testing mysql.ddl hypothesis | Aug 5 2016 | |||
| eb212a5cf6f9 | Ty | testing to see if oracle/mssql are using mysql.ddl | Aug 5 2016 | |||
| 396683b4a1d9 | Benjamin Carmen | typo causing blank error popup | Aug 4 2016 | |||
| 0cb0429c62c1 | Ty | changed data-commons and dashboard-app reference.conf to use adapterAuditDB | Aug 4 2016 | |||
| cb319e94825e | Ty | Undoing the Undo of the pom.xml (also known as a 360 degree turn) | Aug 4 2016 | |||
| f4edb13f7c0c | Ty | undid pom.xml change | Aug 4 2016 |