Merge branch 'release/0.7.4.0'
Showing
- Changelog.md 18 additions, 0 deletionsChangelog.md
- Gemfile 8 additions, 6 deletionsGemfile
- Gemfile.lock 33 additions, 30 deletionsGemfile.lock
- app/assets/javascripts/app/helpers/text_formatter.js 29 additions, 0 deletionsapp/assets/javascripts/app/helpers/text_formatter.js
- app/assets/javascripts/app/pages/single-post-viewer.js 6 additions, 6 deletionsapp/assets/javascripts/app/pages/single-post-viewer.js
- app/assets/javascripts/app/views/back_to_top_view.js 1 addition, 1 deletionapp/assets/javascripts/app/views/back_to_top_view.js
- app/assets/javascripts/app/views/comment_view.js 1 addition, 0 deletionsapp/assets/javascripts/app/views/comment_view.js
- app/assets/javascripts/app/views/content_view.js 24 additions, 0 deletionsapp/assets/javascripts/app/views/content_view.js
- app/assets/javascripts/main.js 1 addition, 0 deletionsapp/assets/javascripts/main.js
- app/assets/stylesheets/_application.scss 1 addition, 0 deletionsapp/assets/stylesheets/_application.scss
- app/assets/stylesheets/base.scss 12 additions, 3 deletionsapp/assets/stylesheets/base.scss
- app/assets/stylesheets/media-embed.scss 21 additions, 0 deletionsapp/assets/stylesheets/media-embed.scss
- app/assets/templates/media-embed_tpl.jst.hbs 19 additions, 0 deletionsapp/assets/templates/media-embed_tpl.jst.hbs
- app/models/notifications/mentioned.rb 4 additions, 1 deletionapp/models/notifications/mentioned.rb
- app/models/profile.rb 1 addition, 1 deletionapp/models/profile.rb
- app/models/status_message.rb 1 addition, 1 deletionapp/models/status_message.rb
- app/views/layouts/application.html.haml 2 additions, 0 deletionsapp/views/layouts/application.html.haml
- app/views/people/contacts.haml 0 additions, 2 deletionsapp/views/people/contacts.haml
- app/views/people/index.html.haml 0 additions, 2 deletionsapp/views/people/index.html.haml
- app/views/people/show.html.haml 0 additions, 2 deletionsapp/views/people/show.html.haml
Loading
Please register or sign in to comment