Commit graph

954 commits

Author SHA1 Message Date
Connor Turland f49a674566 tweaks for developing on this branch 2017-02-06 03:41:28 +00:00
Connor Turland 7951f08e45 Merge branch 'develop' into feature/convo.algo 2017-02-06 03:36:26 +00:00
Connor Turland 0441850504 Secret.convo (#1059)
* set up for using secret css/js

* testing

* add stuff

* final tweak for secret convos

* looks like its all working

* realized this change is just good all around

* minor touch ups

* only us for now

* no longer validate presence of xloc/yloc

* fix syntax issue
2017-02-05 14:30:23 -05:00
Connor Turland 72fd2717b6 Merge branch 'develop' into feature/convo.algo 2017-02-05 05:26:58 +00:00
Connor Turland 96f66a2f8c fix up topic creator 2017-02-04 04:27:08 +00:00
Devin Howard b16617286f revert back to jquery 1 to fix best in place 2017-01-23 19:50:59 -05:00
Devin Howard d16709e8e7 fix codeclimate style issues (#1046)
* bunch of code climate fixes

* more
2017-01-23 19:30:13 -05:00
Devin Howard 0ad10c0f5a fix style of thumb button on map card (#1044) 2017-01-23 14:02:14 -05:00
Devin Howard 2652d53e9b update ruby dependencies too (#1042)
* update rubygem dependencies

* update backbone

* brakeman fix

* brakeman

* ugh syntax fix
2017-01-22 16:41:51 -05:00
Devin Howard 2fd972ddce ajax queue (fixes #853) (#1037)
* jquery.ajaxq

* install jquery.ajaxq from npm

* patch ajaxq into Backbone code

* use ajaxq library with more github stars

* eslint
2017-01-22 13:50:34 -05:00
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
Connor Turland 38c01c4e8f fix the carousel 2017-01-12 12:19:54 -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 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 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 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 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 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 88e98c7342 polish mailboxer with bug fixes 2016-12-16 16:23:32 -05:00
Devin Howard 9debcdde39 Integrate rails mailers with mailboxer 2016-12-16 16:23:17 -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
Devin Howard 01cd624bfa add polyfill so chrome 49 can upload map thumbnail screenshots (#946) 2016-12-06 12:36:06 -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 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 518782e1c7 remove Metamaps.Erb 2016-11-07 14:55:20 -05: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 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 6b1220b533 overflow-y: hidden on body to prevent openLightbox from showing a scrollbar (#859) 2016-10-27 18:40:42 -04:00
Devin Howard e640048386 fix topic card title word break css (#844) 2016-10-26 17:01:05 +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