{"push_id":1597676370,"size":3,"distinct_size":1,"ref":"refs/heads/instance/metamapscc","head":"a32cc1090c6f8c83a1297f23ab2edc5eb4fd8e54","before":"03f6ea16ad6f8b7727073070742c21a0c04815c0","commits":[{"sha":"7ee96bf6c6517cc61d8961c131a2339fe2ab3d52","author":{"name":"Connor Turland","email":"91f2f2c9a3ef1b7914d330a953a6078b69002d7c@gmail.com"},"message":"Into master: two finger pan/zoom, map and topic follows (for internal testing) on the UI, map activity emails (#1084)\n\n* fix topic spec\r\n\r\n* fix synapse/mapping spec\r\n\r\n* brakeman csrf warning suppressed :|\r\n\r\n* follows for maps in the ui for internal testing only still (#1072)\r\n\r\n* follows for maps in the ui for testers\r\n\r\n* require user for these actions\r\n\r\n* match how map follow works\r\n\r\n* include ability to unfollow from email\r\n\r\n* fixup templates\r\n\r\n* add unfollow_from_email to the policies\r\n\r\n* Update _cheatsheet.html.erb\r\n\r\nClean up text, clarify, and bring in line with current functionality\r\n\r\n* topicsRegex and synapsesRegex should allow commas (#1073)\r\n\r\n* even better import csv regexes\r\n\r\n* prevent double prompt on file drop import\r\n\r\n* topic card in react (#1031)\r\n\r\n* its coming along\r\n\r\n* links bar\r\n\r\n* scssify a bunch\r\n\r\n* metacode image working a bit better\r\n\r\n* metacode selector in react topic card\r\n\r\n* riek editing for name field on topic card\r\n\r\n* riek submit on enter\r\n\r\n* factor out Title and Links from Topic Card component, but not the listeners\r\n\r\n* create working Desc editor\r\n\r\n* styling is much better now\r\n\r\n* textarea min height for desc\r\n\r\n* disallow images in topic card markdown\r\n\r\n* shift enter is linebreak, enter is save\r\n\r\n* attachments split out, but it's pretty buggy\r\n\r\n* move listeners into Links.js\r\n\r\n* slightly wider metacodeTitle\r\n\r\n* fix positioning on metacode selector\r\n\r\n* fix metacode selection\r\n\r\n* move metacode and permissions into subcomponents\r\n\r\n* fixes\r\n\r\n* prevent editing on desc/title if not authorized to edit\r\n\r\n* fix topic card draggability\r\n\r\n* fix embedly\r\n\r\n* fix md test\r\n\r\n* remove the removed link card manually with jquery\r\n\r\n* fix test syntax\r\n\r\n* eslint\r\n\r\n* more eslin\r\n\r\n* reuse authorizedToEdit\r\n\r\n* convert metacode sets to a json object for react\r\n\r\n* add the html in react whoop\r\n\r\n* fix metacode styling\r\n\r\n* sort wasn't working\r\n\r\n* finishing metacode select\r\n\r\n* readd the above link input border\r\n\r\n* fix syntax\r\n\r\n* multiline title editable textarea\r\n\r\n* more portable metacode selector component\r\n\r\n* factor out #metacodeOptions into one react component with a callback :D:D:D\r\n\r\n* render metacodeOptions in right click menu with react\r\n\r\n* render metacodeOptions in right click menu with react\r\n\r\n* fix up right click menu's metacode editing\r\n\r\n* fix topic card title character counter\r\n\r\n* ignore metamaps secret bundle in ag\r\n\r\n* simplify Attachments props\r\n\r\n* factor out embedly card into its own component; it seems to help\r\n\r\n* link resetter\r\n\r\n* fix edit icon on title in topic card\r\n\r\n* move mapCount and synapseCount hover/click logic to react\r\n\r\n* fix up the showMore control\r\n\r\n* metacode selection tweaks\r\n\r\n* tweak links bar spacing in topic card\r\n\r\n* rubocop\r\n\r\n* remove TODOs\r\n\r\n* more badass permissions selector\r\n\r\n* close permission selector when you click outside\r\n\r\n* fix overeager metacode selector\r\n\r\n* more modular attachments component\r\n\r\n* fix bug in Desc.js\r\n\r\n* fix right click styling\r\n\r\n* permission changes are different than edit rights\r\n\r\n* bad module ref\r\n\r\n* ensure maxLength on topic titles\r\n\r\n* hellz yeah (#1074)\r\n\r\n* fix drop from two touches to one\r\n\r\n* don't commit activity service\r\n\r\n* ability to select/unselect all metacodes in custom set with keyboard shortcut (fix #390) (#1078)\r\n\r\n* ability to select/unselect all metacodes in custom set with keyboard shortcut\r\n\r\n* select all button\r\n\r\n* nicer all/none buttons\r\n\r\n* set up react testing (#1080)\r\n\r\n* install mocha-webpack. also switch hark to npm version instead of github version\r\n\r\n* well, mocha-webpack runs\r\n\r\n* add jsdom for tests\r\n\r\n* upgrade to webpack 2\r\n\r\n* fix npm run test errors\r\n\r\n* ImportDialogBox component tests\r\n\r\n* Fixes bug where pressing delete key while editing text will suggest... (#1083)\r\n\r\n* Fixes bug where pressing delete key while editing text will suggest the deletion of selected map entities\r\n\r\n* Changed the DEL key to remove entities instead of delete them\r\n\r\n* temporarily disable code climate duplication engine\r\n\r\n* add topic following for internal testing\r\n\r\n* daily map activity emails (#1081)\r\n\r\n* data prepared, task setup\r\n\r\n* add the basics of the email template\r\n\r\n* cover granular permissions\r\n\r\n* unfollow this map\r\n\r\n* break out permissions tests better\r\n\r\n* rename so test runs","distinct":false,"url":"https://api.github.com/repos/metamaps/metamaps/commits/7ee96bf6c6517cc61d8961c131a2339fe2ab3d52"},{"sha":"3178f6e6500ffa9ace20a58bae38de4d6a3ca556","author":{"name":"Connor Turland","email":"91f2f2c9a3ef1b7914d330a953a6078b69002d7c@gmail.com"},"message":"bump version number","distinct":false,"url":"https://api.github.com/repos/metamaps/metamaps/commits/3178f6e6500ffa9ace20a58bae38de4d6a3ca556"},{"sha":"a32cc1090c6f8c83a1297f23ab2edc5eb4fd8e54","author":{"name":"Connor Turland","email":"91f2f2c9a3ef1b7914d330a953a6078b69002d7c@gmail.com"},"message":"Merge remote-tracking branch 'origin/master' into instance/metamapscc","distinct":true,"url":"https://api.github.com/repos/metamaps/metamaps/commits/a32cc1090c6f8c83a1297f23ab2edc5eb4fd8e54"}]}
{"actor":{"display_login":"Connoropolous"}}