Connor Turland
0a52de714e
make it match develop
2017-02-05 05:41:29 +00:00
Connor Turland
72fd2717b6
Merge branch 'develop' into feature/convo.algo
2017-02-05 05:26:58 +00:00
Devin Howard
53bc4ee1c8
fix mapper page ( #1050 )
2017-01-28 15:44:38 -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
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
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
616a489ae4
Merge branch 'feature/better.select' into feature/particles
2017-01-11 23:18:26 -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
d3315d962d
only render google analytics if a tracking code envvar is set
2017-01-04 12:08:12 -05:00
Connor Turland
bf9b25da9f
merge develop
2017-01-04 10:50:59 -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
28d960459e
styling of notifs list
2016-12-16 16:25:14 -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
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
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
a5f793fe54
fixup topic card template
2016-12-02 21:21:37 +00:00
Devin Howard
2f4fe525ce
Fix a bunch of errors and style issues
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
48b93b2269
change grant to allow. fixes #909 ( #910 )
2016-11-04 13:22:06 -07: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
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
fb6c8a74a7
scoping on topic json properties ( #813 )
2016-10-23 22:11: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
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
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
bb6566a45e
clean up and fix devise code
2016-10-19 12:40:52 +08:00
Devin Howard
6c9d464a9f
Global => All Maps ( #774 )
2016-10-17 10:53:33 -04: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
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
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
42bb2cd86a
look and feel updates
2016-10-08 00:16:37 +08:00
