GitHub PushEvent at 2014-11-13 22:13:13
Repository: OTM2
Actor: RickMohr
Payload: {"shas":[["95e33318a987ddc5ef4435eeb815513d6d00b509","20146c466448b2d7d6822409467f70db140956d7@azavea.com","Add travis configuration","Michael Maurizi",true],["37507e1aa0af794d71a1ecf5105234b374f2b724","20146c466448b2d7d6822409467f70db140956d7@azavea.com","Fix test_advanced_search_fields test.  Fixes #1416","Michael Maurizi",true],["22212b0bca844cccdfa7bea865c6e58af1304079","20146c466448b2d7d6822409467f70db140956d7@azavea.com","Fix unit test\n\nThis unit test failed when running OTM2 without companion repos","Michael Maurizi",true],["b55163bf3074afdcf49eb79b6e34aaa156b097f8","20146c466448b2d7d6822409467f70db140956d7@azavea.com","Fix failing unit test.\n\nThis test consistently gives a *slightly* different result on Travis CI.\nI don't think it's worth worrying about, so long as we have consistent\nbehaviour on the same machine.","Michael Maurizi",true],["da775ceec2d9794eaf4d2290e0de1b61baaad8ce","20146c466448b2d7d6822409467f70db140956d7@azavea.com","Skip tests that inexplicably fail on Travis","Michael Maurizi",true],["4c4c13b7f15567e843060787f8f8ffa54ba74f72","20146c466448b2d7d6822409467f70db140956d7@azavea.com","Run JS unit tests","Michael Maurizi",true],["eeb086aad6799102fbb04037a31432d7806250db","20146c466448b2d7d6822409467f70db140956d7@azavea.com","Add coveralls.io support","Michael Maurizi",true],["661bac3a58ccd3155c0794697208053fd780b370","20146c466448b2d7d6822409467f70db140956d7@azavea.com","Add badges","Michael Maurizi",true],["b13793155b40e6a7562d35aeec30fc05eb1895e1","20146c466448b2d7d6822409467f70db140956d7@azavea.com","Merge pull request #1789 from maurizi/travis\n\nAdd support for Travis CI and Coveralls.io","Michael Maurizi",true],["2e3c24620b0eefbb3e09e08dbc44ce341d1be428","c3fe90de81d1158edd57db60984629db49a2604a@azavea.com","Save records with system_user","Steve Lamb",true],["6ef3fab5166823af26efd6e701db1916bae9e289","c3fe90de81d1158edd57db60984629db49a2604a@azavea.com","Make importer file validation DRY","Steve Lamb",true],["31c52f79f0ba0d9d68a3fef4845303396c5255a1","c3fe90de81d1158edd57db60984629db49a2604a@azavea.com","Don't fail early on null csv string conversion\n\nThis change allows the uploading of a poorly formatted csv to fail in\nthe correct place, during file validation, not during row processing,\nwhere it was choking on empty cell values.","Steve Lamb",true],["e524ef28c295612d6ee4a919ebf25815d1e13aed","c3fe90de81d1158edd57db60984629db49a2604a@azavea.com","Make file validator fail and exit in one place","Steve Lamb",true],["7cdf98152fc6e53b7cfa8ffcf1d6a06cfe6f6f34","c3fe90de81d1158edd57db60984629db49a2604a@azavea.com","Refactor saving without auth to only allow sysuser\n\nFor security purposes.","Steve Lamb",true],["ba2ea86750f0d6681b2ba2123649795fc3be4690","c824fa277a024600738db3e5a6d458953ede0eea@gmail.com","Merge pull request #1791 from steventlamb/topic/save_bulk_imports_with_system_user\n\nTopic/save bulk imports with system user","Steve Lamb",true],["490611057ac6c18ba7608e39468e935d8f7c3802","6da0130c5aeef94e5bbaabadbf8017270be25c64@azavea.com","Data migration to strip leading and trailing blanks in Species fields\n\nSome fields in previously-imported species objects have leading or trailing spaces,\ncausing false merge conflicts when trying to re-import species.\n\nThis data migration strips leading and trailing spaces from all Species fields in all instances.\n\nGoing forward the importer will ensure that all incoming Species fields are stripped.\n\nFixes OpenTreeMap/clients#73","Rick Mohr",true],["646fcc06e8efb7afd0652bed28d9c491b60b052f","6da0130c5aeef94e5bbaabadbf8017270be25c64@azavea.com","\"Merge Required\" tab shows controls for resolving diffs and \"solving\" a merge\n\n* Set up context for merge table (including unique names & ID's for radio buttons)\n* Currently showing the merge table below its associated table row; could be changed to a popup.\n* When a merge is required, only allow creating a new species if \"common name\" doesn't match\n\nBug fixing and refactoring in Species validation, including:\n* Filter Species by instance when matching\n* Extract function `_prepare_merge_data` and rewrite\n* Don't show diffs for a field if the matched Species value is empty (as it will be for most fields).\n* If all diffs are with such empty values, don't require a merge\n* Add tests for row status and merge data\n\nAlso:\n* Fix layout problems in main `imports.html` template\n* Rename errors.MERGE_REQ as errors.MERGE_REQUIRED\n* Remove errors.TOO_MANY_SPECIES; it's subsumed by errors.MERGE_REQUIRED\n\nAlso, remove everything related to USDA code -- because it doesn't match OTM code like we thought.\n\nWe thought that OTM codes matched USDA codes except when there's a cultivar. But that's not the case. For example:\n    Silver maple:  OTM code \"ACSA1\", USDA code \"ACSA2\"\n    Sugar maple :  OTM code \"ACSA2\", USDA code \"ACSA3\"\n    Willow acacia: OTM code \"ACSA3\", USDA code \"ACSA10\"\n\nSo matching USDA code introduces false matches (and was a marginal feature to start with) so it's now gone.","Rick Mohr",true],["71addafee454c5c7025343e1e12e54b75e10af29","6da0130c5aeef94e5bbaabadbf8017270be25c64@azavea.com","Merge pull request #1792 from RickMohr/merge-species\n\nMerge species","Rick Mohr",true],["460f19658cab4ef445bc16657978e7803efc4c0e","6da0130c5aeef94e5bbaabadbf8017270be25c64@azavea.com","Eliminate hard-coded `import_type` values\n\n* Use `TreeImportEvent.import_type` instead of `\"tree\"` and `SpeciesImportEvent.import_type` instead of `\"species\"`\n* Simplify related functions","Rick Mohr",true],["7726587d5b17f94c4bc2661857d1cd3775073689","6da0130c5aeef94e5bbaabadbf8017270be25c64@azavea.com","wip","Rick Mohr",true]],"size":23,"ref":"refs/heads/merge-species-js","head":"eb26c47140483521c76e54e62b827ae349bcf49d"}