Commit graph

2301 commits

Author SHA1 Message Date
Connor Turland
0558cabd8e re-enable scrolling, focus, and blur 2016-12-21 03:51:42 -05:00
Connor Turland
39afe4342b removeParticipant when mapper left was broken 2016-12-21 03:36:30 -05:00
Connor Turland
7cd70438bc make pending work 2016-12-21 03:36:09 -05:00
Connor Turland
87e84128ab set raw html in message 2016-12-21 03:15:02 -05:00
Connor Turland
3dd6245d52 don't need room here anymore 2016-12-21 03:11:40 -05:00
Connor Turland
85588825f0 makin things work 2016-12-20 12:27:58 -05:00
Connor Turland
f8c4520036 css can stop handling logic right about now 2016-12-20 12:15:39 -05:00
Connor Turland
13f8557f80 removed management of chatview from room 2016-12-20 12:08:32 -05:00
Connor Turland
34a44dccd6 refactor some of the ChatView functions 2016-12-20 09:59:04 -05:00
Connor Turland
7d43abeefe organize more sanely 2016-12-19 17:09:49 -05:00
Connor Turland
b5e8fa0fc2 make the unread count work 2016-12-19 15:52:05 -05:00
Connor Turland
125e1c86a3 chat box opens and closes properly 2016-12-19 14:57:53 -05:00
Connor Turland
c9380948e7 fix wrapper styling 2016-12-19 14:23:07 -05:00
Devin Howard
b6d8a2f568 try reintegrating backbone 2016-12-19 00:49:18 -05:00
Devin Howard
b1bfa757cb move Handlers code into react - woot 2016-12-19 00:41:31 -05:00
Devin Howard
f51a155879 ok the MapChat renders using react... 2016-12-19 00:08:48 -05:00
Devin Howard
88419294f1 in theory this should compile 2016-12-18 23:27:22 -05:00
Devin Howard
2c17c2c6a3 fix up Realtime/index.js - should be good now? 2016-12-18 22:45:56 -05:00
Devin Howard
79b6f74a5c hidously mangle ChatView to start moving it to React 2016-12-18 22:40:41 -05:00
Connor Turland
68f0e91259 track forks (#994)
* track forks

* update api and docs

* fix tests
2016-12-18 16:17:51 -05:00
Devin Howard
33fc27ffd1 Merge pull request #989 from metamaps/fix/travis
fix travis
2016-12-16 17:16:32 -05:00
Devin Howard
7ca7f0862f fix mapping spec 2016-12-16 17:09:23 -05:00
Devin Howard
c604e69d77 enable postgresql 9.4 in travis 2016-12-16 17:09:23 -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
3b8a5d0c2e Update message_policy.rb (#973) 2016-12-14 13:23:40 -05:00
Robert Best
6f88c2a7eb Update ISSUE_TEMPLATE.md 2016-12-12 13:49:26 -05:00
Robert Best
f1e62fb6c1 Update ISSUE_TEMPLATE.md
changed multiplication symbol so that double-clicking number placeholders works again.
2016-12-12 13:47:00 -05:00
Robert Best
0c52188014 Update ISSUE_TEMPLATE.md
reduced whitespace
2016-12-12 13:30:56 -05:00
Robert Best
7c0e0f731f Update ISSUE_TEMPLATE.md
changed multiplication sign from asterisks to x, because markdown treats asterisks as special.
2016-12-12 11:35:59 -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