Commit graph

2314 commits

Author SHA1 Message Date
Connor Turland 6ed9796e05 no more matter 2017-02-01 17:49:16 +00:00
Connor Turland 08d2cbb00d running algo each time an edge is added 2017-02-01 17:47:45 +00:00
Connor Turland fc2604376a add the gitignore 2017-01-31 03:23:01 +00:00
Connor Turland e7a52dc14e bugs 2017-01-12 14:11:01 -05:00
Connor Turland 149b7ecbd6 include matter-js in package json 2017-01-12 12:37:16 -05:00
Connor Turland b2b5090b28 still make it work for logged out users 2017-01-12 12:31:08 -05:00
Connor Turland 38c01c4e8f fix the carousel 2017-01-12 12:19:54 -05:00
Connor Turland b13ac98c9f chat iss working 2017-01-12 04:55:57 -05:00
Connor Turland 4a17d00123 stuff with metacodes working well again 2017-01-12 04:00:52 -05:00
Connor Turland 9c13f5a281 metacode selector working nicely 2017-01-12 00:04:49 -05:00
Connor Turland 616a489ae4 Merge branch 'feature/better.select' into feature/particles 2017-01-11 23:18:26 -05:00
Connor Turland 816815d1b5 awesome 2017-01-11 23:17:57 -05:00
Connor Turland 3ff102b228 initial particle test 2017-01-05 00:05:18 -05:00
Connor Turland 8e50efb3c1 render messages nicer 2017-01-04 18:12:07 -05:00
Connor Turland 5ab5f6fec2 Update README.md 2017-01-04 17:17:53 -05:00
Devin Howard cbf1ec3afb fix missing npm github dep (#1011) 2017-01-04 12:34:08 -05:00
Connor Turland d3315d962d only render google analytics if a tracking code envvar is set 2017-01-04 12:08:12 -05:00
Connor Turland ae05fb35d3 more config updates for heroku 2017-01-04 11:14:03 -05:00
Connor Turland 9e6ce90950 update config for heroku and prod 2017-01-04 11:08:32 -05:00
Connor Turland bf9b25da9f merge develop 2017-01-04 10:50:59 -05:00
Connor Turland 3868910dde Stream map related events from rails server via actioncable instead of nodejs (#1010)
* actioncable needs puma not webrick

* add framework

* remove the old way

* send events from server to client

* get all events working

* clean up receivable

* map is polymorphic on message

* add the moved event

* make todo comments clear

* verify before streaming from map channel

* rubocop fixes

* wasn't set up correctly for nodejs realtime
2017-01-03 16:12:58 -05: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 df5cc4e1a8 remove exclamation mark 2016-12-26 17:15:42 -05:00
Connor Turland ce073028c8 remove exclamation mark 2016-12-26 17:13:42 -05:00
Connor Turland 7d869d7b63 remove exclamation mark 2016-12-26 17:10:41 -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
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