nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5711 from svbergerem/update-markdown-it-plugins

Browse source 
Update markdown-it-diaspora-mention and markdown-it-sanitizer
This commit is contained in:
Jonne Haß 2015-02-28 12:41:31 +01:00
commit 8dd313efc6
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -136,6 +136,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a
* Strip Unicode format characters prior post processing [#5680](https://github.com/diaspora/diaspora/pull/5680)
* Disable email notifications for closed user accounts [#5640](https://github.com/diaspora/diaspora/pull/5640)
* Total user statistic no longer includes closed accounts [#5041](https://github.com/diaspora/diaspora/pull/5041)
* Don't add a space when rendering a mention [#5711](https://github.com/diaspora/diaspora/pull/5711)
## Features
* Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)

6
Gemfile
View file

@ -91,10 +91,10 @@ gem 'rails-assets-jquery', '1.11.1' # Should be kep
gem 'js_image_paths', '0.0.2'
gem 'js-routes', '1.0.0'
gem 'rails-assets-punycode', '1.3.2'
gem 'rails-assets-markdown-it', '3.0.6'
gem 'rails-assets-markdown-it', '3.0.7'
gem 'rails-assets-markdown-it-hashtag', '0.2.3'
gem 'rails-assets-markdown-it-diaspora-mention', '0.2.0'
gem 'rails-assets-markdown-it-sanitizer', '0.2.1'
gem 'rails-assets-markdown-it-diaspora-mention', '0.2.1'
gem 'rails-assets-markdown-it-sanitizer', '0.2.2'
gem 'rails-assets-markdown-it--markdown-it-for-inline', '0.1.0'
gem 'rails-assets-markdown-it-sub', '0.1.0'
gem 'rails-assets-markdown-it-sup', '0.1.0'

12
Gemfile.lock
View file

@ -503,10 +503,10 @@ GEM
rails-assets-jquery.slimscroll (1.3.3)
rails-assets-jquery (>= 1.7)
rails-assets-markdown-it--markdown-it-for-inline (0.1.0)
rails-assets-markdown-it (3.0.6)
rails-assets-markdown-it-diaspora-mention (0.2.0)
rails-assets-markdown-it (3.0.7)
rails-assets-markdown-it-diaspora-mention (0.2.1)
rails-assets-markdown-it-hashtag (0.2.3)
rails-assets-markdown-it-sanitizer (0.2.1)
rails-assets-markdown-it-sanitizer (0.2.2)
rails-assets-markdown-it-sub (0.1.0)
rails-assets-markdown-it-sup (0.1.0)
rails-assets-perfect-scrollbar (0.5.9)
@ -762,11 +762,11 @@ DEPENDENCIES
rails-assets-jquery-idletimer (= 1.0.1)
rails-assets-jquery-placeholder (= 2.1.1)
rails-assets-jquery-textchange (= 0.2.3)
rails-assets-markdown-it (= 3.0.6)
rails-assets-markdown-it (= 3.0.7)
rails-assets-markdown-it--markdown-it-for-inline (= 0.1.0)
rails-assets-markdown-it-diaspora-mention (= 0.2.0)
rails-assets-markdown-it-diaspora-mention (= 0.2.1)
rails-assets-markdown-it-hashtag (= 0.2.3)
rails-assets-markdown-it-sanitizer (= 0.2.1)
rails-assets-markdown-it-sanitizer (= 0.2.2)
rails-assets-markdown-it-sub (= 0.1.0)
rails-assets-markdown-it-sup (= 0.1.0)
rails-assets-perfect-scrollbar (= 0.5.9)