Commit graph

2379 commits

Author SHA1 Message Date
Devin Howard
36ed85312e fix crontab 2017-01-18 16:29:52 -05:00
Devin Howard
991c4cabdb move node installation further up 2017-01-18 13:40:48 -05:00
Devin Howard
38004c1f1f fix npm install isntructions 2017-01-18 13:34:32 -05:00
Devin Howard
cd796f3ade gist for unicode error on db:setup 2017-01-18 13:25:50 -05:00
Devin Howard
c57015cb15 rvm install needs sudo 2017-01-18 13:16:33 -05:00
Devin Howard
9223295320 add node source 2017-01-18 13:14:39 -05:00
Devin Howard
b4bffbe427 database called metamaps, not metamap002 in example 2017-01-18 13:10:09 -05:00
Devin Howard
6296df1102 need postgres dev headers 2017-01-18 13:09:47 -05:00
Devin Howard
2e0acfc170 update docs 2017-01-18 12:04:40 -05:00
Devin Howard
99b21be27b tag v3.2 2017-01-16 14:18:49 -05:00
Devin Howard
2c60d7335c Merge branch 'develop' (v3.2) 2017-01-16 11:21:02 -05:00
Connor Turland
6f6e5bea06 Update README.md 2017-01-15 20:23:18 -05:00
Connor Turland
6f0d391aaa Update ISSUE_TEMPLATE.md 2017-01-15 20:17:30 -05:00
Connor Turland
b1a64c6e7a Update ISSUE_TEMPLATE.md 2017-01-15 20:16:53 -05:00
Connor Turland
59b3d254dd include new info zones 2017-01-14 01:35:48 -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
536c458981 add code climate to the readme 2017-01-11 22:42:32 -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
Devin Howard
42d671c05b stop replacing shortcodes/emoticon in the live NewMessage textarea (#1026) 2017-01-11 13:56:44 -05:00
Devin Howard
08109ee5de remove instructions from ImportDialogBox (#1022)
* remove instructions from ImportDialogBox

* link back to docs.metamaps.cc for import instructions
2017-01-11 13:50:37 -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
Devin Howard
25b4d388de eslint commands and apply some style fixes (#1021)
* auto eslint and add commands for eslint

* eslint the entire frontend folder
2017-01-11 12:52:34 -05:00
Devin Howard
8b738f3d28 emoticons turned on by default 2017-01-10 22:05:04 -05:00
Devin Howard
da94cd0c8b systemd job in deploy docs 2017-01-10 18:00:46 -05:00
Devin Howard
e9e6b1dc09 tweak chat emoji (#1019) 2017-01-09 14:55:21 -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
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
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
b07941834c v3.1 in initializers 2016-12-16 17:22:48 -05:00
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