Devin Howard
af2c6ebef1
split screenshot function/button into two parts ( #1027 )
...
* split screenshot function into 4 separate helpers
* screenshot download button in import dialog box
* thumbnail button inside map info box
* import blue button styling
* fight with styling to make the button at least appear
* add more text
* fix tooltip display
* automatically start downloading the screenshot
* eslint
* revamp GlobalUI.notifyUser
* fix object destructuring syntax
* fix
2017-01-19 14:50:08 -05:00
Devin Howard
a9f19815e4
fix api embed to use the correct serializers ( fix #998 ) ( #1029 )
...
* use correct serializer for singular embeds in api (almost fixes #998 )
* fix has_many api embeds too!
* unused arg
2017-01-19 14:49:40 -05:00
Devin Howard
f3539f54bf
hotfix ugh
2017-01-11 23:36:30 -05:00
Devin Howard
75ccfb0ab3
hotfix map title in meta tags whoops
2017-01-11 23:32:13 -05:00
Devin Howard
7b5bd53c28
I think this will fix the meta tags ( #1030 )
2017-01-11 23:27:05 -05:00
Connor Turland
5302f03196
remove exclamation mark
2017-01-11 23:00:19 -05:00
Devin Howard
f64612f99b
add meta tags to maps ( #1028 )
2017-01-11 22:26:45 -05:00
Connor Turland
cbc38e0c93
emoji-mart styling fix
2017-01-11 14:02:11 -05:00
Connor Turland
0952c0f3c9
Bug/name.overflow ( #1025 )
...
* creator name was pushing 'view only' off card
* Update MapCard.js
2017-01-11 13:36:07 -05:00
Connor Turland
e84dfbaa33
fix message styling
2017-01-09 13:27:39 -05:00
Devin Howard
cb95e027c4
Add emoji to chat ( #1013 )
...
* add emoji picker unstyled
* rename junto.css.erb => junto.scss.erb
* junto scss-ified
* add emoji mart css
* emoji are replaced in the text area
* remove unicode emoji from messages before sending to db
* add emoji back into messages on display
* bigger font size on chat messages
* tweak styling
* codeclimate (eslint)
2017-01-09 13:14:20 -05:00
Connor Turland
8e50efb3c1
render messages nicer
2017-01-04 18:12:07 -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
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
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
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
Devin Howard
62e2acdd52
add about lightbox again ( #884 )
...
* add about lightbox again
* fix about lightbox style
2016-10-31 15:38:09 +08:00
Devin Howard
bc1f212c93
fix tab/shift-tab for metacode selection ( #879 )
2016-10-30 00:08:51 +08:00
Devin Howard
5e0e44b436
supercharge the schemas ( #874 )
...
* fix map schema - woot it works
* update other schemas to include embeddable attrs
* update current user schema/examples
2016-10-29 22:58:31 +08:00
Devin Howard
1fbfd56d57
filter maps by user_id in api ( #872 )
...
* filter maps by user_id in api
* test user_id map filter
* update starred maps example to make starred true lol
* add user id to map schema/examples
2016-10-29 22:07:27 +08:00
Devin Howard
a32f98bde2
to_json should be as_json or there's bugs ( #870 )
...
* to_json should be as_json or there's bugs
* revert explore controller, it's better without
* revert search controller and some topic methods
2016-10-29 18:28:29 +08:00
Devin Howard
e49e5c258a
make synapse permissions depend on topic1 and topic2 ( #839 )
...
* deep change to synapse policy - is this ok?
* make synapse policy resilient to nil topic1/topic2/map
* use a transaction to handle authorization vs invalid record in synapse controller
* more synapse controller tests
* inline documentation
* fix policy(Synapse).create?
2016-10-28 11:03:59 +08:00
Devin Howard
4dc32d7d2e
fix metacodes page scrolling ( #862 )
...
* fix metacodes page scrolling
use scheme from
http://brandonhilkert.com/blog/page-specific-javascript-in-rails/
* switch overflow:hidden to be on explicit controllers
2016-10-28 10:55:04 +08:00
Devin Howard
9d821c920b
reorder API authentication precedence to be: token, oauth, cookie ( #860 )
...
* reorder authentication to be: token, then oauth, then cookie
* all APIs but tokens are accessible anonymously (so add mappings to the list)
* fix mapping order
2016-10-28 10:51:58 +08:00
Devin Howard
6b1220b533
overflow-y: hidden on body to prevent openLightbox from showing a scrollbar ( #859 )
2016-10-27 18:40:42 -04:00
Devin Howard
175a3ee73e
policy_scope on has_many relationships in serializers ( #840 )
...
* token overrides current user in api
* policy scope has_many relationships
* fix hard coded topics - whoops
* handle policy_scope returning nil in application serializer
2016-10-26 19:56:30 +08:00
Devin Howard
e640048386
fix topic card title word break css ( #844 )
2016-10-26 17:01:05 +08:00
Devin Howard
8a95262f2c
allow anonymous users to GET api routes ( #842 )
...
* make map methods use ActiveRecord relations so they don't error on pundit
* test for logged out maps GET api
* open up GET routes on maps/topics/synapses and update api docs
2016-10-26 08:37:23 +08:00
Devin Howard
5163794698
anonymous users are nil, so need to remove the raise ( #841 )
2016-10-25 12:26:22 +08:00
Connor Turland
ce1205f6d7
one more mapper card style fix
2016-10-24 14:35:23 +00:00
Connor Turland
96d25cc91d
mapper profile mobile styling
2016-10-24 14:23:05 +00:00
Connor Turland
a9ef6feebd
mapper page bug fix and styling
2016-10-24 13:42:26 +00:00
Connor Turland
98e2de68da
oooh was using ineffective media queries for desktop
2016-10-23 16:49:16 -04:00
Connor Turland
cda0c21a0b
make it responsive ( #820 )
2016-10-23 16:12:07 -04:00
Connor Turland
aa96d074af
dont show import on topic page
2016-10-23 11:21:38 -04:00
Devin Howard
a63cd02bc6
fix develop branch bug
2016-10-23 22:51:16 +08:00
Devin Howard
fb6c8a74a7
scoping on topic json properties ( #813 )
2016-10-23 22:11:38 +08:00
Devin Howard
5db8e27496
make metacode selector reliable after switching metacode sets ( #816 )
2016-10-23 22:11:26 +08:00
Devin Howard
87dc20fa50
stop showing map info box on topic view ( #815 )
2016-10-23 22:07:38 +08:00
Connor Turland
d359eb063a
fixed the oauth redirect bug and a bit more ( #796 )
2016-10-22 16:46:39 +08:00
Connor Turland
4187dbd803
fix it up ( #804 )
2016-10-22 03:58:19 -04:00
Connor Turland
d549083cce
prefer variable height lightbox over scrolling visually
2016-10-22 03:10:33 -04:00
Connor Turland
bc8660c83e
remove about lightbox in prep for homepage redo and about page
2016-10-22 03:10:09 -04:00
Connor Turland
31078c554e
just make it 'tutorial'
2016-10-22 02:41:36 -04:00
Connor Turland
8e38469b1f
add border radius to mapper list
2016-10-21 18:10:37 -04:00
Connor Turland
be8efa6025
add card features ( #793 )
2016-10-21 17:42:21 -04:00
Connor Turland
fb427a11f0
[WIP] keep client fresh with junto info globally ( #791 )
...
* push state to client
* junto status is live on map cards XD
* little fixes
* eslint stuff
* remove object rest spread
* i think this makes realtime work without needing babel-node
2016-10-21 09:29:04 -04:00
Connor Turland
52c340b8f5
center the explore maps div! ( #787 )
...
* ooh baby
* will add displayStyle again later if we actually build it
2016-10-19 14:40:42 -04:00
Devin Howard
261ed49977
replace uservoice with docs.metamaps.cc + Hylo ( #777 )
...
* replace uservoice with docs.metamaps.cc + Hylo
* re-add the feedback tab as link to hylo
2016-10-19 13:39:57 -04:00
Devin Howard
7f1c04015e
fix topic autocomplete controller action
2016-10-19 22:10:38 +08:00
Devin Howard
bb6566a45e
clean up and fix devise code
2016-10-19 12:40:52 +08:00
Connor Turland
139837e997
restructure realtime server for clarity ( #780 )
...
* restructure realtime server for clarity
* better indenting on signal.js
* don't need it because socketioconnection is being imported now
2016-10-18 20:29:21 -04:00
Devin Howard
6c9d464a9f
Global => All Maps ( #774 )
2016-10-17 10:53:33 -04:00
Connor Turland
517cfcb913
remove static lib files in favor of npm ones ( #773 )
...
* remove static lib files in favor of npm ones
* update howler to work correctly
* patch npm modules to not use window
2016-10-17 10:39:08 -04:00
Devin Howard
0ee1b3284a
fix check-canvas-support require
2016-10-17 13:47:42 +08:00
Devin Howard
b976c13db2
Merge pull request #770 from metamaps/feature/remove-canvas-function
...
remove check-canvas-support.js
2016-10-17 13:40:34 +08:00
Connor Turland
c0955d7c5e
multiple policy issues ( #771 )
...
* multiple policy errors
* make some things more explicit
2016-10-17 01:20:48 -04:00
Connor Turland
332bb2ec08
Map Card changes ( #769 )
...
* map card rewrite underway
* star count
* css fix
2016-10-16 23:46:55 -04:00
Devin Howard
179849b639
remove check-canvas-support.js
2016-10-17 11:42:11 +08:00
Connor Turland
4602ded8a4
access requests ( #762 )
...
* start on access requests
* set up access requests further
* set default values for approved and answered
2016-10-16 20:22:00 -04:00
Devin Howard
6f3c74b7f1
token policy fix
2016-10-13 15:21:27 +08:00
Devin Howard
7eae8deacb
revamp HTML template a bit for api docs ( #757 )
...
* my_tokens endpoint moved to normal index
* remove secured_by from metacodes/users
* ch ch ch changes
* mess with template
* fix securedBy
* convenience open
* gross authentication notes at the top of every endpoint
* better ordering
* move login tutorials into security tab
* oauth tutorial
* getting closer
* remove unneeded Endpoints header
* ok looks OK
2016-10-12 13:54:43 -04:00
Devin Howard
9ac24f7468
Merge pull request #744 from metamaps/feature/markdown-in-topic-cards
...
markdown in topic card description field
2016-10-08 16:58:32 +08:00
Devin Howard
fe1c57b458
further updates - make Enter update bip fields whaaat
2016-10-08 16:55:46 +08:00
Devin Howard
9d85dab975
Merge pull request #747 from metamaps/fix/unauth-error
...
redirect to root_path if you get a 403
2016-10-08 14:16:13 +08:00
Devin Howard
ab76b77bdd
Merge pull request #748 from metamaps/feature/api-json-404
...
return 404s for all unmatched api routes
2016-10-08 14:16:00 +08:00
Devin Howard
9513087bbd
remove unnecessary api v1 code
2016-10-08 14:12:54 +08:00
Devin Howard
2c64b67abd
return 404s for all unmatched api routes
2016-10-08 13:58:19 +08:00
Devin Howard
0764133d11
Merge pull request #661 from metamaps/feature/file-upload-component
...
set up a dialog box to help with import/export
2016-10-08 12:34:28 +08:00
Devin Howard
129e3db946
redirect to root_path if you get a 403
2016-10-08 12:26:08 +08:00
Devin Howard
f775629371
showCard .desc css for ul and a tags
2016-10-08 09:24:17 +08:00
Devin Howard
0085ce71e6
upgrade to best in place 3.0.0 alpha
2016-10-08 09:24:16 +08:00
Devin Howard
fc044294f1
add markdown to topic cards
2016-10-08 09:23:57 +08:00
Devin Howard
20da1ef39f
fiddle with import icon
2016-10-08 00:21:04 +08:00
Devin Howard
42bb2cd86a
look and feel updates
2016-10-08 00:16:37 +08:00
Connor Turland
86a6e92bc3
dont show private maps in global collection ( #734 )
...
* dont show private maps in global collection
* Update explore_controller.rb
* Update main_controller.rb
2016-10-06 23:45:17 -04:00
Connor Turland
b52523e7be
one more maps in maps error
2016-10-06 10:32:06 -04:00
Connor Turland
e72ae5df94
another issue from the maps in maps branch
2016-10-06 09:33:10 -04:00
Connor Turland
a56c4eb110
missing comma
2016-10-06 09:27:18 -04:00
Connor Turland
85dcad928f
enable pulling in of references to maps through typeahead ( #636 )
2016-10-06 09:12:01 -04:00
Devin Howard
38c323a18a
global lightbox css changes
2016-10-06 16:22:22 +08:00
Devin Howard
518773d6e1
pop up a lightbox using React to help you export
2016-10-06 16:22:21 +08:00
Devin Howard
eb4073c228
word wrap on chat message text. Fixes #726
2016-10-06 11:18:55 +08:00
Connor Turland
98fae4b721
fixes #711 toast button styling
2016-10-05 22:28:37 -04:00
Connor Turland
6d6a5099e9
Enable access to Most Used and Recently Used metacodes in lists and carousel ( #708 )
...
* used and recent
* enable most used and recent in all metacode select situations
* selected changed to active at some point
* switch recent and most used positions
* remove index doc page
2016-10-05 10:45:39 -04:00
Devin Howard
d193c9a53c
add starred to maps API ( #719 )
...
* add starred to maps API and endpoint to create/delete
* add token to requests without token param
* add minor version number to api version
* metacode/user use uri in schema
* make code climate happier
2016-10-05 10:36:03 -04:00
Devin Howard
df29e48d8c
rubocop + allow unauthed users to see all users
2016-10-04 22:51:21 +08:00
Devin Howard
2eae89a6b7
users and metacodes api endpoints
2016-10-04 22:28:10 +08:00
Devin Howard
8afef1bc4a
make tokens description field optional
2016-10-04 16:08:07 +08:00
Devin Howard
3d7a2ef5b1
make raml traits work and be accurate/useful
2016-10-04 15:22:24 +08:00
Connor Turland
da3795a2c2
new map improvements ( #710 )
...
* prehighlight the text for editing when taken to a new map
* style
2016-10-02 22:49:45 -04:00
Devin Howard
7d0b56da19
Merge pull request #689 from metamaps/feature/user-in-slack-notification
...
Custom formatter for slack exception notifications
2016-10-03 08:26:13 +08:00
Devin Howard
87228a9631
delete old gems and upgrade aws/paperclip ( #676 )
...
* remove old gems from gemfile, upgrade aws/paperclip
* update paperclip config
* upload screenshots as a blob instead of base64 to maps controller
2016-10-02 18:29:35 -04:00
Devin Howard
afa4422608
Custom formatter for slack exception notifications
2016-10-02 17:07:45 +08:00
Devin Howard
bc139608c2
Search.focus() is the new Search.open()
2016-10-02 10:09:55 +08:00
Devin Howard
7156fab3e2
fix topic controller bugs
2016-09-30 14:42:07 +08:00
Connor Turland
93341719a9
Update main_controller.rb ( #682 )
2016-09-28 20:22:55 -04:00
Devin Howard
db3cf0490f
fix develop branch bugs ( #679 )
...
* bugfix - rename SearchController so it works
* remove unneeded respond_with
* fix to_json calls
2016-09-29 08:02:25 +08:00
Devin Howard
9699b41159
make requestinvite controller method explicit
2016-09-28 22:29:53 +08:00
Devin Howard
5b9eedc830
pull search routes into their own controller
2016-09-28 22:29:53 +08:00
Devin Howard
5065655436
factor stars into their own controller
2016-09-28 22:27:32 +08:00
Devin Howard
3ee8d41298
maps controller code climate
2016-09-28 22:27:32 +08:00
Devin Howard
f75ad41a82
factor out map_scope function
2016-09-28 22:27:32 +08:00
Devin Howard
bb87c9c2db
simplify explore controller a bit
2016-09-28 22:27:32 +08:00
