Connor Turland
db14e4a524
Merge d1680c1895 into 5c1261892f
2016-12-27 02:19:35 +00:00
Connor Turland
5c1261892f
remove the one pixel gap between search input and icon
2016-12-26 21:03:22 -05:00
Connor Turland
9ada1ca935
remove exclamation mark
2016-12-26 17:19:56 -05:00
Connor Turland
ce073028c8
remove exclamation mark
2016-12-26 17:13:42 -05:00
Connor Turland
73e8f2d4c8
re-implement chat in react ( #997 )
...
* hidously mangle ChatView to start moving it to React
* fix up Realtime/index.js - should be good now?
* in theory this should compile
* ok the MapChat renders using react...
* move Handlers code into react - woot
* try reintegrating backbone
* fix wrapper styling
* chat box opens and closes properly
* make the unread count work
* organize more sanely
* refactor some of the ChatView functions
* removed management of chatview from room
* css can stop handling logic right about now
* makin things work
* don't need room here anymore
* set raw html in message
* make pending work
* removeParticipant when mapper left was broken
* re-enable scrolling, focus, and blur
2016-12-21 03:56:29 -05:00
Connor Turland
68f0e91259
track forks ( #994 )
...
* track forks
* update api and docs
* fix tests
2016-12-18 16:17:51 -05:00
Connor Turland
fb12c7e202
Track everything we need to reconstruct maps ( #984 )
...
* feature/more.events
* keep mapping.user as the creator
* cleanup cruft and include slack notifs
* capture topic and synapse updates, store the old values
* avoid the mapping gets deleted problem
* include an indicator of which values changed
* style cleanup
* remove the hack in favor of a legit way
* updated schema file
2016-12-16 16:51:52 -05:00
Devin Howard
9ab1c9c647
Merge pull request #932 from metamaps/feature/mailboxer
...
mailboxer notification centre
2016-12-16 16:41:37 -05:00
Connor Turland
28d960459e
styling of notifs list
2016-12-16 16:25:14 -05:00
Connor Turland
ef84209de1
make it look better when its taking up the full screen width
2016-12-16 16:25:13 -05:00
Connor Turland
2d920cf66a
add maps links to nav locations
2016-12-16 16:25:13 -05:00
Connor Turland
40a97a5ae9
these are output in the main layout file
2016-12-16 16:25:13 -05:00
Devin Howard
186129807e
fix spec, bugs, style
2016-12-16 16:25:08 -05:00
Connor Turland
87228c27c1
Fix mailboxer + email bugs
2016-12-16 16:24:24 -05:00
Connor Turland
6d8392d2e7
Make mailboxer look good and update email templates
2016-12-16 16:24:01 -05:00
Devin Howard
0960159265
Mailboxer notification pagination
2016-12-16 16:23:49 -05:00
Devin Howard
88e98c7342
polish mailboxer with bug fixes
2016-12-16 16:23:32 -05:00
Devin Howard
3f6f020ce1
grant/deny buttons mark access request notifications as read
2016-12-16 16:23:30 -05:00
Devin Howard
8e958ec9a8
invite to edit notifications marked as read in system once map is visited
2016-12-16 16:23:30 -05:00
Devin Howard
9debcdde39
Integrate rails mailers with mailboxer
2016-12-16 16:23:17 -05:00
Robert Best
b4ad51e69d
reactify notification icon
2016-12-16 16:21:40 -05:00
Devin Howard
9b95e91f1a
more style tweaks + brakeman fix
2016-12-16 16:21:23 -05:00
Connor Turland
c46e85529e
little style tweaks to css and content
2016-12-16 16:21:01 -05:00
Devin Howard
85408a14d3
Initial notification centre using mailboxer
2016-12-16 16:20:53 -05:00
Connor Turland
d1680c1895
disable permanent deletion of topics and synapses, except...
...
when the topic or synapse no longer appears on any maps, and this can currently only be performed over the api
2016-12-14 14:17:55 -05:00
Connor Turland
3b8a5d0c2e
Update message_policy.rb ( #973 )
2016-12-14 13:23:40 -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
4da3a9d55f
hide mobile menu if browser is resized to full size ( #937 )
2016-11-28 13:53:29 -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
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
Devin Howard
3759851621
fix access#access route ( #926 )
2016-11-08 09:37:06 -08:00
Devin Howard
9df974a037
strip whitespace from search terms ( #919 )
2016-11-07 14:58:53 -05:00
Devin Howard
2f4fe525ce
Fix a bunch of errors and style issues
2016-11-07 14:55:20 -05:00
Devin Howard
518782e1c7
remove Metamaps.Erb
2016-11-07 14:55:20 -05:00
Devin Howard
7c9b6a2205
try to move all rails data into Metamaps.ServerData
...
Metamaps.Erb and currentPage and currentSection are still not in; should they be?
2016-11-07 14:55:20 -05:00
Devin Howard
8026969799
start storing data in ServerData
2016-11-07 14:55:17 -05:00
Devin Howard
4b500a4428
move Metamaps.Loading into node modules
2016-11-07 14:40:43 -05:00
Connor Turland
0f85abfda2
add channel to webhooks ( #915 )
2016-11-05 09:34:50 -07:00
Connor Turland
48b93b2269
change grant to allow. fixes #909 ( #910 )
2016-11-04 13:22:06 -07:00
Devin Howard
a9c67e70d4
move webhook and event serializers back ( #899 )
2016-11-01 09:46:44 +08:00
Connor Turland
b013499c76
misnamed variable errors out maps search ( #893 )
2016-10-31 16:41:37 -04:00
Devin Howard
814c1acc0f
a few markdown style updates ( #885 )
...
* markdown block padding
* a few more markdown style updates
2016-10-31 15:38:16 +08:00
