Connor Turland
0ffc01b3fb
Merge pull request #1144 from metamaps/feature/hide-learn-markdown
...
hide "learn markdown" unless you're editing the topic card desc
2017-09-25 14:46:44 -04:00
Devin Howard
9471efb6bd
hide "learn markdown" unless you're editing the topic card desc
2017-09-23 13:19:43 -07:00
Connor Turland
fc8ac6eef1
nest inconsistent data under data key
2017-09-23 11:20:02 -04:00
Connor Turland
9cc700c64d
use decorator pattern for notifs api
2017-09-22 18:38:38 -04:00
Connor Turland
64ffc78f45
add the container for the notifications dropdown
2017-09-19 23:48:46 -04:00
Connor Turland
322da431eb
Merge pull request #1139 from metamaps/feature/right.click.react
...
Right click/context menu redone in React
2017-09-19 11:49:30 -04:00
Connor Turland
3c7c8812a4
tempplate strings and new lines
2017-09-19 11:46:19 -04:00
Connor Turland
0d6963ebb0
eslint
2017-09-19 10:16:14 -04:00
Connor Turland
c4d0bf8ce4
clean up jquery ref and strings
2017-09-19 10:02:05 -04:00
Connor Turland
3406f2e04d
make render a callback and use async apply for ease of use
2017-09-19 09:58:59 -04:00
Connor Turland
a4c905df4e
move each li into its own function
2017-09-19 09:04:21 -04:00
Connor Turland
5f1fe4dc3f
reimplement shifting menu according to click position
2017-09-19 08:37:00 -04:00
Connor Turland
2515073393
replace old edgeRightClick code
2017-09-19 00:46:23 -04:00
Connor Turland
a04cd0d395
call the right callbacks and show in the right context
2017-09-19 00:34:37 -04:00
Connor Turland
da9e44afa0
clear the right click menu the right way
2017-09-18 23:49:35 -04:00
Connor Turland
e290244404
beginning to come together
2017-09-18 23:30:33 -04:00
Connor Turland
6e1878413f
wip right click in react
2017-09-18 21:09:35 -04:00
Connor Turland
77846cfcb7
missing period for consistency
2017-09-18 16:59:52 -04:00
Connor Turland
1ffc513617
Merge pull request #1137 from metamaps/feature/improve.desc
...
make desc edit area larger and resizable
2017-09-17 16:25:53 -04:00
Connor Turland
3886e62a7b
make desc edit area larger and resizable
2017-09-17 09:01:44 -04:00
Devin Howard
ad2ba33db6
downgrade redis to 3.3.3
...
This fixes the following error seen on metamaps.cc:
> *A* `Gem::LoadError` *occurred while* `POST </mappings>` *was processed
> by* `mappings#create`: Specified 'redis' for Action Cable pubsub
> adapter, but the gem is not loaded. Add `gem 'redis'` to your Gemfile
> (and ensure its version is at the minimum required by Action Cable).
Backtrace
----------------
```/usr/local/rvm/rubies/ruby-2.3.0/lib/ruby/2.3.0/monitor.rb:214:in
`mon_synchronize'
/home/metamaps/metamaps.cc/app/models/mapping.rb:32:in `after_created'
/home/metamaps/metamaps.cc/app/controllers/mappings_controller.rb:24:in
`create'```
2017-09-16 13:41:50 -07:00
Devin Howard
cf9f54c738
tag v3.5
2017-09-16 12:27:02 -07:00
Connor Turland
f323796030
Merge pull request #1132 from metamaps/feature/mod.follow
...
add active scope to follows model
2017-09-13 22:45:50 -04:00
Connor Turland
a080b82e7f
Merge pull request #1133 from metamaps/feature/topic.follow
...
Topic Card Design changes (to include 'follows')
2017-09-13 10:32:44 -04:00
Connor Turland
1174123b60
use scss vars and font fallbacks
2017-09-13 10:31:48 -04:00
Connor Turland
35f77129ad
email job needs to respect active as well
2017-09-13 10:20:25 -04:00
Connor Turland
a56991aede
add exception notifier for failed jobs
2017-09-13 10:18:00 -04:00
Connor Turland
672b456193
add markdown clarifications
2017-09-12 21:37:49 -04:00
Connor Turland
21518c8696
revert react router update and webpack config
2017-09-12 17:07:57 -04:00
Connor Turland
29bf2a23e8
review changes
2017-09-12 17:01:08 -04:00
Connor Turland
61eac509de
Merge branch 'develop' into feature/topic.follow
2017-09-10 18:16:11 -04:00
Connor Turland
4cc420eb63
eslint fixes
2017-09-10 18:13:25 -04:00
Connor Turland
ec3e09c578
topic card design changes
2017-09-10 17:17:56 -04:00
Devin Howard
3e03e0ebbf
update npm/gem dependencies ( #1131 )
...
* update npm/gem dependencies
* move to react prop-types package and fix jsdom usage
* fix sinon
* fix test support
* eslint?
2017-09-09 09:38:18 -07:00
Connor Turland
9ab7e7e170
topic card re-org
2017-09-08 16:58:17 -04:00
Connor Turland
5af2b8f216
add active scope to follows model
2017-09-08 13:42:56 -04:00
Connor Turland
8af66b1b2c
Merge pull request #1130 from metamaps/feature/release.notifs
...
make notifs and follows work for all users
2017-09-03 18:44:33 -04:00
Connor Turland
9b2193ad8c
show autofollow on client and mute on unfollow
2017-09-03 15:18:57 -04:00
Connor Turland
1a8c7810be
fix eslint issue picked up by codeclimate
2017-09-03 09:13:15 -04:00
Connor Turland
d87bb7c75c
make notifs and follows work for all users
2017-09-03 09:07:29 -04:00
Connor Turland
aceb3ff31e
Merge pull request #1129 from metamaps/feature/map.activity.improved
...
improve email styling for release
2017-09-03 08:33:13 -04:00
Connor Turland
f26c6cf0b7
Merge pull request #1128 from metamaps/feature/prevent.notif.fork
...
dont send notification for each topic of forked map
2017-09-03 08:29:03 -04:00
Connor Turland
42f4ecb37b
added bg color to sections
2017-09-03 08:27:05 -04:00
Connor Turland
64f4249f44
add comment
2017-09-02 14:12:07 -04:00
Connor Turland
958bd8c70c
improve email styling for release
2017-09-02 14:06:23 -04:00
Connor Turland
3830946723
dont send notif for each topic of forked map
2017-09-02 09:59:21 -04:00
Connor Turland
3482e799fd
Merge pull request #1127 from metamaps/update-docs
...
update docs
2017-07-26 09:26:59 -07:00
Connor Turland
e016b923a4
Update WindowsInstallation.md
2017-07-26 09:25:41 -07:00
Connor Turland
bb546779cd
Update VagrantInstallation.md
2017-07-26 09:24:51 -07:00
Connor Turland
3829d32390
Update UbuntuInstallation.md
2017-07-26 09:22:34 -07:00
