{"push_id":1116140009,"size":27,"distinct_size":0,"ref":"refs/heads/ActiveTaskTray","head":"d4f9abbdeb679bf062e67fb720180f9bab35a6ae","before":"cb1d345db8f4cf20e34d80c3074ebb6ead1ca19d","commits":[{"sha":"c93cd505eeb795225726809127f2fc002a1afc36","author":{"email":"7e2e7e5fac8707418f0204b57573fddfbaa9fb3b@gmail.com","name":"Graham Kim"},"message":"Fixed line ending to LF","distinct":false,"url":"https://api.github.com/repos/thompsct/SemGen/commits/c93cd505eeb795225726809127f2fc002a1afc36"},{"sha":"7eea0f2e4a7a661cdf5d084652780f8447567cbc","author":{"email":"b48dde32d8fdfc2ffdf4a16b9694cc563228f1d3@gmail.com","name":"Maxwell Neal"},"message":"Save file dialog wasn't providing an initial file type extension when\nsaving out an SBML model from the Annotator or Extractor. Now it uses\nSemSim OWL as the default extension. This is a temp fix. When we have a\nproper SBML writer, the save file dialog should use SBML as the initial\nfile extension.","distinct":false,"url":"https://api.github.com/repos/thompsct/SemGen/commits/7eea0f2e4a7a661cdf5d084652780f8447567cbc"},{"sha":"5d950b4dbdbbc159686886f19ea86c2c364a77fa","author":{"email":"b48dde32d8fdfc2ffdf4a16b9694cc563228f1d3@gmail.com","name":"Maxwell Neal"},"message":"Updated control element name for storing SemSim annotations in JSim\nmodels.","distinct":false,"url":"https://api.github.com/repos/thompsct/SemGen/commits/5d950b4dbdbbc159686886f19ea86c2c364a77fa"},{"sha":"75a8c28c25fc9c1f35c4b6f0e336b6cc508b0e91","author":{"email":"92ef399fc1778d9b18e8551035a4267e15d024ac@gmail.com","name":"thompsct"},"message":"Added classes for generating merge previews.","distinct":false,"url":"https://api.github.com/repos/thompsct/SemGen/commits/75a8c28c25fc9c1f35c4b6f0e336b6cc508b0e91"},{"sha":"864d31e6fc5617cc3b8974cfce7a8b92141d7236","author":{"email":"92ef399fc1778d9b18e8551035a4267e15d024ac@gmail.com","name":"thompsct"},"message":"Merge remote-tracking branch 'origin/StageMerger' into StageMergerTask","distinct":false,"url":"https://api.github.com/repos/thompsct/SemGen/commits/864d31e6fc5617cc3b8974cfce7a8b92141d7236"},{"sha":"42b93db535753bd9c1f7d809a530853a3e39dbca","author":{"email":"b48dde32d8fdfc2ffdf4a16b9694cc563228f1d3@gmail.com","name":"Maxwell Neal"},"message":"Saving to a JSim proj file after opening a standalone MML file wasn't\npreserving the original code in the proj file.","distinct":false,"url":"https://api.github.com/repos/thompsct/SemGen/commits/42b93db535753bd9c1f7d809a530853a3e39dbca"},{"sha":"bfa5fcdd365008d8611153332305837802a5b015","author":{"email":"92ef399fc1778d9b18e8551035a4267e15d024ac@gmail.com","name":"thompsct"},"message":"Merge preview graphs show nodes with links.\n\nFixed issue with the hull persisting when the hull was closed.","distinct":false,"url":"https://api.github.com/repos/thompsct/SemGen/commits/bfa5fcdd365008d8611153332305837802a5b015"},{"sha":"8cac927581d806e3abb07dc79a27ccfc0f10b4d9","author":{"email":"92ef399fc1778d9b18e8551035a4267e15d024ac@gmail.com","name":"thompsct"},"message":"Fix for persistant hull when the hull was opened and closed.","distinct":false,"url":"https://api.github.com/repos/thompsct/SemGen/commits/8cac927581d806e3abb07dc79a27ccfc0f10b4d9"},{"sha":"71936fd88cba85ddb10cb7f107db7b24b4173b73","author":{"email":"92ef399fc1778d9b18e8551035a4267e15d024ac@gmail.com","name":"thompsct"},"message":"Previews now work.","distinct":false,"url":"https://api.github.com/repos/thompsct/SemGen/commits/71936fd88cba85ddb10cb7f107db7b24b4173b73"},{"sha":"50c26c376f653cfa15e4346a6d0b8bd3c38223e6","author":{"email":"7e2e7e5fac8707418f0204b57573fddfbaa9fb3b@gmail.com","name":"Graham Kim"},"message":"Merge branch 'ActiveTaskTray' into StageMerger","distinct":false,"url":"https://api.github.com/repos/thompsct/SemGen/commits/50c26c376f653cfa15e4346a6d0b8bd3c38223e6"},{"sha":"0ea71d92e91ea7909bec8e887cc757b49ffb1961","author":{"email":"92ef399fc1778d9b18e8551035a4267e15d024ac@gmail.com","name":"thompsct"},"message":"Merge remote-tracking branch 'origin/StageMerger' into StageMergerTask\n\nConflicts:\n\tcfg/stage/css/merger.css\n\tcfg/stage/js/merger/mergerTask.js\n\tcfg/stage/stage.html","distinct":false,"url":"https://api.github.com/repos/thompsct/SemGen/commits/0ea71d92e91ea7909bec8e887cc757b49ffb1961"},{"sha":"874684e7ae3448e18631e7fed0b38b5449f7f577","author":{"email":"b48dde32d8fdfc2ffdf4a16b9694cc563228f1d3@gmail.com","name":"Maxwell Neal"},"message":"Updated version number for next release.","distinct":false,"url":"https://api.github.com/repos/thompsct/SemGen/commits/874684e7ae3448e18631e7fed0b38b5449f7f577"},{"sha":"3a0e34085e0eebddd14168ebf05e5d93afb59b55","author":{"email":"b48dde32d8fdfc2ffdf4a16b9694cc563228f1d3@gmail.com","name":"Maxwell Neal"},"message":"When instantiating SemSimLibrary on Mac and Windows distributions, SG\ncouldn't find local_ontologies.txt because ResourcesManager wasn't using\nthe platform-specific \"cfg\" folder read locations. Fixing this may have\nalso fixed the bug that was preventing CellML models from being loaded\non Mac and Windows distributions.","distinct":false,"url":"https://api.github.com/repos/thompsct/SemGen/commits/3a0e34085e0eebddd14168ebf05e5d93afb59b55"},{"sha":"d020d360d04302caddd821f25dbcf5506889c94f","author":{"email":"b48dde32d8fdfc2ffdf4a16b9694cc563228f1d3@gmail.com","name":"Maxwell Neal"},"message":"Reset startSettings.txt for release build.","distinct":false,"url":"https://api.github.com/repos/thompsct/SemGen/commits/d020d360d04302caddd821f25dbcf5506889c94f"},{"sha":"4d4fa43a152f078f4529a1bf379608c7f24dfa6f","author":{"email":"92ef399fc1778d9b18e8551035a4267e15d024ac@gmail.com","name":"thompsct"},"message":"Hulls added to the merge preview windows.\n\nAdded variable for locking the hull open or closed.","distinct":false,"url":"https://api.github.com/repos/thompsct/SemGen/commits/4d4fa43a152f078f4529a1bf379608c7f24dfa6f"},{"sha":"c4ecdecd0c9c091b1346811952f200a94955cf19","author":{"email":"92ef399fc1778d9b18e8551035a4267e15d024ac@gmail.com","name":"thompsct"},"message":"Rewrote how drag events are handled to allow for multiple behaviors.\n\nFixed issue that was causing the model drag and merge to fail to fire.","distinct":false,"url":"https://api.github.com/repos/thompsct/SemGen/commits/c4ecdecd0c9c091b1346811952f200a94955cf19"},{"sha":"9d85800bbdb3b6a08a978f41f564d1e8469a111e","author":{"email":"92ef399fc1778d9b18e8551035a4267e15d024ac@gmail.com","name":"thompsct"},"message":"Moved merger resolution panel to own class.","distinct":false,"url":"https://api.github.com/repos/thompsct/SemGen/commits/9d85800bbdb3b6a08a978f41f564d1e8469a111e"},{"sha":"9a672f333e39dd12e077e74ff19622aa891d1a88","author":{"email":"92ef399fc1778d9b18e8551035a4267e15d024ac@gmail.com","name":"thompsct"},"message":"Fix for non-model nodes not dragging.","distinct":false,"url":"https://api.github.com/repos/thompsct/SemGen/commits/9a672f333e39dd12e077e74ff19622aa891d1a88"},{"sha":"89eb6e7b7e5409993870574e2c951cbbe21eaef0","author":{"email":"b48dde32d8fdfc2ffdf4a16b9694cc563228f1d3@gmail.com","name":"Maxwell Neal"},"message":"SG wasn't collecting annotations if present in a CellML model. Also, SG\nwasn't reading in annotations on custom terms.","distinct":false,"url":"https://api.github.com/repos/thompsct/SemGen/commits/89eb6e7b7e5409993870574e2c951cbbe21eaef0"},{"sha":"8918044055d7aebdd466d51543d197b6e3c0e180","author":{"email":"92ef399fc1778d9b18e8551035a4267e15d024ac@gmail.com","name":"thompsct"},"message":"Merge remote-tracking branch 'origin/master' into StageMerger\n\nConflicts:\n\tcfg/startSettings.txt\n\tsrc/semsim/SemSimLibrary.java\n\tsrc/semsim/definitions/RDFNamespace.java\n\tsrc/semsim/definitions/SemSimRelations.java\n\tsrc/semsim/definitions/SemSimTypes.java","distinct":false,"url":"https://api.github.com/repos/thompsct/SemGen/commits/8918044055d7aebdd466d51543d197b6e3c0e180"}]}