Commit graph

2283 commits

Author SHA1 Message Date
Devin Howard
309534dcc1 brakeman ignore viw notifications/show line 7 2016-12-11 17:48:53 -05:00
Devin Howard
606bfedb91 ok, the mailboxer emails mostly work 2016-12-11 17:48:53 -05:00
Devin Howard
b0e723fe4b hide funky triangle above notifications dot 2016-12-11 17:48:53 -05:00
Connor Turland
5e27e39f96 little style tweaks to css and content 2016-12-11 17:48:53 -05:00
Devin Howard
41a2b9bf0f move notification icon to be visible outside the account menu 2016-12-11 17:48:53 -05:00
Devin Howard
1fabfd832b link entire notification, except read-unread toggler 2016-12-11 17:48:52 -05:00
Devin Howard
689a965f9d fix some rubocop issues and tweak some code 2016-12-11 17:48:52 -05:00
Devin Howard
6415725ad6 body chunking??? 2016-12-11 17:48:52 -05:00
Devin Howard
c154716346 add mailboxer templates for overriding their style 2016-12-11 17:48:52 -05:00
Devin Howard
8267054d89 fugly integration of map mailers into mailboxer 2016-12-11 17:48:51 -05:00
Devin Howard
1d36ee03b2 send mailboxer notifications as emails if user doesn't have emails disabled 2016-12-11 17:48:51 -05:00
Devin Howard
99060abbfc add unsubscribe link to emails 2016-12-11 17:48:51 -05:00
Devin Howard
5698c3bad4 make unsubscribing work even if logged out 2016-12-11 17:48:51 -05:00
Devin Howard
4629ebf8f9 configurable field to unsubscribe from emails + link to do it yourself 2016-12-11 17:48:50 -05:00
Devin Howard
79634f8faf code climate fixes 2016-12-11 17:48:50 -05:00
Devin Howard
4e93b4fce6 back to mapping link shared view 2016-12-11 17:48:50 -05:00
Devin Howard
2b37f00960 add more styling to the notification pages 2016-12-11 17:48:49 -05:00
Devin Howard
2db803e496 notifications bar 2016-12-11 17:48:49 -05:00
Devin Howard
1e6d96fce2 notification dot for mobile 2016-12-11 17:48:49 -05:00
Devin Howard
93ad92f7e8 bell icon 2016-12-11 17:48:48 -05:00
Devin Howard
79a3059ca3 update css classes 2016-12-11 17:48:48 -05:00
Devin Howard
11bbcb242f red dot if there are unread notifications 2016-12-11 17:48:48 -05:00
Devin Howard
dbcd64bfe9 styling on you 2016-12-11 17:48:48 -05:00
Devin Howard
46c563afb2 start integrating notifications into account menu 2016-12-11 17:48:47 -05:00
Devin Howard
dcb70e86e2 ability to mark as read/unread 2016-12-11 17:48:47 -05:00
Devin Howard
7dd37c50d3 notifications index/show 2016-12-11 17:48:47 -05:00
Devin Howard
aefab7bc0d notifications route 2016-12-11 17:48:46 -05:00
Devin Howard
3c1d163984 install mailboxer gem to db + user model 2016-12-11 17:48:46 -05:00
Devin Howard
1ba339b3be subset of synapse creation changes (#970)
* esc cancels topic and synapse creation now

* close topic/synapse creation on right click

* backspace and delete don't close synapse creation anymore

* hitting tab saves the synapse you're creating
2016-12-11 17:15:09 -05:00
Devin Howard
6129a27ecf hit Ctrl+A a second time to select all synapses, too (#968) 2016-12-11 16:21:36 -05:00
Devin Howard
d51e3f3b52 update npm deps, EXCEPT socket.io and backbone (#950)
* update npm dependencies (with some exceptions)

* update autolinker, remove underscore
2016-12-11 16:09:12 -05:00
Robert Best
1317186f63 Update ISSUE_TEMPLATE.md
changed all place-holders to underscores, they ae easier to double-click so as to select/replace.
2016-12-09 13:40:58 -05:00
Robert Best
d6527ea80e Create ISSUE_TEMPLATE.md 2016-12-09 12:20:30 -05:00
Connor Turland
a133702be2 Some topics and synapses were hidden from users erroneously (#944)
* ensure topics and synapses have their permission match the map they're deferring to

* update permission of topics and synapses as map perm changes, when defer_to_map

* try enabling count threshold on rubocop

* remove unused mk_permission functions

* change *_count methods to use delegate to save lines in map.rb model

* rubocop topic.rb
2016-12-06 16:46:46 -05:00
Devin Howard
d2074ada79 fix policy scope errors in search controller (#947) 2016-12-06 13:09:42 -05:00
Devin Howard
01cd624bfa add polyfill so chrome 49 can upload map thumbnail screenshots (#946) 2016-12-06 12:36:06 -05:00
Connor Turland
a5f793fe54 fixup topic card template 2016-12-02 21:21:37 +00:00
Devin Howard
d1aa62d382 fix policy scope error (#941) 2016-11-30 11:46:09 -05:00
Devin Howard
3f161c1076 make topic titles have width of 25 chars (#933) 2016-11-29 11:00:14 -05:00
Devin Howard
4da3a9d55f hide mobile menu if browser is resized to full size (#937) 2016-11-28 13:53:29 -05:00
Devin Howard
90c5bc26fc Active.Mapper was being initialized twice, causing errors (#934) 2016-11-27 21:12:05 -05:00
Devin Howard
5d8ff3efce realtime shouldn't poll forever if the dev server isn't up (#931) 2016-11-24 14:40:14 -05:00
Devin Howard
95b8b52224 fix NoMethodError in topics#autocomplete_topic (#930) 2016-11-24 14:16:58 -05:00
Devin Howard
55853c60f4 update user model with fixes, including style and recentMetacodes algorithm (#922) 2016-11-13 14:29:07 -08:00
Devin Howard
5b90c38b22 Merge pull request #902 from metamaps/fix/schema
fix db schema
2016-11-13 14:24:31 -08:00
Devin Howard
c03d6dd5f6 remove in_trash from schema to match production 2016-11-13 17:21:42 -05:00
Devin Howard
51d5d77629 Merge pull request #929 from metamaps/fix/develop-bugs
fix some develop bugs, merge master, and move realtime port to .env
2016-11-09 21:14:48 -05:00
Devin Howard
ce2d462578 fix bugs on develop branch 2016-11-09 20:44:00 -05:00
Devin Howard
4533a0f2fe merge changes from metamapscc instance branch (#913)
* homepage video fallback

* public/50x.html

* remove blog from public/ html pages

* remove video file since it's on metamaps.cc server

* eslint
2016-11-09 09:34:10 -05:00
Devin Howard
5851d57eef Merge branch 'master' into develop 2016-11-09 09:29:30 -05:00