resolving conflict with resources/client
Description
Description
Details
Details
- Committed
ben-carmen <benjamin_carmen@hms.harvard.edu> Sep 12 2016, 21:04 - Pushed
mickmis Mar 14 2017, 15:12 - Parents
- R2664:76455027b087: point snapshotRepository back to snapshots/
R2664:7e3705a5a6dc: clean of client - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 76455027b087 | Keith Dwyer | point snapshotRepository back to snapshots/ | Sep 9 2016 | |||
| 15076a191735 | Keith Dwyer | revert base pom, go back to 1.22.1.0-SNAPSHOT | Sep 9 2016 | |||
| 1a9fe45c2c04 | Keith Dwyer | experiment: remove uniqueVersion constraint from snapshotRepository | Sep 9 2016 | |||
| a35479dd1574 | Keith Dwyer | change version back to 1.22.1-SNAPSHOT | Sep 9 2016 | |||
| 796a0548625b | Keith Dwyer | change <repository> back to default temporarily (snapshotRepository remains… | Sep 9 2016 | |||
| f9d89d570858 | Keith Dwyer | change pom targets to releases-internal, use version of 1.22.1.0 | Sep 9 2016 | |||
| 5c64367f2189 | Ty | Implemented steward timeout | Sep 9 2016 | |||
| fbc537798700 | Ty | Moved idle code in steward again | Sep 9 2016 | |||
| d5aa392a47f6 | Ty | moved idleHandler in steward | Sep 9 2016 | |||
| bd869187c12d | Ty | refactored to check for click events | Sep 9 2016 | |||
| 391e1524daf0 | Ty | bumped timeout back to 20 minutes | Sep 9 2016 | |||
| dc2e48270cdd | Ty | refactored timeout to fire on route changes instead of every event | Sep 9 2016 | |||
| 58fc21c431bc | Ty | now redirects user to login page, dashboard only | Sep 8 2016 | |||
| a6f61058d2d4 | Ty | improved timeout to restart after every action | Sep 8 2016 | |||
| 3a3eb2c163ac | Ty | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Sep 8 2016 | |||
| 0c631592028b | Ty | uncommented | Sep 8 2016 | |||
| f1440ecd0bdc | David Walend | Fix for SHRINE-1545, mostly adding comments and a default value to a reference. | Sep 8 2016 | |||
| eb70e48809ce | Ty | prelim implementation using and | Sep 8 2016 | |||
| c93d313674ec | Ty | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Sep 8 2016 | |||
| faac65a32029 | Ty | implemented date picker get call | Sep 8 2016 | |||
| d7deba7ea06c | Ty | implemented date picker | Sep 8 2016 | |||
| 14c63ce983e4 | David Walend | Better text for SHRINE-1544 | Sep 7 2016 | |||
| 9d65a722ebfb | David Walend | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Sep 7 2016 | |||
| a2b4e8d73134 | David Walend | Fencepost problem while fixing SHRINE-1544 | Sep 7 2016 | |||
| 46bcba499835 | Ty | if/else if typo | Sep 7 2016 | |||
| 4ca7c25c4551 | David Walend | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Sep 7 2016 | |||
| 664880f59ec9 | David Walend | Pulling along the exception for bot defense, to get all the gritty details. | Sep 7 2016 | |||
| 37588761bd87 | Ty | front end improvements | Sep 7 2016 | |||
| 1a50440ea3b6 | Ty | fixed typo | Sep 7 2016 | |||
| a1904bf9f1fc | Ty | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Sep 6 2016 | |||
| d34faaa42f78 | Ty | Needs Warmup Trait, beginning of Bootstrap visualization for dashboard | Sep 6 2016 | |||
| 6ac899021c49 | David Walend | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… | Sep 6 2016 | |||
| ba4a8fa6ed8c | David Walend | Loading bot detection thresholds from reference.conf | Sep 6 2016 | |||
| 3d0abc0232c2 | Ty | added boot entries to steward and dashboard | Sep 6 2016 | |||
| eef1f80bf7aa | Ty | removed clob from problemsT, fixed 0 page bug | Sep 6 2016 | |||
| 3d10670a4031 | Ty | reverting shrine_histroy changes | Sep 2 2016 | |||
| e39df71e43f6 | Ty | more forcefully forcing creation | Sep 2 2016 | |||
| e871ce1bf25d | Ty | forcing creation | Sep 2 2016 | |||
| 85dbaf34b526 | Ty | migrating to shrine_query_history | Sep 2 2016 | |||
| 7c7f1f2734dd | Ty | updated reference.conf to move problems to shrine_query_history | Sep 2 2016 | |||
| ec32424a0458 | Ty | drevil json dump | Sep 2 2016 | |||
| 8a90c60d742f | Ty | added shebang | Sep 2 2016 | |||
| a0dcb6d208d5 | Ty | add_data_json.py script created | Sep 2 2016 | |||
| 3ed49505f65c | Ty | cleaned up dashboard rest call, used optional | Sep 2 2016 | |||
| 558768d16b8d | Ty | realized one layer of escaping is necessary | Sep 1 2016 | |||
| ac1b78a7f982 | Ty | fixed parsing to use an actual json object instead of a string json object | Sep 1 2016 | |||
| 8454095b83e5 | David Walend | a little cleanup for SHRINE-1544 | Aug 26 2016 |