glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
2283 commits 40 branches 27 tags 58 MiB
Commit graph

2283 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Devin Howard b914065bb3 Merge branch 'develop'; tag v3.1 2016-12-16 17:17:24 -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
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 00286fcc29 tag v3.0.4 2016-12-06 12:38:06 -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