Merge branch 'release/0.7.4.0'

updated 43 locale files [ci skip]
Bump rails-i18n
2026-04-29 03:01:03 -04:00 · 2018-03-18 23:11:47 +01:00 · 2018-03-18 23:05:19 +01:00 · 2018-03-10 04:45:54 +01:00 · 2018-03-10 04:45:10 +01:00 · 2018-03-10 04:45:06 +01:00
1263 changed files with 21792 additions and 13924 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -10,27 +10,15 @@ app/assets/images/custom/

 # Configuration files
 config/diaspora.yml
-config/heroku.yml
 config/initializers/secret_token.rb
-config/redis.conf
-config/deploy_config.yml
-config/schedule.rb
 .bundle
 vendor/bundle/
 vendor/cache/
 config/database.yml
-.rvmrc_custom
-.rvmrc.local
 config/oidc_key.pem

-# Mailing list stuff
-config/email_offset
-config/mailing_list.csv
-
 # Generated files
 log/
-public/stylesheets/*.css
-public/diaspora
 spec/fixtures/*.y*ml
 spec/fixtures/*.fixture.*
 coverage/
@@ -39,6 +27,12 @@ public/404.html
 public/422.html
 public/500.html

+# the db/schema.rb. Although this is contrary to rails best-practises, we
+# cannot provide a schema.rb that works for both MySQL and PostgreSQL, so we
+# have no choice. Our migrations are maintained, so it should always be
+# possible to get back to a "clean" database schema anyway.
+db/schema.rb
+
 # Sprites
 app/assets/images/branding-*.png
 app/assets/images/branding/logos-*.png
@@ -53,17 +47,13 @@ doc/
 public/uploads/
 public/assets/
 public/source.tar*
-public/.well-known
-tmp/**/
 tmp/
-*.sqlite3

 # Temporary files of every sort
 .sass-cache/
 .DS_Store
 .idea
 .redcar
-.rvmrc
 .stgit*
 *.swap
 *.swo
@@ -76,7 +66,6 @@ tmp/
 nbproject
 patches-*
 capybara-*.html
-dump.rdb

 # Rubinius's JIT
 *.rbc
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,4 +1,5 @@
 AllCops:
+  TargetRubyVersion: 2.3
  Exclude:
    - "bin/**/*"
    - "db/schema.rb"
@@ -6,6 +7,10 @@ AllCops:
 Rails:
  Enabled: true

+# Disable for rails 4
+Rails/HttpPositionalArguments:
+  Enabled: false
+
 # Commonly used screens these days easily fit more than 80 characters.
 Metrics/LineLength:
  Max: 120
@@ -36,7 +41,7 @@ Metrics/BlockLength:

 # No space makes the method definition shorter and differentiates
 # from a regular assignment.
-Style/SpaceAroundEqualsInParameterDefault:
+Layout/SpaceAroundEqualsInParameterDefault:
  EnforcedStyle: no_space

 # Single quotes being faster is hardly measurable and only affects parse time.
@@ -51,7 +56,7 @@ Style/SymbolArray:
  Enabled: true

 # Most readable form.
-Style/AlignHash:
+Layout/AlignHash:
  EnforcedHashRocketStyle: table
  EnforcedColonStyle: table

@@ -88,7 +93,7 @@ Style/RaiseArgs:

 # Indenting the chained dots beneath each other is not supported by this cop,
 # see https://github.com/bbatsov/rubocop/issues/1633
-Style/MultilineOperationIndentation:
+Layout/MultilineOperationIndentation:
  Enabled: false

 # Fail is an alias of raise. Avoid aliases, it's more cognitive load for no gain.
@@ -103,7 +108,7 @@ Style/SignalException:
 Lint/HandleExceptions:
  Enabled: false

-Style/SpaceInsideBlockBraces:
+Layout/SpaceInsideBlockBraces:
  # The space here provides no real gain in readability while consuming
  # horizontal space that could be used for a better parameter name.
  # Also {| differentiates better from a hash than { | does.
@@ -111,7 +116,7 @@ Style/SpaceInsideBlockBraces:

 # No trailing space differentiates better from the block:
 # foo} means hash, foo } means block.
-Style/SpaceInsideHashLiteralBraces:
+Layout/SpaceInsideHashLiteralBraces:
  EnforcedStyle: no_space

 # { ... } for multi-line blocks is okay, follow Weirichs rule instead:
@@ -148,7 +153,7 @@ Style/Documentation:
  Enabled: false 

 # This is just silly. Calling the argument `other` in all cases makes no sense.
-Style/OpMethod:
+Naming/BinaryOperatorParameterName:
  Enabled: false 

 # There are valid cases, for example debugging Cucumber steps,
@@ -161,15 +166,5 @@ Style/NumericPredicate:
  EnforcedStyle: comparison

 # Reset some HoundCI changes back to Rubocop defaults
-Style/DotPosition:
+Layout/DotPosition:
  EnforcedStyle: leading
-
-### backward compatibility
-
-# only with ruby >= 2.3
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-# only with ruby >= 2.4
-Performance/RegexpMatch:
-  Enabled: false
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.3
+2.4
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: ruby

 rvm:
-  - 2.3.1
-  - 2.1
+  - 2.4.2
+  - 2.3.5

 env:
  - DB=postgresql BUILD_TYPE=cucumber
@@ -15,6 +15,7 @@ cache:
  bundler: true
  directories:
    - app/assets/images
+    - tmp/cache/assets

 branches:
  only:
@@ -23,15 +24,13 @@ branches:
    - 'develop'

 before_install:
-  - gem install bundler
+  - script/ci/prepare.sh
  - mkdir travis-phantomjs
  - wget http://cifiles.diasporafoundation.org/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
  - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
  - export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH

-bundler_args: "--deployment --without development production --with mysql postgresql --jobs 3 --retry 3"
-
-script: "./script/ci/build.sh"
+script: "bin/rake --trace ci:travis:${BUILD_TYPE}"

 notifications:
  irc:
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,42 @@
+# Contributing to diaspora\*
+
+First of all: thank you very much for helping us out!
+
+## Things you need to know before contributing
+
+If you want to get in touch with other diaspora\* developers, [check our wiki][how-we-communicate] for information on how we communicate. Feel free to ask if you have any questions!
+
+Everyone interacting with our code, issue trackers, chat rooms, mailing lists, the wiki, and the discourse forum is expected to follow the [diaspora\* code of conduct][code-of-conduct].
+
+## Report a security issue
+
+Found a security issue? Please disclose it responsibly. We have a team of developers listening to [security@diasporafoundation.org][sec-mail]. The PGP fingerprint is [AB0D AB02 0FC5 D398 03AB 3CE1 6F70 243F 27AD 886A][pgp].
+
+## Contributing to translations
+
+We use [WebTranslateIt][webtranslateit] to manage translations of the app interface. Please read [our wiki page][translation-wiki] to find out more about this. If your language is featured on WebTranslateIt, please do **not** open a pull request to update translations. If it is not already featured on WebTranslateIt, please read the wiki article above to find out how to proceed.
+
+## Contributing to the code
+
+**Before opening a pull request** please read [how to contribute][contribute]. Doing things the right way from the start will save us time and mean that your contribution can be integrated quicker!
+- Follow our [git workflow][git-workflow] method. In particular, *do not* open a pull request from the `master` or the `develop` branch.
+- Follow our [styleguide][styleguide] and run pronto, our syntax analyzer, **locally before opening a pull request**. See [our wiki][pronto] for information on how to do this.
+- [Write tests][testing-workflow].
+- Use meaningful commit-messages and split larger tasks, e.g. refactoring, into separate commits. This makes the review process much easier.
+
+## Other ways to contribute
+
+You don’t know code? No worries, there are plenty other ways to help the diaspora* project! Please find out how you can help [on our wiki][other-ways].
+
+[code-of-conduct]: https://github.com/diaspora/diaspora/blob/develop/CODE_OF_CONDUCT.md
+[how-we-communicate]: https://wiki.diasporafoundation.org/How_we_communicate
+[pgp]: https://pgp.mit.edu/pks/lookup?op=get&search=0x6F70243F27AD886A
+[sec-mail]: mailto:security@diasporafoundation.org
+[webtranslateit]: https://webtranslateit.com/en/projects/3020-Diaspora
+[translation-wiki]: https://wiki.diasporafoundation.org/Contribute_translations
+[contribute]: https://wiki.diasporafoundation.org/Getting_started_with_contributing
+[git-workflow]: https://wiki.diasporafoundation.org/Git_Workflow
+[styleguide]: https://wiki.diasporafoundation.org/Styleguide
+[pronto]: https://wiki.diasporafoundation.org/Styleguide#Automatic_local_review
+[testing-workflow]: https://wiki.diasporafoundation.org/Testing_Workflow
+[other-ways]: https://wiki.diasporafoundation.org/Other_ways_to_contribute
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,231 @@
+# 0.7.4.0
+
+## Refactor
+* Don't print a warning when starting the server outside a Git repo [#7712](https://github.com/diaspora/diaspora/pull/7712)
+* Make script/server work on readonly filesystems [#7719](https://github.com/diaspora/diaspora/pull/7719)
+* Add camo paths to the robots.txt [#7726](https://github.com/diaspora/diaspora/pull/7726)
+
+## Bug fixes
+* Prevent duplicate mention notifications when the post is received twice [#7721](https://github.com/diaspora/diaspora/pull/7721)
+* Fixed a compatiblitiy issue with non-diaspora\* webfingers [#7718](https://github.com/diaspora/diaspora/pull/7718)
+* Don't retry federation for accounts without a valid public key [#7717](https://github.com/diaspora/diaspora/pull/7717)
+* Fix stream generation for tagged posts with many followed tags [#7715](https://github.com/diaspora/diaspora/pull/7715)
+* Fix incomplete Occitan date localizations [#7731](https://github.com/diaspora/diaspora/pull/7731)
+
+## Features
+* Add basic html5 audio/video embedding support [#6418](https://github.com/diaspora/diaspora/pull/6418)
+* Add the back-to-top button to all pages [#7729](https://github.com/diaspora/diaspora/pull/7729)
+
+# 0.7.3.1
+
+Re-updating the German translations to fix some UX issues that were introduced by recent translation efforts.
+
+# 0.7.3.0
+
+## Refactor
+* Work on the data downloads: Fixed general layout of buttons, added a timestamp and implemented auto-deletion of old exports [#7684](https://github.com/diaspora/diaspora/pull/7684)
+* Increase Twitter character limit to 280 [#7694](https://github.com/diaspora/diaspora/pull/7694)
+* Improve password autocomplete with password managers [#7642](https://github.com/diaspora/diaspora/pull/7642)
+* Remove the limit of participants in private conversations [#7705](https://github.com/diaspora/diaspora/pull/7705)
+* Send blocks to the blocked persons pod for better UX [#7705](https://github.com/diaspora/diaspora/pull/7705)
+* Send a dummy participation on all incoming public posts to increase interaction consistency [#7708](https://github.com/diaspora/diaspora/pull/7708)
+
+## Bug fixes
+* Fix invite link on the contacts page when the user has no contacts [#7690](https://github.com/diaspora/diaspora/pull/7690)
+* Fix the mobile bookmarklet when called without parameters [#7698](https://github.com/diaspora/diaspora/pull/7698)
+* Properly build the #newhere message for people who got invited [#7702](https://github.com/diaspora/diaspora/pull/7702)
+* Fix the admin report view for posts without text [#7706](https://github.com/diaspora/diaspora/pull/7706)
+* Upgrade Nokogiri to fix [a disclosed vulnerability in libxml2](https://github.com/sparklemotion/nokogiri/issues/1714)
+
+## Features
+* Check if redis is running in script/server [#7685](https://github.com/diaspora/diaspora/pull/7685)
+
+# 0.7.2.1
+
+Fixes notifications when people remove their birthday date [#7691](https://github.com/diaspora/diaspora/pull/7691)
+
+# 0.7.2.0
+
+## Bug fixes
+* Ignore invalid `diaspora://` links [#7652](https://github.com/diaspora/diaspora/pull/7652)
+* Fix deformed avatar in hovercards [#7656](https://github.com/diaspora/diaspora/pull/7656)
+* Fix default aspects on profile page and bookmarklet publisher [#7679](https://github.com/diaspora/diaspora/issues/7679)
+
+## Features
+* Add birthday notifications [#7624](https://github.com/diaspora/diaspora/pull/7624)
+
+# 0.7.1.1
+
+Fixes an issue with installing and running diaspora\* with today released bundler v1.16.0.
+
+# 0.7.1.0
+
+## Ensure account deletions are run
+
+There were some issues causing accounts deletions to not properly perform in some cases, see
+[#7631](https://github.com/diaspora/diaspora/issues/7631) and [#7639](https://github.com/diaspora/diaspora/pull/7639).
+To ensure these are reexecuted properly, please run `RAILS_ENV=production bin/rake migrations:run_account_deletions`
+after you've upgraded.
+
+## Refactor
+* Remove title from profile photo upload button [#7551](https://github.com/diaspora/diaspora/pull/7551)
+* Remove Internet Explorer workarounds [#7557](https://github.com/diaspora/diaspora/pull/7557)
+* Sort notifications by last interaction [#7568](https://github.com/diaspora/diaspora/pull/7568) [#7648](https://github.com/diaspora/diaspora/pull/7648)
+* Remove tiff support from photos [#7576](https://github.com/diaspora/diaspora/pull/7576)
+* Remove reference from reshares when original post is deleted [#7578](https://github.com/diaspora/diaspora/pull/7578)
+* Merge migrations from before 0.6.0.0 to CreateSchema [#7580](https://github.com/diaspora/diaspora/pull/7580)
+* Remove auto detection of languages with highlightjs [#7591](https://github.com/diaspora/diaspora/pull/7591)
+* Move enable/disable notification icon [#7592](https://github.com/diaspora/diaspora/pull/7592)
+* Use Bootstrap 3 progress-bar for polls [#7600](https://github.com/diaspora/diaspora/pull/7600)
+* Enable frozen string literals [#7595](https://github.com/diaspora/diaspora/pull/7595)
+* Remove `rails_admin_histories` table [#7597](https://github.com/diaspora/diaspora/pull/7597)
+* Optimize memory usage on profile export [#7627](https://github.com/diaspora/diaspora/pull/7627)
+* Limit the number of parallel exports [#7629](https://github.com/diaspora/diaspora/pull/7629)
+* Reduce memory usage for account deletion [#7639](https://github.com/diaspora/diaspora/pull/7639)
+
+## Bug fixes
+* Fix displaying polls with long answers [#7579](https://github.com/diaspora/diaspora/pull/7579)
+* Fix S3 support [#7566](https://github.com/diaspora/diaspora/pull/7566)
+* Fix mixed username and timestamp with LTR/RTL scripts [#7575](https://github.com/diaspora/diaspora/pull/7575)
+* Prevent users from zooming in IE Mobile [#7589](https://github.com/diaspora/diaspora/pull/7589)
+* Fix recipient prefill on contacts and profile page [#7599](https://github.com/diaspora/diaspora/pull/7599)
+* Display likes and reshares without login [#7583](https://github.com/diaspora/diaspora/pull/7583)
+* Fix invalid data in the database for user data export [#7614](https://github.com/diaspora/diaspora/pull/7614)
+* Fix local migration run without old private key [#7558](https://github.com/diaspora/diaspora/pull/7558)
+* Fix export not downloadable because the filename was resetted on access [#7622](https://github.com/diaspora/diaspora/pull/7622)
+* Delete invalid oEmbed caches with binary titles [#7620](https://github.com/diaspora/diaspora/pull/7620)
+* Delete invalid diaspora IDs from friendica [#7630](https://github.com/diaspora/diaspora/pull/7630)
+* Cleanup relayables where the signature is missing [#7637](https://github.com/diaspora/diaspora/pull/7637)
+* Avoid page to jump to top after a post deletion [#7638](https://github.com/diaspora/diaspora/pull/7638)
+* Handle duplicate account deletions [#7639](https://github.com/diaspora/diaspora/pull/7639)
+* Handle duplicate account migrations [#7641](https://github.com/diaspora/diaspora/pull/7641)
+* Handle bugs related to missing users [#7632](https://github.com/diaspora/diaspora/pull/7632)
+* Cleanup empty signatures [#7644](https://github.com/diaspora/diaspora/pull/7644)
+
+## Features
+* Ask for confirmation when leaving a submittable comment field [#7530](https://github.com/diaspora/diaspora/pull/7530)
+* Show users vote in polls [#7550](https://github.com/diaspora/diaspora/pull/7550)
+* Add explanation of ignore function to in-app help section [#7585](https://github.com/diaspora/diaspora/pull/7585)
+* Add camo information to NodeInfo [#7617](https://github.com/diaspora/diaspora/pull/7617)
+* Add support for `diaspora://` links [#7625](https://github.com/diaspora/diaspora/pull/7625)
+* Add support to relay likes for comments [#7625](https://github.com/diaspora/diaspora/pull/7625)
+* Implement RFC 7033 WebFinger [#7625](https://github.com/diaspora/diaspora/pull/7625)
+
+# 0.7.0.1
+
+Update nokogiri to fix [multiple libxml2 vulnerabilities](https://usn.ubuntu.com/usn/usn-3424-1/).
+
+# 0.7.0.0
+
+## Supported Ruby versions
+
+This release recommends using Ruby 2.4, while retaining Ruby 2.3 as an officially supported version.
+Ruby 2.1 is no longer officially supported.
+
+## Delete public/.well-known/
+
+Before upgrading, please check if your `public/` folder contains a hidden `.well-known/` folder.
+If so, please delete it since it will prevent the federation from working properly.
+
+## Refactor
+
+* Make the mention syntax more flexible [#7305](https://github.com/diaspora/diaspora/pull/7305)
+* Display @ before mentions [#7324](https://github.com/diaspora/diaspora/pull/7324)
+* Simplify mentions in the publisher [#7302](https://github.com/diaspora/diaspora/pull/7302)
+* Remove chartbeat and mixpanel support [#7280](https://github.com/diaspora/diaspora/pull/7280)
+* Upgrade to jQuery 3 [#7303](https://github.com/diaspora/diaspora/pull/7303)
+* Add i18n for color themes [#7369](https://github.com/diaspora/diaspora/pull/7369)
+* Remove deprecated statistics.json [#7399](https://github.com/diaspora/diaspora/pull/7399)
+* Always link comment count text on mobile [#7483](https://github.com/diaspora/diaspora/pull/7483)
+* Switch to new federation protocol [#7436](https://github.com/diaspora/diaspora/pull/7436)
+* Send public profiles publicly [#7501](https://github.com/diaspora/diaspora/pull/7501)
+* Change sender for mails [#7495](https://github.com/diaspora/diaspora/pull/7495)
+* Move back to top to the right to avoid misclicks [#7516](https://github.com/diaspora/diaspora/pull/7516)
+* Include count in mobile post action link [#7520](https://github.com/diaspora/diaspora/pull/7520)
+* Update the user data export archive format [#6726](https://github.com/diaspora/diaspora/pull/6726)
+* Use id as fallback when sorting posts [#7523](https://github.com/diaspora/diaspora/pull/7523)
+* Remove no-posts-info when adding posts to the stream [#7523](https://github.com/diaspora/diaspora/pull/7523)
+* Upgrade to rails 5.1 [#7514](https://github.com/diaspora/diaspora/pull/7514)
+* Refactoring single post view interactions [#7182](https://github.com/diaspora/diaspora/pull/7182)
+* Update help pages [#7528](https://github.com/diaspora/diaspora/pull/7528)
+* Disable rendering logging in production [#7529](https://github.com/diaspora/diaspora/pull/7529)
+* Add some missing indexes and cleanup the database if needed [#7533](https://github.com/diaspora/diaspora/pull/7533)
+* Remove avatar, name, timestamp and interactions from publisher preview [#7536](https://github.com/diaspora/diaspora/pull/7536)
+
+## Bug fixes
+
+* Fix height too high on mobile SPV [#7480](https://github.com/diaspora/diaspora/pull/7480)
+* Improve stream when ignoring a person who posts a lot of tagged posts [#7503](https://github.com/diaspora/diaspora/pull/7503)
+* Fix order of comments across pods [#7436](https://github.com/diaspora/diaspora/pull/7436)
+* Prevent publisher from closing in preview mode [#7518](https://github.com/diaspora/diaspora/pull/7518)
+* Increase reshare counter after reshare on mobile [#7520](https://github.com/diaspora/diaspora/pull/7520)
+* Reset stuck exports and handle errors [#7535](https://github.com/diaspora/diaspora/pull/7535)
+
+## Features
+* Add support for mentions in comments to the backend [#6818](https://github.com/diaspora/diaspora/pull/6818)
+* Add support for new mention syntax [#7300](https://github.com/diaspora/diaspora/pull/7300) [#7394](https://github.com/diaspora/diaspora/pull/7394)
+* Render mentions as links in comments [#7327](https://github.com/diaspora/diaspora/pull/7327)
+* Add support for mentions in comments to the front-end [#7386](https://github.com/diaspora/diaspora/pull/7386)
+* Support direct links to comments on mobile [#7508](https://github.com/diaspora/diaspora/pull/7508)
+* Add inviter first and last name in the invitation e-mail [#7484](https://github.com/diaspora/diaspora/pull/7484)
+* Add markdown editor for comments and conversations [#7482](https://github.com/diaspora/diaspora/pull/7482)
+* Improve responsive header in desktop version [#7509](https://github.com/diaspora/diaspora/pull/7509)
+* Support cmd+enter to submit posts, comments and conversations [#7524](https://github.com/diaspora/diaspora/pull/7524)
+* Add markdown editor for posts, comments and conversations on mobile [#7235](https://github.com/diaspora/diaspora/pull/7235)
+* Mark as "Mobile Web App Capable" on Android [#7534](https://github.com/diaspora/diaspora/pull/7534)
+* Add support for receiving account migrations [#6750](https://github.com/diaspora/diaspora/pull/6750)
+
+# 0.6.7.0
+
+## Refactor
+* Cleanup some translations [#7465](https://github.com/diaspora/diaspora/pull/7465)
+
+## Features
+* Change email without confirmation when mail is disabled [#7455](https://github.com/diaspora/diaspora/pull/7455)
+* Warn users if they leave the profile editing page with unsaved changes [#7473](https://github.com/diaspora/diaspora/pull/7473)
+* Add admin pages to the mobile interface [#7295](https://github.com/diaspora/diaspora/pull/7295)
+* Add links to discourse to footer and sidebar [#7446](https://github.com/diaspora/diaspora/pull/7446)
+
+# 0.6.6.0
+
+## Refactor
+* Remove rails\_admin [#7440](https://github.com/diaspora/diaspora/pull/7440)
+* Use guid instead of id at permalink and in SPV [#7453](https://github.com/diaspora/diaspora/pull/7453)
+
+## Bug fixes
+* Make photo upload button hover text translatable [#7429](https://github.com/diaspora/diaspora/pull/7429)
+* Fix first comment in mobile view with french locale [#7441](https://github.com/diaspora/diaspora/pull/7441)
+* Use post page title and post author in atom feed [#7420](https://github.com/diaspora/diaspora/pull/7420)
+* Handle broken public keys when receiving posts [#7448](https://github.com/diaspora/diaspora/pull/7448)
+* Fix welcome message when podmin is set to an invalid username [#7452](https://github.com/diaspora/diaspora/pull/7452)
+
+## Features
+* Add support for Nodeinfo 2.0 [#7447](https://github.com/diaspora/diaspora/pull/7447)
+
+# 0.6.5.0
+
+## Refactor
+* Remove unused setPreload function [#7354](https://github.com/diaspora/diaspora/pull/7354)
+* Remove jQuery deprecations [#7356](https://github.com/diaspora/diaspora/pull/7356)
+* Use empty selector where "#" was used as a selector before (prepare jQuery 3 upgrade) [#7372](https://github.com/diaspora/diaspora/pull/7372)
+* Increase maximal height of large thumbnail on mobile [#7383](https://github.com/diaspora/diaspora/pull/7383)
+* Reduce conversation recipient size [#7376](https://github.com/diaspora/diaspora/pull/7376)
+* Cleanup rtl css [#7374](https://github.com/diaspora/diaspora/pull/7374)
+* Increase visual spacing between list items [#7401](https://github.com/diaspora/diaspora/pull/7401)
+* Remove unused gem and cucumber step [#7410](https://github.com/diaspora/diaspora/pull/7410)
+* Disable CSP header when `report_only` and no `report_uri` is set [#7367](https://github.com/diaspora/diaspora/pull/7367)
+
+## Bug fixes
+* Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
+* Disable autocomplete for the conversation form recipient input [#7375](https://github.com/diaspora/diaspora/pull/7375)
+* Fix sharing indicator on profile page for blocked users [#7382](https://github.com/diaspora/diaspora/pull/7382)
+* Remove post only after a successful deletion on the server [#7385](https://github.com/diaspora/diaspora/pull/7385)
+* Fix an issue where pod admins could get logged out when using sidekiq-web [#7395](https://github.com/diaspora/diaspora/pull/7395)
+* Add avatar fallback for typeahead and conversations [#7414](https://github.com/diaspora/diaspora/pull/7414)
+
+## Features
+* Add links to liked and commented pages [#5502](https://github.com/diaspora/diaspora/pull/5502)
+
 # 0.6.4.1

 Fixes a possible Remote Code Execution ([CVE-2016-4658](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-4658)) and a possible DoS ([CVE-2016-5131](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-5131)) by updating Nokogiri, which in turn updates libxml2.
--- a/177
+++ b/177
@@ -1,29 +1,32 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"

-gem "rails", "4.2.8"
+gem "rails", "5.1.4"

 # Legacy Rails features, remove me!
 # responders (class level)
-gem "responders", "2.3.0"
+gem "responders", "2.4.0"

 # Appserver

-gem "unicorn", "5.2.0", require: false
+gem "unicorn", "5.3.0", require: false
 gem "unicorn-worker-killer", "0.4.4"

 # Federation

-gem "diaspora_federation-rails", "0.1.8"
+gem "diaspora_federation-json_schema", "0.2.4"
+gem "diaspora_federation-rails", "0.2.4"

 # API and JSON

-gem "acts_as_api", "1.0.0"
-gem "json",        "1.8.6"
+gem "acts_as_api", "1.0.1"
+gem "json",        "2.1.0"
 gem "json-schema", "2.8.0"

 # Authentication

-gem "devise", "4.2.0"
+gem "devise", "4.4.1"
 gem "devise_lastseenable", "0.0.6"

 # Captcha
@@ -32,15 +35,15 @@ gem "simple_captcha2", "0.4.3", require: "simple_captcha"

 # Background processing

-gem "sidekiq", "4.2.9"
+gem "sidekiq", "5.0.4"

 # Scheduled processing

-gem "sidekiq-cron", "0.4.5"
+gem "sidekiq-cron", "0.6.3"

 # Compression

-gem "uglifier", "3.1.2"
+gem "uglifier", "3.2.0"

 # Configuration

@@ -48,33 +51,34 @@ gem "configurate", "0.3.1"

 # Cross-origin resource sharing

-gem "rack-cors", "0.4.1", require: "rack/cors"
+gem "rack-cors", "1.0.1", require: "rack/cors"

 # CSS

-gem "autoprefixer-rails",     "6.7.6"
+gem "autoprefixer-rails",     "7.1.4.1"
 gem "bootstrap-sass",         "3.3.7"
 gem "bootstrap-switch-rails", "3.3.3"
-gem "compass-rails",          "2.0.5"
+gem "compass-rails",          "3.0.2"
 gem "sass-rails",             "5.0.6"
+gem "sprockets-rails",        "3.2.1"

 # Database

 group :mysql, optional: true do
-  gem "mysql2", "0.4.5"
+  gem "mysql2", "0.4.9"
 end
 group :postgresql, optional: true do
-  gem "pg",     "0.19.0"
+  gem "pg",     "0.21.0"
 end


-gem "activerecord-import", "0.17.1"
+gem "activerecord-import", "0.20.1"

 # File uploading

-gem "fog-aws",     "1.2.1"
-gem "carrierwave", "0.11.2"
-gem "mini_magick", "4.6.1"
+gem "carrierwave", "1.1.0"
+gem "fog-aws",     "1.4.1"
+gem "mini_magick", "4.8.0"

 # GUID generation
 gem "uuid", "2.3.8"
@@ -85,19 +89,19 @@ gem "entypo-rails", "3.0.0"

 # JavaScript

-gem "handlebars_assets", "0.23.1"
-gem "jquery-rails",      "4.2.1"
-gem "jquery-ui-rails",   "5.0.5"
-gem "js-routes",         "1.3.3"
-gem "js_image_paths",    "0.1.0"
+gem "handlebars_assets", "0.23.2"
+gem "jquery-rails",      "4.3.1"
+gem "js-routes",         "1.4.1"
+gem "js_image_paths",    "0.1.1"

 source "https://rails-assets.org" do
-  gem "rails-assets-jquery",                              "2.2.4" # Should be kept in sync with jquery-rails
+  gem "rails-assets-jquery",                              "3.2.1" # Should be kept in sync with jquery-rails
+  gem "rails-assets-jquery.ui",                           "1.11.4"

-  gem "rails-assets-highlightjs",                         "9.9.0"
-  gem "rails-assets-markdown-it",                         "8.3.0"
+  gem "rails-assets-highlightjs",                         "9.12.0"
+  gem "rails-assets-markdown-it",                         "8.4.0"
  gem "rails-assets-markdown-it-hashtag",                 "0.4.0"
-  gem "rails-assets-markdown-it-diaspora-mention",        "1.1.1"
+  gem "rails-assets-markdown-it-diaspora-mention",        "1.2.0"
  gem "rails-assets-markdown-it-sanitizer",               "0.4.3"
  gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1"
  gem "rails-assets-markdown-it-sub",                     "1.0.0"
@@ -110,33 +114,36 @@ source "https://rails-assets.org" do

  # jQuery plugins

-  gem "rails-assets-autosize",                            "3.0.20"
-  gem "rails-assets-blueimp-gallery",                     "2.25.0"
+  gem "rails-assets-autosize",                            "4.0.0"
+  gem "rails-assets-blueimp-gallery",                     "2.27.0"
+  gem "rails-assets-jquery.are-you-sure",                 "1.9.0"
  gem "rails-assets-jquery-placeholder",                  "2.3.1"
  gem "rails-assets-jquery-textchange",                   "0.2.3"
  gem "rails-assets-perfect-scrollbar",                   "0.6.16"
 end

+gem "markdown-it-html5-embed", "1.0.0"
+
 # Localization

-gem "http_accept_language", "2.1.0"
+gem "http_accept_language", "2.1.1"
 gem "i18n-inflector-rails", "1.0.7"
-gem "rails-i18n",           "4.0.8"
+gem "rails-i18n",           "5.1.1"

 # Mail

 gem "markerb",             "1.1.0"

 # Map
-gem "leaflet-rails",       "0.7.7"
+gem "leaflet-rails",       "1.2.0"

 # Parsing

-gem "nokogiri",          "1.7.1"
+gem "nokogiri",          "1.8.2"
 gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb
 gem "redcarpet",         "3.4.0"
-gem "ruby-oembed",       "0.10.1"
-gem "twitter-text",      "1.14.5"
+gem "ruby-oembed",       "0.12.0"
+gem "twitter-text",      "1.14.7"

 # RTL support

@@ -144,11 +151,11 @@ gem "string-direction", "1.2.0"

 # Security Headers

-gem "secure_headers", "3.6.1"
+gem "secure_headers", "3.7.1"

 # Services

-gem "omniauth",           "1.4.2"
+gem "omniauth",           "1.6.1"
 gem "omniauth-facebook",  "4.0.0"
 gem "omniauth-tumblr",    "1.2"
 gem "omniauth-twitter",   "1.4.0"
@@ -156,11 +163,11 @@ gem "twitter",            "6.1.0"
 gem "omniauth-wordpress", "0.2.2"

 # OpenID Connect
-gem "openid_connect", "0.12.0"
+gem "openid_connect", "1.1.3"

 # Serializers

-gem "active_model_serializers", "0.9.5"
+gem "active_model_serializers", "0.9.7"

 # XMPP chat dependencies
 gem "diaspora-prosody-config",    "0.0.7"
@@ -168,27 +175,27 @@ gem "rails-assets-diaspora_jsxc", "0.1.5.develop.7", source: "https://rails-asse

 # Tags

-gem "acts-as-taggable-on", "3.5.0"
+gem "acts-as-taggable-on", "5.0.0"

 # URIs and HTTP

-gem "addressable",        "2.5.0", require: "addressable/uri"
+gem "addressable",        "2.5.2", require: "addressable/uri"
 gem "faraday",            "0.11.0" # also update User-Agent in OpenID specs
-gem "faraday_middleware", "0.11.0.1"
+gem "faraday_middleware", "0.12.2"
 gem "faraday-cookie_jar", "0.0.6"
-gem "typhoeus",           "1.1.2"
+gem "typhoeus",           "1.3.0"

 # Views

 gem "gon",                     "6.1.0"
-gem "hamlit",                  "2.8.0"
-gem "mobile-fu",               "1.3.1"
-gem "will_paginate",           "3.1.5"
-gem "rails-timeago",           "2.11.0"
+gem "hamlit",                  "2.8.6"
+gem "mobile-fu",               "1.4.0"
+gem "rails-timeago",           "2.16.0"
+gem "will_paginate",           "3.1.6"

 # Logging

-gem "logging-rails", "0.5.0", require: "logging/rails"
+gem "logging-rails", "0.6.0", require: "logging/rails"

 # Reading and writing zip files

@@ -201,13 +208,7 @@ gem "rubyzip", "1.2.1", require: "zip"
 # https://github.com/discourse/discourse/pull/238
 gem "minitest"

-gem "versionist", "1.5.0"
-
-# Prevent accidental upgrades of thor
-# TODO: remove this when either all gems depending on thor have fixed the warnings
-#       or thor released a version where they are clearly marked as warnings
-# see: https://github.com/erikhuda/thor/issues/538
-gem "thor", "0.19.1"
+gem "versionist", "1.6.0"

 # Windows and OSX have an execjs compatible runtime built-in, Linux users should
 # install Node.js or use "therubyracer".
@@ -217,10 +218,6 @@ gem "thor", "0.19.1"
 # gem "therubyracer", :platform => :ruby

 group :production do # we don"t install these on travis to speed up test runs
-  # Administration
-
-  gem "rails_admin", "0.8.1"
-
  # Analytics

  gem "rack-google-analytics", "1.2.0"
@@ -228,7 +225,7 @@ group :production do # we don"t install these on travis to speed up test runs

  # Process management

-  gem "eye", "0.9.1"
+  gem "eye", "0.9.2"

  # Redirects

@@ -237,7 +234,7 @@ group :production do # we don"t install these on travis to speed up test runs

  # Third party asset hosting

-  gem "asset_sync", "2.0.0", require: false
+  gem "asset_sync", "2.2.0", require: false
 end

 group :development do
@@ -245,22 +242,22 @@ group :development do
  gem "guard",          "2.14.1", require: false
  gem "guard-cucumber", "2.1.2", require: false
  gem "guard-rspec",    "4.7.3", require: false
-  gem "guard-rubocop",  "1.2.0", require: false
-  gem "rb-fsevent",     "0.9.8", require: false
-  gem "rb-inotify",     "0.9.8", require: false
+  gem "guard-rubocop",  "1.3.0", require: false
+  gem "rb-fsevent",     "0.10.2", require: false
+  gem "rb-inotify",     "0.9.10", require: false

  # Linters
-  gem "haml_lint",      "0.21.0"
-  gem "pronto",         "0.8.2"
-  gem "pronto-eslint",  "0.8.0"
-  gem "pronto-haml",    "0.8.0"
-  gem "pronto-rubocop", "0.8.0"
-  gem "pronto-scss",    "0.8.0", require: false
-  gem "rubocop",        "0.47.1"
+  gem "haml_lint",      "0.26.0", require: false
+  gem "pronto",         "0.9.5", require: false
+  gem "pronto-eslint",  "0.9.1", require: false
+  gem "pronto-haml",    "0.9.0", require: false
+  gem "pronto-rubocop", "0.9.0", require: false
+  gem "pronto-scss",    "0.9.1", require: false
+  gem "rubocop",        "0.50.0", require: false

  # Preloading environment

-  gem "spring", "2.0.1"
+  gem "spring", "2.0.2"
  gem "spring-commands-rspec", "1.0.4"
  gem "spring-commands-cucumber", "1.0.1"

@@ -269,7 +266,7 @@ group :development do
  gem "pry-byebug"

  # test coverage
-  gem "simplecov", "0.12.0", require: false
+  gem "simplecov", "0.14.1", require: false

  gem "turbo_dev_assets", "0.0.2"
 end
@@ -277,45 +274,45 @@ end
 group :test do
  # RSpec (unit tests, some integration tests)

-  gem "fixture_builder",   "0.4.1"
+  gem "fixture_builder",   "0.5.0"
  gem "fuubar",            "2.2.0"
-  gem "test_after_commit", "1.1.0"
+  gem "json-schema-rspec", "0.0.4"
+  gem "rspec-json_expectations", "~> 2.1"

  # Cucumber (integration tests)

-  gem "capybara",           "2.12.1"
-  gem "database_cleaner",   "1.5.3"
-  gem "poltergeist",        "1.13.0"
+  gem "capybara",           "2.15.1"
+  gem "database_cleaner",   "1.6.1"
+  gem "poltergeist",        "1.16.0"

  gem "cucumber-api-steps", "0.13", require: false
-  gem "json_spec", "1.1.4"

  # General helpers

  gem "factory_girl_rails", "4.8.0"
-  gem "timecop",            "0.8.1"
-  gem "webmock",            "2.3.2", require: false
-  gem "shoulda-matchers",   "3.1.1"
+  gem "shoulda-matchers",   "3.1.2"
+  gem "timecop",            "0.9.1"
+  gem "webmock",            "3.0.1", require: false

-  gem "diaspora_federation-test", "0.1.8"
+  gem "diaspora_federation-test", "0.2.4"

  # Coverage
-  gem 'coveralls', require: false
+  gem "coveralls", "0.8.21", require: false
 end

 group :development, :test do
  # RSpec (unit tests, some integration tests)
-  gem "rspec-rails", "3.5.2"
+  gem "rspec-rails", "3.6.1"

  # Cucumber (integration tests)
-  gem "cucumber-rails", "1.4.5", require: false
+  gem "cucumber-rails", "1.5.0", require: false

  # Jasmine (client side application tests (JS))
-  gem "jasmine",                   "2.5.2"
+  gem "jasmine",                   "2.8.0"
  gem "jasmine-jquery-rails",      "2.0.3"
  gem "rails-assets-jasmine-ajax", "3.3.1", source: "https://rails-assets.org"
  gem "sinon-rails",               "1.15.0"

-  # silence assets
-  gem "quiet_assets", "1.1.0"
+  # For `assigns` in controller specs
+  gem "rails-controller-testing", "1.0.2"
 end
--- a/Gemfile.lock
+++ b/Gemfile.lock
--- a/2
+++ b/2
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 guard :rspec, cmd: "bin/spring rspec", all_on_start: false, all_after_pass: false do
  watch(/^spec\/.+_spec\.rb$/)
  watch(/^lib\/(.+)\.rb$/)       {|m| "spec/lib/#{m[1]}_spec.rb" }
--- a/README.md
+++ b/README.md
@@ -12,8 +12,7 @@
 [Project site](https://diasporafoundation.org) |
 [Wiki](https://wiki.diasporafoundation.org) |
 [Bugtracker](https://github.com/diaspora/diaspora/issues) |
-[Discussions](https://www.loomio.org/groups/194) |
-[Mailing lists](https://wiki.diasporafoundation.org/How_We_Communicate#Mailing_Lists) |
+[Discussions and Support](https://discourse.diasporafoundation.org/) |
 [License](/COPYRIGHT) |
 [Authors](https://github.com/diaspora/diaspora/contributors)

@@ -31,9 +30,9 @@ Still haven't found an answer? Talk to us! Read [how we communicate](https://wik

 ## Contribute

-To keep diaspora*  growing and improving we need all help we can get. Whether you can contribute [code](https://wiki.diasporafoundation.org/Getting_started_with_contributing), [ideas](https://wiki.diasporafoundation.org/How_we_communicate#Loomio), [translations](https://wiki.diasporafoundation.org/Contribute_translations), [bug reports](https://wiki.diasporafoundation.org/How_to_report_a_bug) or simply extend the community as a [helpful user](https://wiki.diasporafoundation.org/Welcoming_committee) or [pod administrator](https://wiki.diasporafoundation.org/Installation), your help is welcome!
+To keep diaspora\* growing and improving we need all help we can get. Whether you can contribute [code](https://wiki.diasporafoundation.org/Getting_started_with_contributing), [ideas](https://wiki.diasporafoundation.org/How_we_communicate#Discourse), [translations](https://wiki.diasporafoundation.org/Contribute_translations), [bug reports](https://wiki.diasporafoundation.org/How_to_report_a_bug) or simply extend the community as a [helpful user](https://wiki.diasporafoundation.org/Welcoming_committee) or [pod administrator](https://wiki.diasporafoundation.org/Installation), your help is welcome!

-Everyone interacting in diaspora’s codebases, issue trackers, chat rooms, mailing lists, the wiki, and the Loomio group is expected to follow the diaspora\* [code of conduct](/CODE_OF_CONDUCT.md).
+Everyone interacting in diaspora’s codebases, issue trackers, chat rooms, the wiki, and the Discourse is expected to follow the diaspora\* [code of conduct](/CODE_OF_CONDUCT.md).

 ## Security

--- a/2
+++ b/2
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -0,0 +1,12 @@
+//= link contact-list.js
+//= link jquery3.js
+//= link jquery_ujs.js
+//= link main.js
+//= link jsxc.js
+//= link bookmarklet.js
+//= link mobile/bookmarklet.js
+//= link mobile/mobile.js
+//= link templates.js
+//= link error_pages.css
+//= link admin.css
+//= link rtl.css
--- a/app/assets/javascripts/api/authorization_page.js
+++ b/app/assets/javascripts/api/authorization_page.js
@@ -1,5 +1,5 @@
 $(document).ready(function() {
-  $("#js-app-logo").error(function () {
+  $("#js-app-logo").on("error", function() {
    $(this).attr("src", ImagePaths.get("user/default.png"));
  });
 });
--- a/app/assets/javascripts/app/app.js
+++ b/app/assets/javascripts/app/app.js
@@ -60,11 +60,6 @@ var app = {
    return !!(window.gon.preloads && window.gon.preloads[prop]); //returning boolean variable so that parsePreloads, which cleans up properly is used instead
  },

-  setPreload : function(prop, val) {
-    window.gon.preloads = window.gon.preloads || {};
-    window.gon.preloads[prop] = val;
-  },
-
  parsePreload : function(prop) {
      if(!app.hasPreload(prop)) { return; }

@@ -126,12 +121,6 @@ var app = {
    app.flashMessages = new app.views.FlashMessages({el: $("#flash-container")});
  },

-  /* mixpanel wrapper function */
-  instrument : function(type, name, object, callback) {
-    if(!window.mixpanel) { return; }
-    window.mixpanel[type](name, object, callback);
-  },
-
  setupDisabledLinks: function() {
    $("a.disabled").click(function(event) {
      event.preventDefault();
--- a/app/assets/javascripts/app/helpers/handlebars-helpers.js
+++ b/app/assets/javascripts/app/helpers/handlebars-helpers.js
@@ -116,7 +116,7 @@ Handlebars.registerHelper("isCurrentProfilePage", function(id, diasporaHandle, o
 });

 Handlebars.registerHelper('aspectMembershipIndicator', function(contact,in_aspect) {
-  if(!app.aspect || !app.aspect.get('id')) return '<div class="aspect_membership_dropdown placeholder"></div>';
+  if(!app.aspect || !app.aspect.get('id')) return '<div class="aspect-membership-dropdown placeholder"></div>';

  var html = "<i class=\"entypo-";
  if( in_aspect === 'in_aspect' ) {
--- a/app/assets/javascripts/app/helpers/text_formatter.js
+++ b/app/assets/javascripts/app/helpers/text_formatter.js
@@ -1,6 +1,11 @@
 // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later

 (function(){
+  app.helpers.allowedEmbedsMime = function(mimetype) {
+    var v = document.createElement(mimetype[1]);
+    return v.canPlayType && v.canPlayType(mimetype[0]) !== "";
+  };
+
  app.helpers.textFormatter = function(text, mentions) {
    mentions = mentions ? mentions : [];

@@ -8,8 +13,7 @@
      breaks:      true,
      html:        true,
      linkify:     true,
-      typographer: true,
-      langPrefix:  ""
+      typographer: true
    });

    var inlinePlugin = window.markdownitForInline;
@@ -45,7 +49,7 @@
                           "_" +
                           "\\-" +
                     "]+|<3",
-      // compare tag_strings in lib/diaspora/taggabe.rb
+      // compare tag_strings in lib/diaspora/taggable.rb
      preceding: "^|\\s"
    });

@@ -72,10 +76,6 @@
          } catch (__) {}
        }

-        try {
-          return hljs.highlightAuto(str).value;
-        } catch (__) {}
-
        return "";
      }
    });
@@ -88,6 +88,30 @@

    // Bootstrap table markup
    md.renderer.rules.table_open = function () { return "<table class=\"table table-striped\">\n"; };
+
+    var html5medialPlugin = window.markdownitHTML5Embed;
+    md.use(html5medialPlugin, {html5embed: {
+      inline: false,
+      autoAppend: true,
+      renderFn: function handleBarsRenderFn(parsed, mediaAttributes) {
+        var attributes = mediaAttributes[parsed.mediaType];
+        return HandlebarsTemplates["media-embed_tpl"]({
+          mediaType: parsed.mediaType,
+          attributes: attributes,
+          mimetype: parsed.mimeType,
+          sourceURL: parsed.url,
+          title: parsed.title,
+          fallback: parsed.fallback,
+          needsCover: parsed.mediaType === "video"
+        });
+      },
+      attributes: {
+        "audio": "controls preload=none",
+        "video": "preload=none"
+      },
+      isAllowedMimeType: app.helpers.allowedEmbedsMime
+    }});
+
    return md.render(text);
  };
 })();
--- a/app/assets/javascripts/app/models/person.js
+++ b/app/assets/javascripts/app/models/person.js
@@ -30,7 +30,7 @@ app.models.Person = Backbone.Model.extend({
  },

  isBlocked: function() {
-    return (this.get('relationship') === 'blocked');
+    return (this.get("block") !== false);
  },

  block: function() {
--- a/app/assets/javascripts/app/models/post.js
+++ b/app/assets/javascripts/app/models/post.js
@@ -48,12 +48,6 @@ app.models.Post = Backbone.Model.extend(_.extend({}, app.models.formatDateMixin,
    var body = this.get("text").trim()
      , newlineIdx = body.indexOf("\n");
    return (newlineIdx > 0 ) ? body.substr(newlineIdx+1, body.length) : "";
-  },
-
-  //returns a promise
-  preloadOrFetch : function(){
-    var action = app.hasPreload("post") ? this.set(app.parsePreload("post")) : this.fetch();
-    return $.when(action);
  }
 }));
 // @license-end
--- a/app/assets/javascripts/app/models/post/interactions.js
+++ b/app/assets/javascripts/app/models/post/interactions.js
@@ -3,10 +3,6 @@
 //require ../post

 app.models.Post.Interactions = Backbone.Model.extend({
-  url : function(){
-    return this.post.url() + "/interactions";
-  },
-
  initialize : function(options){
    this.post = options.post;
    this.comments = new app.collections.Comments(this.get("comments"), {post : this.post});
@@ -14,33 +10,16 @@ app.models.Post.Interactions = Backbone.Model.extend({
    this.reshares = new app.collections.Reshares(this.get("reshares"), {post : this.post});
  },

-  parse : function(resp){
-    this.comments.reset(resp.comments);
-    this.likes.reset(resp.likes);
-    this.reshares.reset(resp.reshares);
-
-    var comments = this.comments
-      , likes = this.likes
-      , reshares = this.reshares;
-
-    return {
-      comments : comments,
-      likes : likes,
-      reshares : reshares,
-      fetched : true
-    };
-  },
-
  likesCount : function(){
-    return this.get("fetched") ? this.likes.models.length : this.get("likes_count");
+    return this.get("likes_count");
  },

  resharesCount : function(){
-    return this.get("fetched") ? this.reshares.models.length : this.get("reshares_count");
+    return this.get("reshares_count");
  },

  commentsCount : function(){
-    return this.get("fetched") ? this.comments.models.length : this.get("comments_count");
+    return this.get("comments_count");
  },

  userLike : function(){
@@ -76,8 +55,6 @@ app.models.Post.Interactions = Backbone.Model.extend({
        app.flashMessages.handleAjaxError(response);
      }
    });
-
-    app.instrument("track", "Like");
  },

  unlike : function() {
@@ -87,8 +64,6 @@ app.models.Post.Interactions = Backbone.Model.extend({
      self.set({"likes_count" : self.get("likes_count") - 1});
      self.likes.trigger("change");
    }});
-
-    app.instrument("track", "Unlike");
  },

  comment: function(text, options) {
@@ -104,8 +79,6 @@ app.models.Post.Interactions = Backbone.Model.extend({
      self.trigger('change'); //updates after sync
      if (options.success) { options.success(); }
    });
-
-    app.instrument("track", "Comment");
  },

  reshare : function(){
@@ -126,8 +99,6 @@ app.models.Post.Interactions = Backbone.Model.extend({
      .fail(function(response) {
        app.flashMessages.handleAjaxError(response);
      });
-
-    app.instrument("track", "Reshare");
  },

  userCanReshare : function(){
--- a/app/assets/javascripts/app/models/stream.js
+++ b/app/assets/javascripts/app/models/stream.js
@@ -13,8 +13,16 @@ app.models.Stream = Backbone.Collection.extend({
  },

  collectionOptions :function(){
-      var order = this.sortOrder();
-      return { comparator : function(item) { return -item[order](); } };
+    var order = this.sortOrder();
+    return {
+      comparator: function(item1, item2) {
+        if (item1[order]() < item2[order]()) { return 1; }
+        if (item1[order]() > item2[order]()) { return -1; }
+        if (item1.id < item2.id) { return 1; }
+        if (item1.id > item2.id) { return -1; }
+        return 0;
+      }
+    };
  },

  url : function(){
--- a/app/assets/javascripts/app/pages/contacts.js
+++ b/app/assets/javascripts/app/pages/contacts.js
@@ -9,7 +9,7 @@ app.pages.Contacts = Backbone.View.extend({
    "click #chat_privilege_toggle" : "toggleChatPrivilege",
    "click #change_aspect_name" : "showAspectNameForm",
    "click .conversation_button": "showMessageModal",
-    "click #invitations-button": "showInvitationsModal"
+    "click .invitations-button": "showInvitationsModal"
  },

  initialize: function(opts) {
@@ -17,7 +17,7 @@ app.pages.Contacts = Backbone.View.extend({
    this.chatToggle = $("#chat_privilege_toggle i");
    this.stream = opts.stream;
    this.stream.render();
-    $("#people_stream.contacts .header i").tooltip({"placement": "bottom"});
+    $("#people-stream.contacts .header i").tooltip({"placement": "bottom"});
    $(document).on("ajax:success", "form.edit_aspect", this.updateAspectName);
    app.events.on("aspect:create", function(){ window.location.reload() });
    app.events.on("aspect_membership:create", this.addAspectMembership, this);
@@ -80,7 +80,10 @@ app.pages.Contacts = Backbone.View.extend({

  showMessageModal: function(){
    $("#conversationModal").on("modal:loaded", function() {
-      new app.views.ConversationsForm({prefill: gon.conversationPrefill});
+      var people = _.pluck(app.contacts.filter(function(contact) {
+        return contact.inAspect(app.aspect.get("id"));
+      }), "person");
+      new app.views.ConversationsForm({prefill: people});
    });
    app.helpers.showModal("#conversationModal");
  },
--- a/app/assets/javascripts/app/pages/getting_started.js
+++ b/app/assets/javascripts/app/pages/getting_started.js
@@ -5,7 +5,7 @@ app.pages.GettingStarted = app.views.Base.extend({
  templateName: false,

  subviews: {
-    ".aspect_membership_dropdown": "aspectMembershipView"
+    ".aspect-membership-dropdown": "aspectMembershipView"
  },

  initialize: function(opts) {
--- a/app/assets/javascripts/app/pages/profile.js
+++ b/app/assets/javascripts/app/pages/profile.js
@@ -11,7 +11,7 @@ app.pages.Profile = app.views.Base.extend({
  subviews: {
    "#profile": "sidebarView",
    ".profile_header": "headerView",
-    "#main_stream": "streamView"
+    "#main-stream": "streamView"
  },

  tooltipSelector: ".profile_button .profile-header-icon, .sharing_message_container",
--- a/app/assets/javascripts/app/pages/settings.js
+++ b/app/assets/javascripts/app/pages/settings.js
@@ -11,9 +11,10 @@ app.pages.Settings = Backbone.View.extend({
    new Diaspora.ProfilePhotoUploader();

    this.viewAspectSelector = new app.views.PublisherAspectSelector({
-      el: $(".aspect_dropdown"),
+      el: $(".aspect-dropdown"),
      form: $("#post-default-aspects")
    });
+    $("#update_profile_form").areYouSure();
  }
 });
 // @license-end
--- a/app/assets/javascripts/app/pages/single-post-viewer.js
+++ b/app/assets/javascripts/app/pages/single-post-viewer.js
@@ -3,24 +3,23 @@
 app.pages.SinglePostViewer = app.views.Base.extend({
  templateName: "single-post-viewer",

-  subviews : {
-    "#single-post-content" : "singlePostContentView",
-    '#single-post-interactions' : 'singlePostInteractionsView'
+  subviews: {
+    "#single-post-content": "singlePostContentView",
+    "#single-post-interactions": "singlePostInteractionsView"
  },

-  initialize : function() {
-    this.model = new app.models.Post({ id : gon.post.id });
-    this.model.preloadOrFetch().done(_.bind(this.initViews, this));
-    this.model.interactions.fetch(); //async, yo, might want to throttle this later.
+  initialize: function() {
+    this.model = new app.models.Post(gon.post);
+    this.initViews();
  },

-  initViews : function() {
+  initViews: function() {
    this.singlePostContentView = new app.views.SinglePostContent({model: this.model});
    this.singlePostInteractionsView = new app.views.SinglePostInteractions({model: this.model});
    this.render();
  },

-  postRenderTemplate : function() {
+  postRenderTemplate: function() {
    if(this.model.get("title")){
      // formats title to html...
      var html_title = app.helpers.textFormatter(this.model.get("title"), this.model.get("mentioned_people"));
--- a/app/assets/javascripts/app/router.js
+++ b/app/assets/javascripts/app/router.js
@@ -9,7 +9,7 @@ app.Router = Backbone.Router.extend({
    "commented(/)": "stream",
    "community_spotlight(/)": "spotlight",
    "contacts(/)": "contacts",
-    "conversations(/)(:id)(/)": "conversations",
+    "conversations(/)(:id)(?conversation_id=:conversation_id)(/)": "conversations",
    "followed_tags(/)": "followed_tags",
    "getting_started(/)": "gettingStarted",
    "help(/)": "help",
@@ -93,8 +93,8 @@ app.Router = Backbone.Router.extend({
    app.page = new app.pages.Contacts({stream: stream});
  },

-  conversations: function(id) {
-    app.conversations = app.conversations || new app.views.ConversationsInbox();
+  conversations: function(id, conversationId) {
+    app.conversations = app.conversations || new app.views.ConversationsInbox(conversationId);
    if (parseInt("" + id, 10)) {
      app.conversations.renderConversation(id);
    }
@@ -182,11 +182,11 @@ app.Router = Backbone.Router.extend({
  },

  singlePost: function(id) {
-    this.renderPage(function() { return new app.pages.SinglePostViewer({id: id}); });
+    this.renderPage(function() { return new app.pages.SinglePostViewer({id: id, el: $("#container")}); });
  },

  spotlight: function() {
-    $("#invitations-button").click(function() {
+    $(".invitations-button").click(function() {
      app.helpers.showModal("#invitationsModal");
    });
  },
@@ -217,9 +217,10 @@ app.Router = Backbone.Router.extend({
    app.shortcuts = app.shortcuts || new app.views.StreamShortcuts({el: $(document)});
    if ($("#publisher").length !== 0) {
      app.publisher = app.publisher || new app.views.Publisher({collection: app.stream.items});
+      app.page.setupAvatarFallback($(".main-stream-publisher"));
    }

-    $("#main_stream").html(app.page.render().el);
+    $("#main-stream").html(app.page.render().el);
    this._hideInactiveStreamLists();
  },

@@ -228,7 +229,7 @@ app.Router = Backbone.Router.extend({
  },

  renderAspectMembershipDropdowns: function($context) {
-    $context.find(".aspect_membership_dropdown.placeholder").each(function() {
+    $context.find(".aspect-membership-dropdown.placeholder").each(function() {
      var personId = $(this).data("personId");
      var view = new app.views.AspectMembership({person: app.contacts.findWhere({"person_id": personId}).person});
      $(this).html(view.render().$el);
--- a/app/assets/javascripts/app/views.js
+++ b/app/assets/javascripts/app/views.js
@@ -55,8 +55,7 @@ app.views.Base = Backbone.View.extend({
      .html(this.template(presenter))
      .attr("data-template", _.last(this.templateName.split("/")));

-    // add avatar fallback if it can't be loaded
-    this.$el.find(this.avatars.selector).error(this.avatars.fallback);
+    this.setupAvatarFallback(this.$el);

    // add placeholder support for old browsers
    this.$("input, textarea").placeholder();
@@ -132,19 +131,20 @@ app.views.Base = Backbone.View.extend({

  destroyModel: function(evt) {
    evt && evt.preventDefault();
-    var self = this;
    var url = this.model.urlRoot + "/" + this.model.id;

    if( confirm(_.result(this, "destroyConfirmMsg")) ) {
      this.$el.addClass("deleting");
-      this.model.destroy({ url: url })
-        .done(function() {
-          self.remove();
-        })
-        .fail(function() {
-          self.$el.removeClass("deleting");
+      this.model.destroy({
+        url: url,
+        success: function() {
+          this.remove();
+        }.bind(this),
+        error: function() {
+          this.$el.removeClass("deleting");
          app.flashMessages.error(Diaspora.I18n.t("failed_to_remove"));
-        });
+        }.bind(this)
+      });
    }
  },

@@ -153,6 +153,10 @@ app.views.Base = Backbone.View.extend({
      $(this).attr("src", ImagePaths.get("user/default.png"));
    },
    selector: "img.avatar"
+  },
+
+  setupAvatarFallback: function(el) {
+    el.find(this.avatars.selector).on("error", this.avatars.fallback);
  }
 });

--- a/app/assets/javascripts/app/views/aspect_membership_view.js
+++ b/app/assets/javascripts/app/views/aspect_membership_view.js
@@ -9,7 +9,7 @@
 */
 app.views.AspectMembership = app.views.Base.extend({
  templateName: "aspect_membership_dropdown",
-  className: "btn-group aspect_dropdown aspect_membership_dropdown",
+  className: "btn-group aspect-dropdown aspect-membership-dropdown",

  subviews: {
    ".newAspectContainer": "aspectCreateView"
@@ -124,7 +124,7 @@ app.views.AspectMembership = app.views.Base.extend({
  // show an error flash msg
  _displayError: function(model, resp) {
    this._done();
-    this.dropdown.closest(".aspect_membership_dropdown").removeClass("open"); // close the dropdown
+    this.dropdown.closest(".aspect-membership-dropdown").removeClass("open"); // close the dropdown
    app.flashMessages.handleAjaxError(resp);
  },

@@ -144,7 +144,7 @@ app.views.AspectMembership = app.views.Base.extend({

    this.render();
    // we just removed the last aspect, inform the user with a flash message
-    // that he is no longer sharing with that person
+    // that they are no longer sharing with that person
    if (this.$el.find("li.selected").length === 0) {
      var msg = Diaspora.I18n.t("aspect_dropdown.stopped_sharing_with", { "name": this._name() });
      stopSharing = true;
--- a/app/assets/javascripts/app/views/back_to_top_view.js
+++ b/app/assets/javascripts/app/views/back_to_top_view.js
@@ -12,7 +12,7 @@ app.views.BackToTop = Backbone.View.extend({

  backToTop: function(evt) {
    evt.preventDefault();
-    $("html, body").animate({scrollTop: 0});
+    $("html, body").animate({scrollTop: 0}, this.toggleVisibility);
  },

  toggleVisibility: function() {
--- a/app/assets/javascripts/app/views/comment_mention_view.js
+++ b/app/assets/javascripts/app/views/comment_mention_view.js
@@ -0,0 +1,10 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+//= require ./publisher/mention_view
+
+app.views.CommentMention = app.views.PublisherMention.extend({
+  initialize: function(opts) {
+    opts.url = Routes.mentionablePost(opts.postId);
+    app.views.PublisherMention.prototype.initialize.call(this, opts);
+  }
+});
+// @license-end
--- a/app/assets/javascripts/app/views/comment_stream_view.js
+++ b/app/assets/javascripts/app/views/comment_stream_view.js
@@ -7,10 +7,10 @@ app.views.CommentStream = app.views.Base.extend({
  className : "comment_stream",

  events: {
-    "keydown .comment_box": "keyDownOnCommentBox",
+    "keydown .comment-box": "keyDownOnCommentBox",
    "submit form": "createComment",
-    "focus .comment_box": "commentTextareaFocused",
-    "click .toggle_post_comments": "expandComments"
+    "click .toggle_post_comments": "expandComments",
+    "click form": "openForm"
  },

  initialize: function() {
@@ -21,12 +21,24 @@ app.views.CommentStream = app.views.Base.extend({
  setupBindings: function() {
    this.model.comments.bind("add", this.appendComment, this);
    this.model.comments.bind("remove", this.removeComment, this);
+    $(document.body).click(this.onFormBlur.bind(this));
  },

  postRenderTemplate : function() {
    this.model.comments.each(this.appendComment, this);
-    this.commentBox = this.$(".comment_box");
+    this.commentBox = this.$(".comment-box");
    this.commentSubmitButton = this.$("input[name='commit']");
+    this.mentions = new app.views.CommentMention({el: this.$el, postId: this.model.get("id")});
+
+    this.mdEditor = new Diaspora.MarkdownEditor(this.$(".comment-box"), {
+      onPreview: function($mdInstance) {
+        var renderedText = app.helpers.textFormatter($mdInstance.getContent(), this.mentions.getMentionedPeople());
+        return "<div class='preview-content'>" + renderedText + "</div>";
+      }.bind(this),
+      onFocus: this.openForm.bind(this)
+    });
+
+    this.$("form").areYouSure();
  },

  presenter: function(){
@@ -52,11 +64,14 @@ app.views.CommentStream = app.views.Base.extend({
      success: function() {
        this.commentBox.val("");
        this.enableCommentBox();
+        this.mdEditor.hidePreview();
+        this.closeForm();
        autosize.update(this.commentBox);
      }.bind(this),
      error: function() {
        this.enableCommentBox();
-        this.commentBox.focus();
+        this.mdEditor.hidePreview();
+        this.openForm();
      }.bind(this)
    });
  },
@@ -72,7 +87,7 @@ app.views.CommentStream = app.views.Base.extend({
  },

  keyDownOnCommentBox: function(evt) {
-    if(evt.which === Keycodes.ENTER && evt.ctrlKey) {
+    if (evt.which === Keycodes.ENTER && (evt.metaKey || evt.ctrlKey)) {
      this.$("form").submit();
      return false;
    }
@@ -105,7 +120,8 @@ app.views.CommentStream = app.views.Base.extend({
    // on post ownership in the Comment view.
    comment.set({parent : this.model.toJSON()});

-    var commentHtml = new this.CommentView({model: comment}).render().el;
+    var commentView = new this.CommentView({model: comment});
+    var commentHtml = commentView.render().el;
    var commentBlocks = this.$(".comments div.comment.media");
    this._moveInsertPoint(comment.get("created_at"), commentBlocks);
    if (this._insertPoint >= commentBlocks.length) {
@@ -115,16 +131,13 @@ app.views.CommentStream = app.views.Base.extend({
    } else {
      commentBlocks.eq(this._insertPoint).before(commentHtml);
    }
+    commentView.renderPluginWidgets();
  },

  removeComment: function(comment) {
    this.$("#" + comment.get("guid")).closest(".comment.media").remove();
  },

-  commentTextareaFocused: function(){
-    this.$("form").removeClass('hidden').addClass("open");
-  },
-
  expandComments: function(evt){
    this.$(".loading-comments").removeClass("hidden");
    if(evt){ evt.preventDefault(); }
@@ -134,6 +147,37 @@ app.views.CommentStream = app.views.Base.extend({
        this.$(".loading-comments").addClass("hidden");
      }.bind(this)
    });
+  },
+
+  openForm: function() {
+    this.$("form").addClass("open");
+    this.$(".md-editor").addClass("active");
+  },
+
+  closeForm: function() {
+    this.$("form").removeClass("open");
+    this.$(".md-editor").removeClass("active");
+    this.commentBox.blur();
+    autosize.update(this.commentBox);
+  },
+
+  isCloseAllowed: function() {
+    if (this.mdEditor === undefined) {
+      return true;
+    }
+    return !this.mdEditor.isPreviewMode() && this.mdEditor.userInputEmpty();
+  },
+
+  onFormBlur: function(evt) {
+    if (!this.isCloseAllowed()) {
+      return;
+    }
+
+    var $target = $(evt.target);
+    var isForm = $target.hasClass("new-comment") || $target.parents(".new-comment").length !== 0;
+    if (!isForm && !$target.hasClass("focus_comment_textarea")) {
+      this.closeForm();
+    }
  }
 });
 // @license-end
--- a/app/assets/javascripts/app/views/comment_view.js
+++ b/app/assets/javascripts/app/views/comment_view.js
@@ -4,6 +4,7 @@
 app.views.Comment = app.views.Content.extend({
  templateName: "comment",
  className : "comment media",
+  tooltipSelector: "time",

  events : function() {
    return _.extend({}, app.views.Content.prototype.events, {
@@ -20,7 +21,7 @@ app.views.Comment = app.views.Content.extend({
  presenter : function() {
    return _.extend(this.defaultPresenter(), {
      canRemove: this.canRemove(),
-      text : app.helpers.textFormatter(this.model.get("text"))
+      text: app.helpers.textFormatter(this.model.get("text"), this.model.get("mentioned_people"))
    });
  },

@@ -39,6 +40,7 @@ app.views.Comment = app.views.Content.extend({

 app.views.ExpandedComment = app.views.Comment.extend({
  postRenderTemplate : function(){
+    this.bindMediaEmbedThumbClickEvent();
  }
 });
 // @license-end
--- a/app/assets/javascripts/app/views/contact_stream_view.js
+++ b/app/assets/javascripts/app/views/contact_stream_view.js
@@ -18,7 +18,7 @@ app.views.ContactStream = Backbone.View.extend({
    $("#paginate .loader").removeClass("hidden");
    $.ajax(this._fetchUrl(), {
      context: this
-    }).success(function(response) {
+    }).done(function(response) {
      if (response.length === 0) {
        this.onEmptyResponse();
      } else {
--- a/app/assets/javascripts/app/views/contact_view.js
+++ b/app/assets/javascripts/app/views/contact_view.js
@@ -4,7 +4,7 @@ app.views.Contact = app.views.Base.extend({
  templateName: 'contact',

  subviews: {
-    ".aspect_membership_dropdown": "AspectMembershipView"
+    ".aspect-membership-dropdown": "AspectMembershipView"
  },

  events: {
--- a/app/assets/javascripts/app/views/content_view.js
+++ b/app/assets/javascripts/app/views/content_view.js
@@ -10,7 +10,6 @@ app.views.Content = app.views.Base.extend({
      text : app.helpers.textFormatter(this.model.get("text"), this.model.get("mentioned_people")),
      largePhoto : this.largePhoto(),
      smallPhotos : this.smallPhotos(),
-      location: this.location(),
      isReshare : this.model.get("post_type") === "Reshare"
    });
  },
@@ -18,15 +17,14 @@ app.views.Content = app.views.Base.extend({

  largePhoto : function() {
    var photos = this.model.get("photos");
-    if(!photos || photos.length === 0) { return }
+    if (!photos || photos.length === 0) { return false; }
    return photos[0];
  },

  smallPhotos : function() {
    var photos = this.model.get("photos");
-    if(!photos || photos.length < 2) { return }
-    photos.splice(0, 1); // remove first photo as it is already shown as largePhoto
-    return photos;
+    if (!photos || photos.length < 2) { return false; }
+    return photos.slice(1); // remove first photo as it is already shown as largePhoto
  },

  expandPost: function(evt) {
@@ -38,11 +36,6 @@ app.views.Content = app.views.Base.extend({
    $(evt.currentTarget).hide();
  },

-  location: function(){
-    var location = this.model.get("location")? this.model.get("location") : "";
-    return location;
-  },
-
  collapseOversized : function() {
    var collHeight = 200
      , elem = this.$(".collapsible")
@@ -70,7 +63,29 @@ app.views.Content = app.views.Base.extend({
    }
  },

+  // This function is called when user clicks cover for HTML5 embedded video
+  onVideoThumbClick: function(evt) {
+    var clickedThumb;
+    if ($(evt.target).hasClass("thumb")) {
+      clickedThumb = $(evt.target);
+    } else {
+      clickedThumb = $(evt.target).parent(".thumb");
+    }
+    clickedThumb.find(".video-overlay").addClass("hidden");
+    clickedThumb.parents(".collapsed").children(".expander").click();
+    var video = clickedThumb.find("video");
+    video.attr("controls", "");
+    video.get(0).load();
+    video.get(0).play();
+    clickedThumb.unbind("click");
+  },
+
+  bindMediaEmbedThumbClickEvent: function() {
+    this.$(".media-embed .thumb").bind("click", this.onVideoThumbClick);
+  },
+
  postRenderTemplate : function(){
+    this.bindMediaEmbedThumbClickEvent();
    _.defer(_.bind(this.collapseOversized, this));

    // run collapseOversized again after all contained images are loaded
@@ -87,7 +102,7 @@ app.views.Content = app.views.Base.extend({
      });
    });

-    var photoAttachments = this.$(".photo_attachments");
+    var photoAttachments = this.$(".photo-attachments");
    if(photoAttachments.length > 0) {
      new app.views.Gallery({ el: photoAttachments });
    }
@@ -100,7 +115,9 @@ app.views.StatusMessage = app.views.Content.extend({

 app.views.ExpandedStatusMessage = app.views.StatusMessage.extend({
  postRenderTemplate : function(){
-    var photoAttachments = this.$(".photo_attachments");
+    this.bindMediaEmbedThumbClickEvent();
+
+    var photoAttachments = this.$(".photo-attachments");
    if(photoAttachments.length > 0) {
      new app.views.Gallery({ el: photoAttachments });
    }
--- a/app/assets/javascripts/app/views/conversations_form_view.js
+++ b/app/assets/javascripts/app/views/conversations_form_view.js
@@ -1,6 +1,6 @@
 // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later

-app.views.ConversationsForm = Backbone.View.extend({
+app.views.ConversationsForm = app.views.Base.extend({
  el: ".conversations-form-container",

  events: {
@@ -24,6 +24,8 @@ app.views.ConversationsForm = Backbone.View.extend({
      remoteRoute: {url: "/contacts", extraParameters: "mutual=true"}
    });

+    this.newConversationMdEditor = this.renderMarkdownEditor("#new-message-text");
+
    this.bindTypeaheadEvents();

    this.tagListElement.empty();
@@ -31,20 +33,32 @@ app.views.ConversationsForm = Backbone.View.extend({
      this.prefill(opts.prefill);
    }

-    this.$("form#new-conversation").on("ajax:success", this.conversationCreateSuccess);
+    this.$("form#new-conversation").on("ajax:success", this.conversationCreateSuccess.bind(this));
    this.$("form#new-conversation").on("ajax:error", this.conversationCreateError);
  },

+  renderMarkdownEditor: function(element) {
+    return new Diaspora.MarkdownEditor($(element), {
+      onPreview: Diaspora.MarkdownEditor.simplePreview
+    });
+  },
+
  addRecipient: function(person) {
    this.conversationRecipients.push(person);
    this.updateContactIdsListInput();
    /* eslint-disable camelcase */
-    this.tagListElement.append(HandlebarsTemplates.conversation_recipient_tag_tpl(person));
+    var personEl = $(HandlebarsTemplates.conversation_recipient_tag_tpl(person)).appendTo(this.tagListElement);
    /* eslint-enable camelcase */
+    this.setupAvatarFallback(personEl);
  },

-  prefill: function(handles) {
-    handles.forEach(this.addRecipient.bind(this));
+  prefill: function(people) {
+    people.forEach(function(person) {
+      this.addRecipient(_.extend({
+        avatar: person.get("profile").avatar.small,
+        handle: person.get("diaspora_id")
+      }, person.attributes));
+    }, this);
  },

  updateContactIdsListInput: function() {
@@ -65,7 +79,7 @@ app.views.ConversationsForm = Backbone.View.extend({
  },

  keyDown: function(evt) {
-    if (evt.which === Keycodes.ENTER && evt.ctrlKey) {
+    if (evt.which === Keycodes.ENTER && (evt.metaKey || evt.ctrlKey)) {
      $(evt.target).parents("form").submit();
    }
  },
@@ -83,6 +97,7 @@ app.views.ConversationsForm = Backbone.View.extend({
  },

  conversationCreateSuccess: function(evt, data) {
+    this.newConversationMdEditor.hidePreview();
    app._changeLocation(Routes.conversation(data.id));
  },

--- a/app/assets/javascripts/app/views/conversations_inbox_view.js
+++ b/app/assets/javascripts/app/views/conversations_inbox_view.js
@@ -1,6 +1,6 @@
 // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later

-app.views.ConversationsInbox = Backbone.View.extend({
+app.views.ConversationsInbox = app.views.Base.extend({
  el: "#conversations-container",

  events: {
@@ -8,11 +8,21 @@ app.views.ConversationsInbox = Backbone.View.extend({
    "click .new-conversation-btn": "displayNewConversation"
  },

-  initialize: function() {
-    new app.views.ConversationsForm();
+  initialize: function(conversationId) {
+    this.conversationForm = new app.views.ConversationsForm();
+
+    // Creates markdown editor in case of displaying preloaded conversation
+    if (conversationId != null) {
+      this.renderMarkdownEditor();
+    }
+
    this.setupConversation();
  },

+  renderMarkdownEditor: function() {
+    this.conversationForm.renderMarkdownEditor("#conversation-show .conversation-message-text");
+  },
+
  renderConversation: function(conversationId) {
    var self = this;
    $.ajax({
@@ -23,6 +33,8 @@ app.views.ConversationsInbox = Backbone.View.extend({
        self.$el.find("#conversation-show").removeClass("hidden").html(data);
        self.selectConversation(conversationId);
        self.setupConversation();
+        self.renderMarkdownEditor();
+        autosize(self.$("#conversation-show textarea"));
      }
    });
  },
@@ -46,6 +58,7 @@ app.views.ConversationsInbox = Backbone.View.extend({
  setupConversation: function() {
    app.helpers.timeago($(this.el));
    $(".control-icons a").tooltip({placement: "bottom"});
+    this.setupAvatarFallback(this.$el);

    var conv = $(".conversation-wrapper .stream-element.selected"),
        cBadge = $("#conversations-link .badge");
--- a/app/assets/javascripts/app/views/help_view.js
+++ b/app/assets/javascripts/app/views/help_view.js
@@ -4,27 +4,29 @@ app.views.Help = app.views.StaticContentView.extend({
  templateName : "help",

  events : {
-    "click .faq-link" : "sectionClicked",
-    "click .faq-link-getting-help" : "gettingHelp",
-    "click .faq-link-sharing" : "sharing",
-    "click .faq-link-posts-and-posting" : "postsAndPosting",
+    "click .faq-link": "sectionClicked",
+    "click .faq-link-getting-help": "gettingHelp",
+    "click .faq-link-sharing": "sharing",
+    "click .faq-link-posts-and-posting": "postsAndPosting",
    "click .faq-link-tags": "tags",
-    "click .faq-link-keyboard-shortcuts" : "keyboardShortcuts",
-    "click .faq-link-chat" :  "chat"
+    "click .faq-link-keyboard-shortcuts": "keyboardShortcuts",
+    "click .faq-link-chat": "chat"
  },

  initialize : function() {
    this.GETTING_HELP_SUBS = {
-      getting_started_a: { tutorial_series: this.linkHtml("http://diasporafoundation.org/getting_started/sign_up", Diaspora.I18n.t( 'getting_started_tutorial' )) },
-      get_support_a_website: { link: this.linkHtml("https://diasporafoundation.org/", Diaspora.I18n.t( 'foundation_website' ))},
-      get_support_a_tutorials: { tutorials: this.linkHtml("https://diasporafoundation.org/tutorials", Diaspora.I18n.t( 'tutorials' ))},
-      get_support_a_wiki: { link: this.linkHtml("https://wiki.diasporafoundation.org/Special:Search", Diaspora.I18n.t( 'wiki' ))},
-      get_support_a_irc: { irc: this.linkHtml("https://wiki.diasporafoundation.org/How_We_Communicate#IRC", Diaspora.I18n.t( 'irc' ))},
-      get_support_a_faq: { faq: this.linkHtml("https://wiki.diasporafoundation.org/FAQ_for_users", Diaspora.I18n.t( 'faq' ))},
-      get_support_a_hashtag: { question: this.linkHtml("/tags/question", "#question")}
+      getting_started_a: {tutorial_series: this.linkHtml("http://diasporafoundation.org/getting_started/sign_up", Diaspora.I18n.t("getting_started_tutorial"))},
+      get_support_a_website: {link: this.linkHtml("https://diasporafoundation.org/", Diaspora.I18n.t("foundation_website"))},
+      get_support_a_tutorials: {tutorials: this.linkHtml("https://diasporafoundation.org/tutorials", Diaspora.I18n.t("tutorials"))},
+      get_support_a_wiki: {link: this.linkHtml("https://wiki.diasporafoundation.org/Special:Search", Diaspora.I18n.t("wiki"))},
+      get_support_a_irc: {irc: this.linkHtml("https://wiki.diasporafoundation.org/How_We_Communicate#IRC", Diaspora.I18n.t("irc"))},
+      get_support_a_faq: {faq: this.linkHtml("https://wiki.diasporafoundation.org/FAQ_for_users", Diaspora.I18n.t("faq"))},
+      get_support_a_hashtag: {question: this.linkHtml("/tags/question", "#question")},
+      get_support_a_discourse: {discourse: this.linkHtml("https://discourse.diasporafoundation.org/c/support", "discussions & support")}
 	};

    this.POSTS_AND_POSTING_SUBS = {
+      post_report_a: {community_guidelines: this.linkHtml("https://diasporafoundation.org/community_guidelines", Diaspora.I18n.t("community_guidelines"))},
      format_text_a: {
        markdown: this.linkHtml("http://diasporafoundation.org/formatting", Diaspora.I18n.t( 'markdown' )),
        here: this.linkHtml("http://daringfireball.net/projects/markdown/syntax", Diaspora.I18n.t( 'here' ))
@@ -53,10 +55,9 @@ app.views.Help = app.views.StaticContentView.extend({
      title_pods: Diaspora.I18n.t( 'pods.title' ),
      title_posts_and_posting: Diaspora.I18n.t( 'posts_and_posting.title' ),
      title_private_posts: Diaspora.I18n.t( 'private_posts.title' ),
-      title_private_profiles: Diaspora.I18n.t( 'private_profiles.title' ),
      title_public_posts: Diaspora.I18n.t( 'public_posts.title' ),
-      title_public_profiles: Diaspora.I18n.t( 'public_profiles.title' ),
      title_resharing_posts: Diaspora.I18n.t( 'resharing_posts.title' ),
+      title_profile: Diaspora.I18n.t("profile.title"),
      title_sharing: Diaspora.I18n.t( 'sharing.title' ),
      title_tags: Diaspora.I18n.t( 'tags.title' ),
      title_keyboard_shortcuts: Diaspora.I18n.t( 'keyboard_shortcuts.title' ),
--- a/app/assets/javascripts/app/views/infinite_stream_view.js
+++ b/app/assets/javascripts/app/views/infinite_stream_view.js
@@ -51,6 +51,12 @@ app.views.InfScroll = app.views.Base.extend({
    }
  },

+  postRenderTemplate: function() {
+    if (this.postViews.length > 0) {
+      this.$(".no-posts-info").closest(".stream-element").remove();
+    }
+  },
+
  showNoPostsInfo: function() {
    if (this.postViews.length === 0) {
      var noPostsInfo = new app.views.NoPostsInfo();
--- a/app/assets/javascripts/app/views/location_stream.js
+++ b/app/assets/javascripts/app/views/location_stream.js
@@ -1,6 +1,6 @@
 // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later

-app.views.LocationStream = app.views.Content.extend({
+app.views.LocationStream = app.views.Base.extend({
  events: {
    "click .near-from": "toggleMap"
  },
--- a/app/assets/javascripts/app/views/notification_dropdown_view.js
+++ b/app/assets/javascripts/app/views/notification_dropdown_view.js
@@ -26,7 +26,6 @@ app.views.NotificationDropdown = app.views.Base.extend({

  toggleDropdown: function(evt){
    evt.stopPropagation();
-    if (!$("#notifications-link .entypo-bell:visible").length) { return true; }
    evt.preventDefault();
    if(this.dropdownShowing()){ this.hideDropdown(evt); }
    else{ this.showDropdown(); }
@@ -96,7 +95,7 @@ app.views.NotificationDropdown = app.views.Base.extend({

  afterNotificationChanges: function(node) {
    node.find(".unread-toggle .entypo-eye").tooltip("destroy").tooltip();
-    node.find(this.avatars.selector).error(this.avatars.fallback);
+    this.setupAvatarFallback(node);
  },

  finishLoading: function() {
--- a/app/assets/javascripts/app/views/photos_view.js
+++ b/app/assets/javascripts/app/views/photos_view.js
@@ -15,7 +15,7 @@ app.views.Photos = app.views.InfScroll.extend({
  },

  postRenderTemplate: function(){
-    var photoAttachments = $("#main_stream > div");
+    var photoAttachments = $("#main-stream > div");
    if(photoAttachments.length > 0) {
      new app.views.Gallery({ el: photoAttachments });
    }
--- a/app/assets/javascripts/app/views/poll_view.js
+++ b/app/assets/javascripts/app/views/poll_view.js
@@ -5,7 +5,7 @@ app.views.Poll = app.views.Base.extend({

  events: {
    "click .submit" : "clickSubmit",
-    "click .toggle_result" : "toggleResult"
+    "click .toggle-result": "toggleResult"
  },

  initialize: function() {
@@ -17,15 +17,22 @@ app.views.Poll = app.views.Base.extend({
    var isReshare = (this.model.get('post_type') === 'Reshare');
    var showForm = defaultPresenter.loggedIn &&
                   !isReshare &&
-                   !this.model.get('already_participated_in_poll');
+                   !this.model.get("poll_participation_answer_id");
    var originalPostLink = isReshare && this.model.get('root') ?
      '<a href="/posts/' + this.model.get('root').id + '" class="root_post_link">' + Diaspora.I18n.t('poll.original_post') + '</a>' :
      '';
+    var answerGiven = this.model.get("poll_participation_answer_id");
+
+    if (defaultPresenter.poll && defaultPresenter.poll.poll_answers) {
+      defaultPresenter.poll.poll_answers.forEach(function(answer) {
+        _.extend(answer, {isCurrentUserVote: answerGiven ? answer.id === answerGiven : false});
+      });
+    }

    return _.extend(defaultPresenter, {
      show_form: showForm,
      is_reshare: isReshare,
-      original_post_link: originalPostLink
+      originalPostLink: originalPostLink
    });
  },

@@ -48,7 +55,7 @@ app.views.Poll = app.views.Base.extend({
        percent = Math.round(answer.vote_count / participation_count * 100);
      }

-      var progressBar = _this.$(".poll_progress_bar[data-answerid="+answer.id+"]");
+      var progressBar = _this.$(".progress-bar[data-answerid=" + answer.id + "]");

      _this.setProgressBarData(progressBar, percent);
    });
@@ -61,8 +68,8 @@ app.views.Poll = app.views.Base.extend({

  pollButtons: function() {
    if(!this.poll || !this.poll.post_id) {
-      this.$('.submit').attr('disabled', true);
-      this.$('.toggle_result').attr('disabled', true);
+      this.$(".submit").attr("disabled", true);
+      this.$(".toggle-result").attr("disabled", true);
    }
  },

@@ -76,14 +83,14 @@ app.views.Poll = app.views.Base.extend({
    }
    this.toggleElements();

-    var toggle_result = this.$('.toggle_result');
+    var toggleResult = this.$(".toggle-result");

    if(!this.toggleMode) {
-      toggle_result.html(Diaspora.I18n.t("poll.close_result"));
+      toggleResult.html(Diaspora.I18n.t("poll.close_result"));
      this.toggleMode = 1;
    }
    else {
-      toggle_result.html(Diaspora.I18n.t("poll.show_result"));
+      toggleResult.html(Diaspora.I18n.t("poll.show_result"));
      this.toggleMode = 0;
    }
  },
--- a/app/assets/javascripts/app/views/post_controls_view.js
+++ b/app/assets/javascripts/app/views/post_controls_view.js
@@ -76,6 +76,11 @@ app.views.PostControls = app.views.Base.extend({
    $.post(Routes.postParticipation(this.model.get("id")), {_method: "delete"}, function() {
      this.model.set({participation: false});
    }.bind(this));
+  },
+
+  destroyModel: function(evt) {
+    if (evt) { evt.preventDefault(); }
+    this.post.destroyModel();
  }
 });
 // @license-end
--- a/app/assets/javascripts/app/views/preview_post_view.js
+++ b/app/assets/javascripts/app/views/preview_post_view.js
@@ -5,7 +5,6 @@ app.views.PreviewPost = app.views.Post.extend({
  className: "stream-element loaded",

  subviews: {
-    ".feedback": "feedbackView",
    ".post-content": "postContentView",
    ".oembed": "oEmbedView",
    ".opengraph": "openGraphView",
@@ -13,12 +12,6 @@ app.views.PreviewPost = app.views.Post.extend({
    ".status-message-location": "postLocationStreamView"
  },

-  tooltipSelector: [
-    ".timeago",
-    ".delete",
-    ".permalink"
-  ].join(", "),
-
  initialize: function() {
    this.model.set("preview", true);
    this.oEmbedView = new app.views.OEmbed({model: this.model});
@@ -26,10 +19,6 @@ app.views.PreviewPost = app.views.Post.extend({
    this.pollView = new app.views.Poll({model: this.model});
  },

-  feedbackView: function() {
-    return new app.views.Feedback({model: this.model});
-  },
-
  postContentView: function() {
    return new app.views.StatusMessage({model: this.model});
  },
--- a/app/assets/javascripts/app/views/profile_header_view.js
+++ b/app/assets/javascripts/app/views/profile_header_view.js
@@ -4,7 +4,7 @@ app.views.ProfileHeader = app.views.Base.extend({
  templateName: 'profile_header',

  subviews: {
-    ".aspect_membership_dropdown": "aspectMembershipView"
+    ".aspect-membership-dropdown": "aspectMembershipView"
  },

  events: {
@@ -69,8 +69,8 @@ app.views.ProfileHeader = app.views.Base.extend({
      $("#mentionModal").modal("hide");
      app.publisher.clear();
      app.publisher.remove();
-      location.reload();
-    });
+      app.flashMessages.success(Diaspora.I18n.t("publisher.mention_success", {names: this.model.get("name")}));
+    }.bind(this));
  },

  mentionModalHidden: function() {
@@ -81,8 +81,8 @@ app.views.ProfileHeader = app.views.Base.extend({

  showMessageModal: function(){
    $("#conversationModal").on("modal:loaded", function() {
-      new app.views.ConversationsForm({prefill: gon.conversationPrefill});
-    });
+      new app.views.ConversationsForm({prefill: [this.model]});
+    }.bind(this));
    app.helpers.showModal("#conversationModal");
  }
 });
--- a/app/assets/javascripts/app/views/publisher/mention_view.js
+++ b/app/assets/javascripts/app/views/publisher/mention_view.js
@@ -2,29 +2,20 @@

 app.views.PublisherMention = app.views.SearchBase.extend({
  triggerChar: "@",
-  invisibleChar: "\u200B", // zero width space
  mentionRegex: /@([^@\s]+)$/,
-
-  templates: {
-    mentionItemSyntax: _.template("@{<%= name %> ; <%= handle %>}"),
-    mentionItemHighlight: _.template("<strong><span><%= name %></span></strong>")
-  },
+  mentionSyntaxTemplate: function(person) { return "@{" + person.handle + "}"; },

  events: {
-    "keydown #status_message_fake_text": "onInputBoxKeyDown",
-    "input #status_message_fake_text": "onInputBoxInput",
-    "click #status_message_fake_text": "onInputBoxClick",
-    "blur #status_message_fake_text": "onInputBoxBlur"
+    "keydown .mention-textarea": "onInputBoxKeyDown",
+    "input .mention-textarea": "updateTypeaheadInput",
+    "click .mention-textarea": "onInputBoxClick",
+    "blur .mention-textarea": "onInputBoxBlur"
  },

-  initialize: function() {
+  initialize: function(opts) {
    this.mentionedPeople = [];
-
-    // contains the 'fake text' displayed to the user
-    // also has a data-messageText attribute with the original text
-    this.inputBox = this.$("#status_message_fake_text");
-    // contains the mentions displayed to the user
-    this.mentionsBox = this.$(".mentions-box");
+    var url = (opts && opts.url) || "/contacts";
+    this.inputBox = this.$(".mention-textarea");
    this.typeaheadInput = this.$(".typeahead-mention-box");
    this.bindTypeaheadEvents();

@@ -32,7 +23,7 @@ app.views.PublisherMention = app.views.SearchBase.extend({
      typeaheadInput: this.typeaheadInput,
      customSearch: true,
      autoselect: true,
-      remoteRoute: {url: "/contacts"}
+      remoteRoute: {url: url}
    });
  },

@@ -55,8 +46,8 @@ app.views.PublisherMention = app.views.SearchBase.extend({
  cleanMentionedPeople: function() {
    var inputText = this.inputBox.val();
    this.mentionedPeople = this.mentionedPeople.filter(function(person) {
-      return person.name && inputText.indexOf(person.name) > -1;
-    });
+      return person.handle && inputText.indexOf(this.mentionSyntaxTemplate(person)) > -1;
+    }.bind(this));
    this.ignoreDiasporaIds = this.mentionedPeople.map(function(person) { return person.handle; });
  },

@@ -70,41 +61,16 @@ app.views.PublisherMention = app.views.SearchBase.extend({
    this.addPersonToMentions(person);
    this.closeSuggestions();

-    messageText = messageText.substring(0, triggerCharPosition) +
-      this.invisibleChar + person.name + messageText.substring(caretPosition);
+    var mentionText = this.mentionSyntaxTemplate(person);
+
+    messageText = messageText.substring(0, triggerCharPosition) + mentionText + messageText.substring(caretPosition);

    this.inputBox.val(messageText);
-    this.updateMessageTexts();
-
    this.inputBox.focus();
-    var newCaretPosition = triggerCharPosition + person.name.length + 1;
+    var newCaretPosition = triggerCharPosition + mentionText.length;
    this.inputBox[0].setSelectionRange(newCaretPosition, newCaretPosition);
  },

-  /**
-   * Replaces every combination of this.invisibleChar + mention.name by the
-   * correct syntax for both hidden text and visible one.
-   *
-   * For instance, the text "Hello \u200Buser1" will be tranformed to
-   * "Hello @{user1 ; user1@pod.tld}" in the hidden element and
-   * "Hello <strong><span>user1</span></strong>" in the element visible to the user.
-   */
-  updateMessageTexts: function() {
-    var fakeMessageText = this.inputBox.val(),
-        mentionBoxText = _.escape(fakeMessageText),
-        messageText = fakeMessageText;
-
-    this.mentionedPeople.forEach(function(person) {
-      var mentionName = this.invisibleChar + person.name;
-      messageText = messageText.replace(mentionName, this.templates.mentionItemSyntax(person));
-      var textHighlight = this.templates.mentionItemHighlight({name: _.escape(person.name)});
-      mentionBoxText = mentionBoxText.replace(mentionName, textHighlight);
-    }, this);
-
-    this.inputBox.data("messageText", messageText);
-    this.mentionsBox.find(".mentions").html(mentionBoxText);
-  },
-
  updateTypeaheadInput: function() {
    var messageText = this.inputBox.val();
    var caretPosition = this.inputBox[0].selectionStart;
@@ -115,6 +81,8 @@ app.views.PublisherMention = app.views.SearchBase.extend({
      return;
    }

+    this.cleanMentionedPeople();
+
    // result[1] is the string between the last '@' and the current caret position
    this.typeaheadInput.typeahead("val", result[1]);
    this.typeaheadInput.typeahead("open");
@@ -128,12 +96,11 @@ app.views.PublisherMention = app.views.SearchBase.extend({
  prefillMention: function(persons) {
    persons.forEach(function(person) {
      this.addPersonToMentions(person);
-      var text = this.invisibleChar + person.name;
+      var text = this.mentionSyntaxTemplate(person);
      if(this.inputBox.val().length !== 0) {
        text = this.inputBox.val() + " " + text;
      }
      this.inputBox.val(text);
-      this.updateMessageTexts();
    }, this);
  },

@@ -154,15 +121,6 @@ app.views.PublisherMention = app.views.SearchBase.extend({
    this.typeaheadInput.trigger($.Event("keydown", {keyCode: e.keyCode, which: e.which}));
  },

-  /**
-   * Listens for user input and opens results dropdown when input contains the trigger char
-   */
-  onInputBoxInput: function() {
-    this.cleanMentionedPeople();
-    this.updateMessageTexts();
-    this.updateTypeaheadInput();
-  },
-
  onInputBoxKeyDown: function(e) {
    // This also matches HOME/END on OSX which is CMD+LEFT, CMD+RIGHT
    if(e.which === Keycodes.LEFT || e.which === Keycodes.RIGHT ||
@@ -205,7 +163,7 @@ app.views.PublisherMention = app.views.SearchBase.extend({

  reset: function() {
    this.inputBox.val("");
-    this.onInputBoxInput();
+    this.updateTypeaheadInput();
  },

  closeSuggestions: function() {
@@ -217,7 +175,8 @@ app.views.PublisherMention = app.views.SearchBase.extend({
    return this.$(".tt-menu").is(":visible");
  },

-  getTextForSubmit: function() {
-    return this.mentionedPeople.length ? this.inputBox.data("messageText") : this.inputBox.val();
+  getMentionedPeople: function() {
+    this.cleanMentionedPeople();
+    return this.mentionedPeople;
  }
 });
--- a/app/assets/javascripts/app/views/publisher/uploader_view.js
+++ b/app/assets/javascripts/app/views/publisher/uploader_view.js
@@ -5,7 +5,7 @@
 // progress. Attaches previews of finished uploads to the publisher.

 app.views.PublisherUploader = Backbone.View.extend({
-  allowedExtensions: ["jpg", "jpeg", "png", "gif", "tif", "tiff"],
+  allowedExtensions: ["jpg", "jpeg", "png", "gif"],
  sizeLimit: 4194304,  // bytes

  initialize: function(opts) {
@@ -14,6 +14,9 @@ app.views.PublisherUploader = Backbone.View.extend({
      element: this.el,
      button: this.el,

+      text: {
+        fileInputTitle: Diaspora.I18n.t("photo_uploader.upload_photos")
+      },
      request: {
        endpoint: Routes.photos(),
        params: {
@@ -149,7 +152,7 @@ app.views.PublisherUploader = Backbone.View.extend({
      dataType: "json",
      type: "DELETE",
      success: function() {
-        $.when(photo.fadeOut(400)).then(function(){
+        photo.fadeOut(400, function() {
          photo.remove();

          if( self.publisher.$(".publisher_photo").length === 0 ) {
--- a/app/assets/javascripts/app/views/publisher_view.js
+++ b/app/assets/javascripts/app/views/publisher_view.js
@@ -18,11 +18,11 @@ app.views.Publisher = Backbone.View.extend({
  el : "#publisher",

  events : {
-    "keydown #status_message_fake_text" : "keyDown",
+    "keydown #status_message_text": "keyDown",
    "focus textarea" : "open",
    "submit form" : "createStatusMessage",
    "click #submit" : "createStatusMessage",
-    "textchange #status_message_fake_text": "handleTextchange",
+    "textchange #status_message_text": "checkSubmitAvailability",
    "click #locator" : "showLocation",
    "click #poll_creator" : "togglePollCreator",
    "click #hide_location" : "destroyLocation",
@@ -35,24 +35,15 @@ app.views.Publisher = Backbone.View.extend({
    this.disabled   = false;

    // init shortcut references to the various elements
-    this.inputEl = this.$("#status_message_fake_text");
-    this.hiddenInputEl = this.$("#status_message_text");
-    this.wrapperEl = this.$("#publisher_textarea_wrapper");
+    this.inputEl = this.$("#status_message_text");
+    this.wrapperEl = this.$("#publisher-textarea-wrapper");
    this.submitEl = this.$("input[type=submit], button#submit");
    this.photozoneEl = this.$("#photodropzone");

    // if there is data in the publisher we ask for a confirmation
    // before the user is able to leave the page
    $(window).on("beforeunload", _.bind(this._beforeUnload, this));
-    $(window).unload(this.clear.bind(this));
-
-    // sync textarea content
-    if( this.hiddenInputEl.val() === "" ) {
-      this.hiddenInputEl.val( this.inputEl.val() );
-    }
-    if( this.inputEl.val() === "" ) {
-      this.inputEl.val( this.hiddenInputEl.val() );
-    }
+    $(window).on("unload", this.clear.bind(this));

    // hide close and preview buttons and manage services link
    // in case publisher is standalone
@@ -96,7 +87,7 @@ app.views.Publisher = Backbone.View.extend({
  },

  initSubviews: function() {
-    this.mention = new app.views.PublisherMention({ el: this.$("#publisher_textarea_wrapper") });
+    this.mention = new app.views.PublisherMention({ el: this.$("#publisher-textarea-wrapper") });
    if(this.prefillMention) {
      this.mention.prefillMention([this.prefillMention]);
    }
@@ -110,14 +101,14 @@ app.views.Publisher = Backbone.View.extend({
    });

    this.viewAspectSelector = new app.views.PublisherAspectSelector({
-      el: this.$(".public_toggle .aspect_dropdown"),
+      el: this.$(".public_toggle .aspect-dropdown"),
      form: form
    });

    this.viewGettingStarted = new app.views.PublisherGettingStarted({
      firstMessageEl:  this.inputEl,
-      visibilityEl: this.$(".public_toggle .aspect_dropdown > .dropdown-toggle"),
-      streamEl:     $("#main_stream")
+      visibilityEl: this.$(".public_toggle .aspect-dropdown > .dropdown-toggle"),
+      streamEl:     $("#main-stream")
    });

    this.viewUploader = new app.views.PublisherUploader({
@@ -138,7 +129,7 @@ app.views.Publisher = Backbone.View.extend({
      },

      onPostPreview: function() {
-        var photoAttachments = self.wrapperEl.find(".photo_attachments");
+        var photoAttachments = self.wrapperEl.find(".photo-attachments");
        if (photoAttachments.length > 0) {
          new app.views.Gallery({el: photoAttachments});
        }
@@ -163,7 +154,7 @@ app.views.Publisher = Backbone.View.extend({
    this.viewPollCreator.render();

    if (this.prefillMention) {
-      this.handleTextchange();
+      this.checkSubmitAvailability();
    }
  },

@@ -175,12 +166,11 @@ app.views.Publisher = Backbone.View.extend({
  // inject content into the publisher textarea
  setText: function(txt) {
    this.inputEl.val(txt);
-    this.hiddenInputEl.val(txt);
    this.prefillText = txt;

    this.inputEl.trigger("input");
    autosize.update(this.inputEl);
-    this.handleTextchange();
+    this.checkSubmitAvailability();
  },

  // show the "getting started" popups around the publisher
@@ -188,6 +178,9 @@ app.views.Publisher = Backbone.View.extend({
    if (gon.preloads.getting_started) {
      this.open();
      this.viewGettingStarted.show();
+      if (gon.preloads.mentioned_person) {
+        this.mention.addPersonToMentions(gon.preloads.mentioned_person);
+      }
    }
  },

@@ -202,9 +195,6 @@ app.views.Publisher = Backbone.View.extend({
    // empty poll answer and failing validation.
    this.viewPollCreator.removeLastAnswer();

-    //add missing mentions at end of post:
-    this.handleTextchange();
-
    var serializedForm = $(evt.target).closest("form").serializeObject();
    // disable input while posting, must be after the form is serialized
    this.setInputEnabled(false);
@@ -255,7 +245,7 @@ app.views.Publisher = Backbone.View.extend({
        self.setButtonsEnabled(true);
        self.setInputEnabled(true);
        self.wrapperEl.removeClass("submitting");
-        self.handleTextchange();
+        self.checkSubmitAvailability();
        autosize.update(self.inputEl);
      }
    });
@@ -330,13 +320,8 @@ app.views.Publisher = Backbone.View.extend({
  },

  createPostPreview: function() {
-    //add missing mentions at end of post:
-    this.handleTextchange();
-
    var serializedForm = $("#new_status_message").serializeObject();
-    var text = this.mention.getTextForSubmit();
    var photos = this.getUploadedPhotos();
-    var mentionedPeople = this.mention.mentionedPeople;
    var poll = this.getPollData(serializedForm);
    var locationCoords = serializedForm["location[coords]"];
    if(!locationCoords || locationCoords === "") {
@@ -352,12 +337,12 @@ app.views.Publisher = Backbone.View.extend({

    var previewMessage = {
      "id": 0,
-      "text": text,
+      "text": serializedForm["status_message[text]"],
      "public": serializedForm["aspect_ids[]"] === "public",
      "created_at": new Date().toISOString(),
      "interacted_at": new Date().toISOString(),
      "author": app.currentUser ? app.currentUser.attributes : {},
-      "mentioned_people": mentionedPeople,
+      "mentioned_people": this.mention.getMentionedPeople(),
      "photos": photos,
      "title": serializedForm["status_message[text]"],
      "location": location,
@@ -370,7 +355,7 @@ app.views.Publisher = Backbone.View.extend({
  },

  keyDown : function(evt) {
-    if(evt.which === Keycodes.ENTER && evt.ctrlKey) {
+    if (evt.which === Keycodes.ENTER && (evt.metaKey || evt.ctrlKey)) {
      this.$("form").submit();
      this.open();
      return false;
@@ -381,11 +366,10 @@ app.views.Publisher = Backbone.View.extend({
    // remove mentions
    this.mention.reset();

-    // clear text(s)
+    // clear text
    this.inputEl.val("");
-    this.hiddenInputEl.val("");
    this.inputEl.trigger("keyup")
-                 .trigger("keydown");
+                .trigger("keydown");
    autosize.update(this.inputEl);

    // remove photos
@@ -421,14 +405,13 @@ app.views.Publisher = Backbone.View.extend({

    // force textchange plugin to update lastValue
    this.inputEl.data("lastValue", "");
-    this.hiddenInputEl.data("lastValue", "");

    return this;
  },

  tryClose : function(){
-    // if it is not submittable, close it.
-    if( !this._submittable() ){
+    // if it is not submittable and not in preview mode, close it.
+    if (!this._submittable() && !this.markdownEditor.isPreviewMode()) {
      this.close();
    }
  },
@@ -472,8 +455,7 @@ app.views.Publisher = Backbone.View.extend({
  setEnabled: function(bool) {
    this.setInputEnabled(bool);
    this.disabled = !bool;
-
-    this.handleTextchange();
+    this.checkSubmitAvailability();
  },

  setButtonsEnabled: function(bool) {
@@ -487,10 +469,8 @@ app.views.Publisher = Backbone.View.extend({
  setInputEnabled: function(bool) {
    if (bool) {
      this.inputEl.removeAttr("disabled");
-      this.hiddenInputEl.removeAttr("disabled");
    } else {
      this.inputEl.prop("disabled", true);
-      this.hiddenInputEl.prop("disabled", true);
    }
  },

@@ -503,11 +483,6 @@ app.views.Publisher = Backbone.View.extend({
    return (!onlyWhitespaces || isPhotoAttached) && isValidPoll && !this.disabled;
  },

-  handleTextchange: function() {
-    this.checkSubmitAvailability();
-    this.hiddenInputEl.val(this.mention.getTextForSubmit());
-  },
-
  _beforeUnload: function(e) {
    if(this._submittable() && this.inputEl.val() !== this.prefillText){
      var confirmationMessage = Diaspora.I18n.t("confirm_unload");
--- a/app/assets/javascripts/app/views/search_base_view.js
+++ b/app/assets/javascripts/app/views/search_base_view.js
@@ -7,6 +7,7 @@ app.views.SearchBase = app.views.Base.extend({
    if(options.customSearch) { this.setupCustomSearch(); }
    this.setupTypeahead();
    if(options.autoselect) { this.setupAutoselect(); }
+    this.setupTypeaheadAvatarFallback();
  },

  bloodhoundTokenizer: function(str) {
@@ -110,6 +111,12 @@ app.views.SearchBase = app.views.Base.extend({
    });
  },

+  setupTypeaheadAvatarFallback: function() {
+    this.typeaheadInput.on("typeahead:render", function() {
+      this.setupAvatarFallback(this.$el);
+    }.bind(this));
+  },
+
  ignorePersonForSuggestions: function(person) {
    if(person.handle) { this.ignoreDiasporaIds.push(person.handle); }
  }
--- a/app/assets/javascripts/app/views/single-post-viewer/single_post_actions.js
+++ b/app/assets/javascripts/app/views/single-post-viewer/single_post_actions.js
@@ -26,8 +26,8 @@ app.views.SinglePostActions = app.views.Feedback.extend({
  },

  focusComment: function() {
-    $('.comment_stream .comment_box').focus();
-    $('html,body').animate({scrollTop: $('.comment_stream .comment_box').offset().top - ($('.comment_stream .comment_box').height() + 20)});
+    $('.comment_stream .comment-box').focus();
+    $('html,body').animate({scrollTop: $('.comment_stream .comment-box').offset().top - ($('.comment_stream .comment-box').height() + 20)});
    return false;
  },

--- a/app/assets/javascripts/app/views/single-post-viewer/single_post_comment_stream.js
+++ b/app/assets/javascripts/app/views/single-post-viewer/single_post_comment_stream.js
@@ -7,7 +7,9 @@ app.views.SinglePostCommentStream = app.views.CommentStream.extend({
    this.CommentView = app.views.ExpandedComment;
    $(window).on('hashchange',this.highlightPermalinkComment);
    this.setupBindings();
-    this.model.comments.on("reset", this.render, this);
+    this.model.comments.fetch({success: function() {
+      setTimeout(this.highlightPermalinkComment, 0);
+    }.bind(this)});
  },

  highlightPermalinkComment: function() {
@@ -17,14 +19,13 @@ app.views.SinglePostCommentStream = app.views.CommentStream.extend({
      $(".highlighted").removeClass("highlighted");
      element.addClass("highlighted");
      var pos = element.offset().top - headerSize;
-      window.scroll(0, pos);
+      $("html,body").animate({scrollTop: pos});
    }
  },

  postRenderTemplate: function() {
    app.views.CommentStream.prototype.postRenderTemplate.apply(this);
    this.$(".new-comment-form-wrapper").removeClass("hidden");
-    _.defer(this.highlightPermalinkComment);
  },

  presenter: function(){
--- a/app/assets/javascripts/app/views/single-post-viewer/single_post_interaction_counts.js
+++ b/app/assets/javascripts/app/views/single-post-viewer/single_post_interaction_counts.js
@@ -4,8 +4,15 @@ app.views.SinglePostInteractionCounts = app.views.Base.extend({
  templateName: "single-post-viewer/single-post-interaction-counts",
  tooltipSelector: ".avatar.micro",

+  events: {
+    "click #show-all-likes": "showAllLikes",
+    "click #show-all-reshares": "showAllReshares"
+  },
+
  initialize: function() {
    this.model.interactions.on("change", this.render, this);
+    this.model.interactions.likes.on("change", this.render, this);
+    this.model.interactions.reshares.on("change", this.render, this);
  },

  presenter: function() {
@@ -15,8 +22,28 @@ app.views.SinglePostInteractionCounts = app.views.Base.extend({
      reshares: interactions.reshares.toJSON(),
      commentsCount: interactions.commentsCount(),
      likesCount: interactions.likesCount(),
-      resharesCount: interactions.resharesCount()
+      resharesCount: interactions.resharesCount(),
+      showMoreLikes: interactions.likes.length < interactions.likesCount(),
+      showMoreReshares: interactions.reshares.length < interactions.resharesCount()
    };
+  },
+
+  _showAll: function(interactionType, models) {
+    this.$("#show-all-" + interactionType).addClass("hidden");
+    this.$("#" + interactionType + " .loader").removeClass("hidden");
+    models.fetch({success: function() {
+      models.trigger("change");
+    }});
+  },
+
+  showAllLikes: function(evt) {
+    evt.preventDefault();
+    this._showAll("likes", this.model.interactions.likes);
+  },
+
+  showAllReshares: function(evt) {
+    evt.preventDefault();
+    this._showAll("reshares", this.model.interactions.reshares);
  }
 });
 // @license-end
--- a/app/assets/javascripts/app/views/stream_post_views.js
+++ b/app/assets/javascripts/app/views/stream_post_views.js
@@ -28,10 +28,11 @@ app.views.StreamPost = app.views.Post.extend({
                     ".permalink"].join(", "),

  initialize : function(){
-    var personId = this.model.get("author").id;
-    app.events.on("person:block:"+personId, this.remove, this);
-
-    this.model.on("remove", this.remove, this);
+    // If we are on a user page, we don't want to remove posts on block
+    if (!app.page.model.has("profile")) {
+      var personId = this.model.get("author").id;
+      app.events.on("person:block:" + personId, this.remove, this);
+    }
    //subviews
    this.commentStreamView = new app.views.CommentStream({model : this.model});
    this.oEmbedView = new app.views.OEmbed({model : this.model});
@@ -87,7 +88,7 @@ app.views.StreamPost = app.views.Post.extend({
  focusCommentTextarea: function(evt){
    evt.preventDefault();
    this.$(".new-comment-form-wrapper").removeClass("hidden");
-    this.$(".comment_box").focus();
+    this.$(".comment-box").focus();

    return this;
  }
--- a/app/assets/javascripts/app/views/stream_view.js
+++ b/app/assets/javascripts/app/views/stream_view.js
@@ -28,6 +28,12 @@ app.views.Stream = app.views.InfScroll.extend({
    var streamSelection = $("#stream_selection");
    streamSelection.find("[data-stream]").removeClass("selected");
    streamSelection.find("[data-stream='" + activeStream + "']").addClass("selected");
+
+    var activityContainer = streamSelection.find(".my-activity");
+    activityContainer.removeClass("activity-stream-selected");
+    if (activeStream === "activity" || activeStream === "liked" || activeStream === "commented") {
+      activityContainer.addClass("activity-stream-selected");
+    }
  },

  initInvitationModal : function() {
--- a/app/assets/javascripts/app/views/tags_view.js
+++ b/app/assets/javascripts/app/views/tags_view.js
@@ -1,12 +1,12 @@
 // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later

-app.views.Tags = Backbone.View.extend({
+app.views.Tags = app.views.Base.extend({
  initialize: function(opts) {
    if(app.publisher) {
      app.publisher.setText("#"+ opts.hashtagName + " ");
    }
    // add avatar fallback if it can't be loaded
-    $(app.views.Base.prototype.avatars.selector).error(app.views.Base.prototype.avatars.fallback);
+    this.setupAvatarFallback($("#tags_show"));
  }
 });
 // @license-end
--- a/app/assets/javascripts/contact-list.js
+++ b/app/assets/javascripts/contact-list.js
@@ -9,7 +9,7 @@ var List = {
  },

  handleSearchRefresh: function( data ) {
-    var streamEl = $("#people_stream.stream");
+    var streamEl = $("#people-stream.stream");
    var string = data.search_html || $("<p>", {
        text : Diaspora.I18n.t("people.not_found")
      });
@@ -18,7 +18,7 @@ var List = {

    if (data.contacts) {
      var contacts = new app.collections.Contacts(data.contacts);
-      $(".aspect_membership_dropdown.placeholder").each(function() {
+      $(".aspect-membership-dropdown.placeholder").each(function() {
        var personId = $(this).data("personId");
        var view = new app.views.AspectMembership({person: contacts.findWhere({"person_id": personId}).person});
        $(this).html(view.render().$el);
--- a/app/assets/javascripts/helpers/markdown_editor.js
+++ b/app/assets/javascripts/helpers/markdown_editor.js
@@ -9,7 +9,8 @@ Diaspora.MarkdownEditor.prototype = {
    this.options = {
      resize: "none",
      onHidePreview: $.noop,
-      onPostPreview: $.noop
+      onPostPreview: $.noop,
+      onChange: function(e) { autosize.update(e.$textarea); }
    };

    $.extend(this.options, opts);
@@ -65,7 +66,7 @@ Diaspora.MarkdownEditor.prototype = {
    var tabElement = $("<ul class='nav nav-tabs btn-group write-preview-tabs'></ul>");

    var writeTab = $("<li class='active full-height' role='presentation'></li>");
-    this.writeLink = $("<a class='full-height md-write-tab' href='#'></a>")
+    this.writeLink = $("<a class='full-height md-write-tab' href='#' data-target=' '></a>")
      .attr("title", Diaspora.I18n.t("publisher.markdown_editor.tooltips.write"));

    this.writeLink.append($("<i class='visible-sm visible-xs visible-md diaspora-custom-compose'></i>"));
@@ -80,7 +81,7 @@ Diaspora.MarkdownEditor.prototype = {
    writeTab.append(this.writeLink);

    var previewTab = $("<li class='full-height' role='presentation'></li>");
-    this.previewLink = $("<a class='full-height md-preview-tab' href='#'></a>")
+    this.previewLink = $("<a class='full-height md-preview-tab' href='#' data-target=' '></a>")
      .attr("title", Diaspora.I18n.t("publisher.markdown_editor.tooltips.preview"));

    this.previewLink.append($("<i class='visible-sm visible-xs visible-md entypo-search'>"));
@@ -130,6 +131,14 @@ Diaspora.MarkdownEditor.prototype = {
    }
  },

+  isPreviewMode: function() {
+    return this.instance !== undefined && this.instance.$editor.find(".md-preview").length > 0;
+  },
+
+  userInputEmpty: function() {
+    return this.instance === undefined || this.instance.getContent().length === 0;
+  },
+
  localize: function() {
    var locale = Diaspora.I18n.language;

@@ -160,3 +169,7 @@ Diaspora.MarkdownEditor.prototype = {
    return locale;
  }
 };
+
+Diaspora.MarkdownEditor.simplePreview = function($mdInstance) {
+  return "<div class='preview-content'>" + app.helpers.textFormatter($mdInstance.getContent()) + "</div>";
+};
--- a/app/assets/javascripts/helpers/profile_photo_uploader.js
+++ b/app/assets/javascripts/helpers/profile_photo_uploader.js
@@ -78,6 +78,10 @@ Diaspora.ProfilePhotoUploader.prototype = {
            alert(errorReason);
          }
        }
+      },
+
+      text: {
+        fileInputTitle: ""
      }
    });
  }
--- a/app/assets/javascripts/ie.js
+++ b/app/assets/javascripts/ie.js
@@ -1,6 +0,0 @@
-// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
-
-document.createElement('header');
-document.createElement('footer');
-// @license-end
-
--- a/app/assets/javascripts/jasmine-load-all.js
+++ b/app/assets/javascripts/jasmine-load-all.js
@@ -1,4 +1,4 @@
-//= require jquery2
+//= require jquery3
 //= require handlebars.runtime
 //= require templates
 //= require main
--- a/app/assets/javascripts/jsxc.js
+++ b/app/assets/javascripts/jsxc.js
@@ -1,5 +1,5 @@
 //= require emojione
-//= require favico.js
+//= require favico.js/favico

 //= require jquery.ui/ui/resizable
 //= require jquery.ui/ui/draggable
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -9,13 +9,11 @@
 //= require autosize
 //= require charcount
 //= require jquery-placeholder
-//= require rails-timeago
-//= require jquery.events.input
-//= require jquery.infinitescroll-custom
-//= require jquery-ui/core
-//= require jquery-ui/widget
-//= require jquery-ui/mouse
-//= require jquery-ui/sortable
+//= require jquery.timeago
+//= require jquery.ui/ui/core
+//= require jquery.ui/ui/widget
+//= require jquery.ui/ui/mouse
+//= require jquery.ui/ui/sortable
 //= require keycodes
 //= require jquery.autoSuggest.custom
 //= require fine-uploader/fine-uploader.core
@@ -28,6 +26,7 @@
 //= require markdown-it-sanitizer
 //= require markdown-it-sub
 //= require markdown-it-sup
+//= require markdown-it-html5-embed
 //= require highlightjs
 //= require clear-form
 //= require corejs-typeahead
@@ -43,5 +42,6 @@
 //= require blueimp-gallery/blueimp-gallery-indicator
 //= require leaflet
 //= require api/authorization_page
-// = require bootstrap-markdown/bootstrap-markdown
-// = require helpers/markdown_editor
+//= require bootstrap-markdown/bootstrap-markdown
+//= require helpers/markdown_editor
+//= require jquery.are-you-sure
--- a/app/assets/javascripts/mobile/bookmarklet.js
+++ b/app/assets/javascripts/mobile/bookmarklet.js
@@ -6,16 +6,21 @@ $(document).ready(function() {
      return params.content;
    }

-    var content = params.title + " - " + params.url;
-    if (params.notes.length > 0) {
-      content += " - " + params.notes;
+    var separator = "\n\n";
+    var contents = "### " + params.title + separator;
+    if (params.notes) {
+      var notes = params.notes.toString().replace(/(?:\r\n|\r|\n)/g, "\n> ");
+      contents += "> " + notes + separator;
    }
-    return content;
+    contents += params.url;
+    return contents;
  }

  var content = publisherContent(gon.preloads.bookmarklet);
  if (content.length > 0) {
-    $("#status_message_text").val(content);
+    var textarea = $("#status_message_text");
+    textarea.val(content);
+    autosize.update(textarea);
  }
 });
 // @license-end
--- a/app/assets/javascripts/mobile/mobile.js
+++ b/app/assets/javascripts/mobile/mobile.js
@@ -1,9 +1,9 @@
-// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
-
 /*   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 *   licensed under the Affero General Public License version 3 or later.  See
 *   the COPYRIGHT file.
 */
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
 //= require jquery-textchange
 //= require charcount
 //= require js-routes
@@ -11,13 +11,15 @@
 //= require keycodes
 //= require jquery.autoSuggest.custom
 //= require fine-uploader/fine-uploader.core
-//= require rails-timeago
+//= require jquery.timeago
 //= require underscore
 //= require bootstrap
 //= require diaspora
 //= require helpers/i18n
 //= require helpers/profile_photo_uploader
 //= require helpers/tags_autocomplete
+//= require bootstrap-markdown/bootstrap-markdown
+//= require helpers/markdown_editor
 //= require widgets/timeago
 //= require mobile/mobile_application
 //= require mobile/mobile_file_uploader
--- a/app/assets/javascripts/mobile/mobile_comments.js
+++ b/app/assets/javascripts/mobile/mobile_comments.js
@@ -11,6 +11,8 @@
    initialize: function() {
      var self = this;

+      new Diaspora.MarkdownEditor(".comment-box");
+
      this.stream().on("tap click", "a.show-comments", function(evt){
        evt.preventDefault();
        self.toggleComments($(this));
@@ -35,13 +37,13 @@
        self.scrollToOffset(commentContainer);
      });

-      this.stream().on("submit", ".new_comment", this.submitComment);
+      this.stream().on("submit", ".new-comment", this.submitComment);
    },

    submitComment: function(evt){
      evt.preventDefault();
      var form = $(this);
-      var commentBox = form.find(".comment_box");
+      var commentBox = form.find(".comment-box");
      var commentText = $.trim(commentBox.val());
      if(!commentText){
        commentBox.focus();
@@ -167,7 +169,7 @@

    showCommentBox: function(link){
      var bottomBar = link.closest(".bottom-bar").first();
-      var textArea = bottomBar.find("textarea.comment_box").first()[0];
+      var textArea = bottomBar.find("textarea.comment-box").first()[0];
      bottomBar.find(".add-comment-switcher").removeClass("hidden");
      autosize(textArea);
    },
@@ -201,7 +203,7 @@
    increaseReactionCount: function(bottomBar) {
      var toggleReactionsLink = bottomBar.find(".show-comments").first();
      var count = toggleReactionsLink.text().match(/.*(\d+).*/);
-      count = parseInt(count, 10);
+      count = parseInt(count, 10) || 0;
      var text = Diaspora.I18n.t("stream.comments", {count: count + 1});

      // No previous comment
--- a/app/assets/javascripts/mobile/mobile_conversations.js
+++ b/app/assets/javascripts/mobile/mobile_conversations.js
@@ -1,6 +1,7 @@
 (function() {
  Diaspora.Mobile.Conversations = {
    initialize: function() {
+      new Diaspora.MarkdownEditor(".conversation-message-text");
      if (Diaspora.Page !== "ConversationsNew") { return; }
      $(document).on("ajax:success", "form#new-conversation", this.conversationCreateSuccess);
      $(document).on("ajax:error", "form#new-conversation", this.conversationCreateError);
--- a/app/assets/javascripts/mobile/mobile_drawer.js
+++ b/app/assets/javascripts/mobile/mobile_drawer.js
@@ -1,17 +1,11 @@
-(function(){
+(function() {
  Diaspora.Mobile.Drawer = {
-    initialize: function(){
-      $("#all_aspects").bind("tap click", function(evt){
-        evt.preventDefault();
-        $(this).find("+ li").toggleClass("hide");
-      });
-
-      $("#menu-badge").bind("tap click", function(evt){
+    initialize: function() {
+      $("#menu-badge").bind("tap click", function(evt) {
        evt.preventDefault();
        $("#app").toggleClass("draw");
      });
-
-      $("#followed_tags").bind("tap click", function(evt){
+      $("#all_aspects, #followed_tags, #admin").bind("tap click", function(evt) {
        evt.preventDefault();
        $(this).find("+ li").toggleClass("hide");
      });
--- a/app/assets/javascripts/mobile/mobile_file_uploader.js
+++ b/app/assets/javascripts/mobile/mobile_file_uploader.js
@@ -19,10 +19,13 @@ function createUploader(){
      }
    },
    validation: {
-      allowedExtensions: ["jpg", "jpeg", "png", "gif", "tif", "tiff"],
+      allowedExtensions: ["jpg", "jpeg", "png", "gif"],
      sizeLimit: 4194304
    },
    button: document.getElementById("file-upload-publisher"),
+    text: {
+      fileInputTitle: Diaspora.I18n.t("photo_uploader.upload_photos")
+    },

    callbacks: {
      onProgress: function(id, fileName, loaded, total) {
@@ -30,8 +33,7 @@ function createUploader(){
        $("#fileInfo-publisher").text(fileName + " " + progress + "%");
      },
      onSubmit: function() {
-        $("#file-upload-publisher").addClass("loading");
-        $("#publisher_textarea_wrapper").addClass("with_attachments");
+        $("#publisher-textarea-wrapper").addClass("with_attachments");
        $("#photodropzone").append(
          "<li class='publisher_photo loading' style='position:relative;'>" +
          "<img alt='Ajax-loader2' src='" + ImagePaths.get("ajax-loader2.gif") + "' />" +
@@ -48,7 +50,7 @@ function createUploader(){
            url = responseJSON.data.photo.unprocessed_image.url,
            currentPlaceholder = $("li.loading").first();

-        $("#publisher_textarea_wrapper").addClass("with_attachments");
+        $("#publisher-textarea-wrapper").addClass("with_attachments");
        $("#new_status_message").append("<input type='hidden' value='" + id + "' name='photos[]' />");

        // replace image placeholders
@@ -74,7 +76,7 @@ function createUploader(){
              photo.fadeOut(400, function() {
                photo.remove();
                if ($(".publisher_photo").length === 0) {
-                  $("#publisher_textarea_wrapper").removeClass("with_attachments");
+                  $("#publisher-textarea-wrapper").removeClass("with_attachments");
                }
              });
            }
--- a/app/assets/javascripts/mobile/mobile_post_actions.js
+++ b/app/assets/javascripts/mobile/mobile_post_actions.js
@@ -75,7 +75,7 @@

    onLike: function(evt){
      evt.preventDefault();
-      var link = $(evt.target),
+      var link = $(evt.target).closest(".like-action"),
          likeCounter = $(evt.target).closest(".stream-element").find(".like-count");

      if(!link.hasClass("loading") && link.hasClass("inactive")) {
@@ -89,7 +89,7 @@
    onReshare: function(evt) {
      evt.preventDefault();

-      var link = $(this),
+      var link = $(this).closest(".reshare-action"),
          href = link.attr("href"),
          confirmText = link.attr("title");

@@ -103,6 +103,10 @@
          },
          success: function() {
            Diaspora.Mobile.PostActions.toggleActive(link);
+            var reshareCounter = $(evt.target).closest(".stream-element").find(".reshare-count");
+            if (reshareCounter) {
+              reshareCounter.text(parseInt(reshareCounter.text(), 10) + 1);
+            }
          },
          error: function(response) {
            Diaspora.Mobile.Alert.handleAjaxError(response);
--- a/app/assets/javascripts/mobile/publisher.js
+++ b/app/assets/javascripts/mobile/publisher.js
@@ -46,4 +46,6 @@ $(document).ready(function(){
    evt.preventDefault();
    $("#new_status_message").submit();
  });
+
+  new Diaspora.MarkdownEditor("#status_message_text");
 });
--- a/app/assets/javascripts/osmlocator.js
+++ b/app/assets/javascripts/osmlocator.js
@@ -5,12 +5,12 @@ OSM =  {};
 OSM.Locator = function(){

  var geolocalize = function(callback){
-    navigator.geolocation.getCurrentPosition(function(position) {       
+    navigator.geolocation.getCurrentPosition(function(position) {
      var lat=position.coords.latitude,
          lon=position.coords.longitude;
      $.getJSON("https://nominatim.openstreetmap.org/reverse?format=json&lat="+lat+"&lon="+lon+"&addressdetails=3", function(data){
        return callback(data.display_name, position.coords);
-      }); 
+      });
    },errorGettingPosition);
  };

--- a/app/assets/javascripts/widgets/timeago.js
+++ b/app/assets/javascripts/widgets/timeago.js
@@ -26,6 +26,12 @@
          }
        });
      }
+
+      $.timeago.settings.autoDispose = false;
+
+      $(function() {
+        $("time[data-time-ago]").timeago();
+      });
    });
  };
 })();
--- a/app/assets/stylesheets/_application.scss
+++ b/app/assets/stylesheets/_application.scss
@@ -9,7 +9,6 @@
@import 'media-box';
@import 'entypo';
@import 'icons';
-@import 'mentions';
@import 'animations';
@import 'flash_messages';
@import 'sprites';
@@ -89,6 +88,7 @@
@import 'chat';
@import 'markdown-content';
@import 'oembed';
+@import 'media-embed';
@import 'post-content';

 // contacts
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -2,9 +2,9 @@
@import 'bootstrap-variables';
@import 'animations';

-/** ADMIN STYlES **/
-/** user search **/
+// ADMIN STYlES

+// user search
 .users {
  li.user {
    border-bottom: 1px solid $light-grey;
@@ -16,15 +16,14 @@
    .avatar {
      width: 50px;
      height: 50px;
+      max-width: none;
    }

-    .actions{ width: 150px; }
-
    .pull-right .label{ display: inline-block; }
  }
 }

-/** Invites panel **/
+// Invites panel
 .more_invites{
  #add-invites-section{
    line-height: 34px;
@@ -32,12 +31,49 @@
  }
 }

-/** reported posts **/
+.invite-emails {
+  margin-bottom: 10px;
+}

-@import 'report';
+// Weekly stats
+.week-selector {
+  margin-top: 10px;
+}

-/** pod list **/
+// Pod stats
+.segment-selection {
+  select,
+  [type=submit] {
+    margin-top: 10px;
+  }
+}

+.percent-change {
+  &.increase {
+    color: $increase;
+  }
+
+  &.decrease {
+    color: $decrease;
+  }
+}
+
+// reported posts
+.reports {
+  .reason-label {
+    font-weight: bold;
+  }
+
+  .content {
+    padding-bottom: 20px;
+  }
+
+  .panel-body .btn-info {
+    margin-right: 5px;
+  }
+}
+
+// pod list
 #pod-list {
  .pod-title {
    max-width: 200px;
--- a/app/assets/stylesheets/aspects.scss
+++ b/app/assets/stylesheets/aspects.scss
@@ -1,4 +1,4 @@
-.aspect_dropdown {
+.aspect-dropdown {

  li {
    @include selectable-list;
--- a/app/assets/stylesheets/base.scss
+++ b/app/assets/stylesheets/base.scss
@@ -70,20 +70,29 @@ pre { word-wrap: break-word; }
  height: 50px;
  line-height: 50px;
  opacity: 0;
+  pointer-events: none;
  position: fixed;
-  right: 54px;
+  right: 20px;
+  text-decoration: none;
  transition: opacity ease 400ms;
  width: 50px;
  z-index: 49;

  &:hover,
-  &.visible:hover {
+  &:focus,
+  &:active {
    color: $white;
-    opacity: .85;
    text-decoration: none;
  }

-  &.visible { opacity: .5; }
+  &.visible {
+    opacity: .5;
+    pointer-events: auto;
+
+    &:hover {
+      opacity: .85;
+    }
+  }
 }

 .noscript {
--- a/app/assets/stylesheets/bootstrap-complete.scss
+++ b/app/assets/stylesheets/bootstrap-complete.scss
@@ -1,7 +1,7 @@
 // Calling this file bootstrap would cause an infinite recursion during asset compilation.
@import "bootstrap-sprockets";
@import "bootstrap-variables"; //our overwrites of bootstrap variables
-@import "bootstrap";
+@import "_bootstrap";

 // Plugins

--- a/app/assets/stylesheets/color-variables.scss
+++ b/app/assets/stylesheets/color-variables.scss
@@ -32,3 +32,6 @@ $left-navbar-drawer-background: darken($white, 6%) !default;
 $hovercard-background: $white !default;

 $card-shadow: 0 1px 2px 0 rgba(0, 0, 0, .16), 0 2px 10px 0 rgba(0, 0, 0, .12) !default;
+
+$increase: #008000;
+$decrease: #fe0000;
--- a/app/assets/stylesheets/color_themes/_color_theme_override.scss
+++ b/app/assets/stylesheets/color_themes/_color_theme_override.scss
@@ -1,12 +1,10 @@
 /* Raw CSS */
 body {
-  #publisher_textarea_wrapper > #button_container > span.markdownIndications > a {
+  #publisher-textarea-wrapper > #button_container > span.markdownIndications > a {
    color: fade-out($link-color, 0.4);
  }

  .left-navbar .hoverable:hover { background-color: $main-color-essence; }

-  .poll_form .progress .bar { background-color: $main-color-dark; }
-
  .badge { background-color: $brand-primary; }
 }
--- a/app/assets/stylesheets/color_themes/_color_theme_override_dark.scss
+++ b/app/assets/stylesheets/color_themes/_color_theme_override_dark.scss
@@ -1,31 +1,28 @@
 // Only overriding existing selectors here, so disable some lint rules
 // scss-lint:disable IdSelector, SelectorFormat, NestingDepth, SelectorDepth, QualifyingElement
 body {
-  .navbar.navbar-fixed-top #user_menu .dropdown-menu > li > a {
-    color: $text-color;
-    &:hover { color: $white; }
-  }
-
  .publisher {
-    .mentions-input-box { background-color: $gray; }
    form {
-      #publisher_textarea_wrapper { background-color: $gray; }
+      #publisher-textarea-wrapper { background-color: $gray; }
      .btn.btn-link.question_mark:hover .entypo-cog { color: $gray-light; }
    }
-
-    .write-preview-tabs > li.active * { color: $text-color; }
-    .md-preview { background-color: $gray; }
-    .md-cancel:hover .entypo-cross { color: $gray-light; }
    .publisher-buttonbar .btn.btn-link:hover i { color: $gray-light; }
  }

-  .aspect_dropdown li a .text { color: $dropdown-link-color; }
+  .write-preview-tabs > li.active * { color: $text-color; }
+  .md-cancel:hover .entypo-cross { color: $gray-light; }
+
+  .md-input,
+  .md-preview { background-color: $gray; }
+
+  .aspect-dropdown li a .text { color: $dropdown-link-color; }

  .info .tag { background-color: $gray-light; }

-  .poll_form .progress {
+  .poll-form .progress {
    background-color: $gray-dark;
-    .bar { background-color: $gray-light; }
+    .progress-bar { background-color: $gray-light; }
+    .users-vote { background-color: $brand-primary; }
  }

  .stream-element .collapsible {
@@ -64,7 +61,7 @@ body {

  #invitationsModal #email_invitation { border-top: 1px dashed $gray-light; }

-  #contacts_container #people_stream.contacts .stream-element.in_aspect {
+  #contacts_container #people-stream.contacts .stream-element.in_aspect {
    background-color: $state-success-bg;
    border-left: 3px solid darken($state-success-bg, 10%);
  }
@@ -96,6 +93,7 @@ body {

  #welcome-to-diaspora { background: $orange; }

+  .md-editor,
  .block-form fieldset .form-control:focus { border-color: $input-border; }

  &.page-registrations.action-new,
--- a/app/assets/stylesheets/color_themes/_color_theme_override_origwhite.scss
+++ b/app/assets/stylesheets/color_themes/_color_theme_override_origwhite.scss
@@ -1,5 +1,5 @@
 body {
-  #main_stream .stream-element {
+  #main-stream .stream-element {
    border: 0;
    border-bottom: 1px solid $border-grey;
    margin-bottom: 10px;
--- a/app/assets/stylesheets/color_themes/dark/_style.scss
+++ b/app/assets/stylesheets/color_themes/dark/_style.scss
@@ -59,7 +59,8 @@ $dropdown-link-hover-color: $dropdown-link-color;

 //== Navbar
 $navbar-inverse-bg: $gray-darker;
-$navbar-inverse-link-hover-color: $text-color;
+$navbar-inverse-link-color: $gray-lighter;
+$navbar-inverse-link-hover-color: $white;
 $navbar-inverse-brand-hover-color: $navbar-inverse-link-hover-color;

 //== Tabs
--- a/app/assets/stylesheets/comments.scss
+++ b/app/assets/stylesheets/comments.scss
@@ -46,22 +46,40 @@

  .comment.new-comment-form-wrapper { padding-bottom: 0; }

-  .submit_button {
+  .submit-button {
    margin-top: 10px;
    input {
      float: right;
    }
    padding-left: 12px;
-    display: none;
  }
-  .comment_box {
+  .comment-box {
    height: 35px;
    resize: none;
  }
-  textarea.comment_box:focus, textarea.comment_box:valid, textarea.comment_box:active {
+  textarea.comment-box:focus, textarea.comment-box:valid, textarea.comment-box:active {
    border-color: $border-dark-grey;
-    & + .submit_button { display: block; }
-    min-height: 35px;
    box-shadow: none;
  }
+
+  .twitter-typeahead {
+    // typeahead sets this to `display: inline-block` which adds additional space between
+    // the comment textarea and the submit button.
+    // scss-lint:disable ImportantRule
+    display: block !important;
+    // scss-lint:enable ImportantRule
+  }
+}
+
+.new-comment {
+  &:not(.open) .submit-button,
+  &:not(.open) .md-header {
+    display: none;
+  }
+
+  // The rule for .md-preview is required until we switch to the newer release of bootstrap-markdown with
+  // the following commit in:
+  // https://github.com/toopay/bootstrap-markdown/commit/14a21c3837140144b27efc19c795d1a37fad70fb
+  .md-preview,
+  &.open .md-editor textarea { min-height: 70px; }
 }
--- a/app/assets/stylesheets/contacts.scss
+++ b/app/assets/stylesheets/contacts.scss
@@ -21,7 +21,7 @@
 }

 #contacts_container {
-  #people_stream.contacts {
+  #people-stream.contacts {
    .header {
      #change_aspect_name { cursor: pointer; }
      #aspect_name_form {
--- a/app/assets/stylesheets/conversations.scss
+++ b/app/assets/stylesheets/conversations.scss
@@ -65,7 +65,7 @@

    &:hover:not(.selected), &.selected {
      .subject,
-      .last_author,
+      .last-author,
      .last_message {
        color: $white;
      }
@@ -86,14 +86,14 @@
    &.unread { background-color: $background-grey; }
    &.selected { background-color: $brand-primary; }

-    .last_author, .last_message {
+    .last-author, .last_message {
      font-size: 12px;
      line-height: 15px;
      overflow: hidden;
      text-overflow: ellipsis;
      white-space: nowrap;
    }
-    .last_author { color: $text-dark-grey; }
+    .last-author { color: $text-dark-grey; }

    .message-count, .unread-message-count {
      margin-left: 3px;
@@ -148,7 +148,7 @@
    }
  }

-  .stream_container .conversation-participants {
+  .stream-container .conversation-participants {
    margin-bottom: 20px;

    .hide_conversation, .delete_conversation {
@@ -197,16 +197,14 @@
 }

 .recipients-tag-list {
+  margin: 0 -2px $form-group-margin-bottom;
+
  .conversation-recipient-tag {
    background-color: $brand-primary;
    border-radius: $btn-border-radius-base;
    display: inline-flex;
-    margin: 0 2px $form-group-margin-bottom;
-    padding: 8px;
-
-    &:first-child { margin-left: 0; }
-
-    &:last-child { margin-right: 0; }
+    margin: 0 2px;
+    padding: $btn-border-radius-base;

    div {
      align-self: center;
@@ -215,9 +213,9 @@
  }

  .avatar {
-    height: 40px;
+    height: 35px;
    margin-right: 8px;
-    width: 40px;
+    width: 35px;
  }

  .name-and-handle {
@@ -240,3 +238,9 @@
 }

 .new-conversation.form-horizontal .form-group:last-of-type { margin-bottom: 0; }
+
+// This rule is required until we switch to the newer release of bootstrap-markdown with
+// the following commit in: https://github.com/toopay/bootstrap-markdown/commit/14a21c3837140144b27efc19c795d1a37fad70fb
+.conversations-form-container .md-preview {
+  min-height: 105px;
+}
--- a/app/assets/stylesheets/footer.scss
+++ b/app/assets/stylesheets/footer.scss
@@ -5,6 +5,11 @@ html {

 body { margin-bottom: 150px; }

+.powered-by-diaspora a {
+  color: $link-grey;
+  font-weight: bold;
+}
+
 footer.footer {
  background-color: $background-grey;
  border-top: 1px solid $border-grey;
@@ -15,11 +20,6 @@ footer.footer {
  position: absolute;
  width: 100%;

-  .powered-by-diaspora {
-    color: $link-grey;
-    font-weight: bold;
-  }
-
  ul#footer_nav {
    margin: 0;
    padding: 0;
--- a/app/assets/stylesheets/header.scss
+++ b/app/assets/stylesheets/header.scss
@@ -1,68 +1,68 @@
+.not-connected-menu {
+  .navbar-left {
+    float: left;
+  }
+
+  .navbar-right,
+  .navbar-right li {
+    float: right;
+  }
+}
+
 .navbar.navbar-fixed-top {
  border-bottom: none;
  box-shadow: 1px 0 2px $black;
-  a:focus {outline: 0 none; }
+  a:focus { outline: 0 none; }
+
+  .in {
+    overflow-y: visible; // Avoid search result dropdown to be hidden
+  }

  .navbar-brand {
    font-weight: bold;
    font-size: $font-size-h3;
+    margin-left: -15px;
  }

-  @media (max-width: $grid-float-breakpoint-max) {
-    .navbar-header > .nav li { display: inline-block !important; }
-    .nav-badge {
-      color: $navbar-inverse-link-color;
-      padding-left: 12px;
-      padding-right: 12px;
-      &:hover { color: $navbar-inverse-link-hover-color; }
-      &:hover,
-      &:focus {
-        background-color: transparent;
-      }
+  .header-title {
+    margin: (($navbar-height - 32px - 2 * $navbar-padding-vertical) / 2) 0;
+
+    img {
+      height: 32px;
+      opacity: .7;
    }
-    #navbar-collapse {
-      .form-group, .twitter-typeahead  {
-        display: block !important;
-        margin-bottom: 0;
-        &, & input { width: 100% }
-      }
+
+    img:hover {
+      opacity: 1;
    }
  }
-  @media (min-width: $grid-float-breakpoint) {
-    input[type="search"] {
-      @include transition(width);
-      margin-top: 2px;
-      width: 200px;
-      &:not(.active) {
-        background-color: $navbar-inverse-bg;
-        border-color: $gray-light;
-        width: 150px;
-      }
-    }
-    #user_menu {
-      &.open .dropdown-toggle { background-color: darken($navbar-inverse-bg, 7%); }
-      .dropdown-toggle {
-        margin: 0 1px;
-        min-width: 160px;
-      }
-      .dropdown-menu {
-        background-color: darken($navbar-inverse-bg, 7%);
-        border-top: none;
-        width: 100%;
-        & > li > a {
-          color: $gray-light;
-          padding-left: 55px;
-          &:hover {
-            background-color: $brand-primary;
-            color: $gray-lighter;
-          }
-        }
-      }
+
+  .navbar-header > ul,
+  .navbar-header > ul li {
+    float: left;
+  }
+
+  [class^="entypo-"],
+  [class*="entypo-"] {
+    color: inherit;
+    font-size: $font-size-h3;
+    vertical-align: middle;
+  }
+
+  .nav-badge {
+    padding: $navbar-padding-vertical 12px;
+
+    .badge {
+      position: absolute;
+      right: 10px;
+      top: 10px;
    }
  }

  .navbar-nav:not(.nav-badges) > li > a { font-weight: bold; }
  .nav-badges {
+    margin: 0;
+
    li { height: $navbar-height; }
    .dropdown-open {
      background-color: $dropdown-bg;
@@ -94,7 +94,7 @@
          margin-right: 10px;
          opacity: 1;
        }
-        & > .pull-right > .aspect_membership_dropdown { display: none; }
+        & > .pull-right > .aspect-membership-dropdown { display: none; }
      }
      .ajax-loader {
        border-bottom: 1px solid $border-grey;
@@ -118,31 +118,141 @@
      }
    }
  }
-  [class^="entypo-"], [class*="entypo-"] {
-    color: inherit;
-    font-size: $font-size-h3;
-    vertical-align: middle;
-  }
-  .nav-badge {
-    margin-bottom: -2px;
-    .badge {
-      position: absolute;
-      right: 10px;
-      top: 10px;
-    }
+
+  .user-menu-dropdown {
+    padding: 0;
  }

-  #user_menu {
+  .user-avatar {
+    height: $navbar-height;
+    margin-bottom: -$navbar-padding-vertical;
+    margin-right: 10px;
+    margin-top: -$navbar-padding-vertical;
+    padding: ($navbar-height - 30px) / 2 0;
+
    .avatar {
      height: 30px;
      width: 30px;
    }
-    .user-avatar {
-      height: $navbar-height;
-      padding: ($navbar-height - 30px)/2 0;
-      margin-bottom: -$navbar-padding-vertical;
-      margin-top: -$navbar-padding-vertical;
-      margin-right: 10px;
+  }
+
+  .navbar-form .form-control { display: inline-block; }
+
+  @media (max-width: $grid-float-breakpoint-max) {
+
+    .navbar-nav.hidden-xs {
+      margin: 0;
+
+      a {
+        padding-bottom: $navbar-padding-vertical;
+        padding-top: $navbar-padding-vertical;
+      }
+    }
+
+    .nav-badge {
+      color: $navbar-inverse-link-color;
+      &:hover { color: $navbar-inverse-link-hover-color; }
+      &:hover,
+      &:focus {
+        background-color: transparent;
+      }
+    }
+
+    .form-group,
+    .twitter-typeahead {
+      margin-bottom: 0;
+
+      &,
+      input { width: 100%; }
+    }
+
+    .nav-badges .dropdown-menu {
+      width: 300px;
+    }
+
+    .navbar-collapse {
+      padding-top: $navbar-padding-vertical / 2;
+
+      .navbar-nav {
+        margin-bottom: 0;
+        margin-top: 0;
+      }
+    }
+
+    .user-menu-dropdown {
+      background-color: transparent;
+      border: 0;
+      box-shadow: none;
+      display: block;
+      padding: 0;
+      position: static;
+      width: 100%;
+
+      a {
+        color: $navbar-inverse-link-color;
+        font-weight: bold;
+        padding: $nav-link-padding;
+
+        &:hover {
+          background-color: $navbar-inverse-link-hover-bg;
+          color: $navbar-inverse-link-hover-color;
+        }
+      }
+    }
+  }
+
+  @media (min-width: $grid-float-breakpoint) {
+
+    .navbar-form { // set correct margin for small inputs
+      margin-bottom: ($navbar-height - $input-height-small) / 2;
+      margin-top: ($navbar-height - $input-height-small) / 2;
+    }
+
+    [type="search"] {
+      @include transition(width);
+      width: 200px;
+
+      &:not(.active) {
+        background-color: $navbar-inverse-bg;
+        border-color: $gray-light;
+        width: 150px;
+      }
+    }
+
+    .user-menu {
+      &.open .dropdown-toggle { background-color: darken($navbar-inverse-bg, 7%); }
+      .dropdown-toggle {
+        margin: 0 1px;
+        min-width: 160px;
+      }
+    }
+
+    .user-menu-dropdown {
+      background-color: darken($navbar-inverse-bg, 7%);
+      border-top: 0;
+      width: 100%;
+
+      a {
+        color: $navbar-inverse-link-color;
+        padding-left: 55px;
+
+        &:hover {
+          background-color: $list-group-hover-bg;
+          color: $list-group-link-hover-color;
+        }
+      }
+
+      li:last-child a {
+        padding-bottom: 6px;
+      }
+    }
+  }
+
+  @media (max-width: $screen-xs-max) {
+    .nav-badges .dropdown-menu {
+      position: fixed;
+      top: $navbar-height;
+      width: 100%;
    }
  }
 }
--- a/app/assets/stylesheets/hovercard.scss
+++ b/app/assets/stylesheets/hovercard.scss
@@ -12,16 +12,10 @@
  font-size: small;

  .avatar {
-    position: relative;
    float: left;
-    height: 70px !important;
-    width: 70px !important;
-    top: 0 !important;
-
-    margin: {
-      right: 10px;
-      left: 0;
-    }
+    height: 70px;
+    object-fit: cover;
+    width: 70px;
  }

  $image_width: 80px; /* including margin */
@@ -65,7 +59,7 @@
    margin-bottom: 5px;
  }

-  .btn-group.aspect_membership_dropdown { margin: 0 !important; }
+  .btn-group.aspect-membership-dropdown { margin: 0 !important; }
 }

 #hovercard_container {
--- a/app/assets/stylesheets/interactions.scss
+++ b/app/assets/stylesheets/interactions.scss
@@ -22,7 +22,7 @@
  }
 }

-.stream_container,
+.stream-container,
 .single-post-interactions {
  .control-icons {
    float: right;
--- a/app/assets/stylesheets/markdown-content.scss
+++ b/app/assets/stylesheets/markdown-content.scss
@@ -3,8 +3,9 @@
  p:last-child { margin-bottom: 0; }

  ul, ol {
-    margin-top:0.8em;
-    margin-bottom:0.8em;
+    margin-bottom: .8em;
+    margin-top: .8em;
+    li { margin-bottom: .5em; }
    &:first-child { margin-top: 0; }
    &:last-child { margin-bottom: 0; }
  }
--- a/app/assets/stylesheets/markdown-editor.scss
+++ b/app/assets/stylesheets/markdown-editor.scss
@@ -1,3 +1,18 @@
+.md-editor {
+  border: 1px solid $border-grey;
+  border-radius: $border-radius-small;
+  overflow: hidden;
+
+  &.active { border: 1px solid $border-dark-grey; }
+
+  textarea,
+  textarea:focus {
+    border: 0;
+    box-shadow: none;
+    margin: 0;
+  }
+}
+
 .md-footer,
 .md-header {
  background: $white;
@@ -27,6 +42,7 @@

  .btn-group {
    margin-bottom: 8px;
+    &:first-child { margin-left: 0; }

    [class^="entypo-"],
    [class*="entypo-"] {
@@ -77,13 +93,11 @@


 .md-preview {
-  background: $white;
  color: $text-color;
  // !important is needed to override the CSS rules dynamically added to the element
  // scss-lint:disable ImportantRule
  height: auto !important;
  // scss-lint:enable ImportantRule
-  min-height: 90px;
  overflow: auto;
  position: relative;
  // !important is needed to override the CSS rules dynamically added to the element
@@ -91,6 +105,8 @@
  width: 100% !important;
  // scss-lint:enable ImportantRule
  z-index: 10;
+
+  .preview-content { padding: 10px; }
 }

 .md-controls {
--- a/app/assets/stylesheets/media-embed.scss
+++ b/app/assets/stylesheets/media-embed.scss
@@ -0,0 +1,21 @@
+$stub-bg-color: #ddd;
+
+.media-embed {
+  margin-top: 5px;
+
+  .thumb {
+    @include video-overlay;
+
+    background-color: $stub-bg-color;
+
+    video {
+      min-height: 60%;
+      vertical-align: middle;
+      width: 100%;
+    }
+  }
+
+  audio {
+    width: 100%;
+  }
+}
--- a/app/assets/stylesheets/mentions.scss
+++ b/app/assets/stylesheets/mentions.scss
@@ -1,91 +0,0 @@
-.mentions-input-box {
-  border-radius: 3px;
-
-  background: #fff;
-  position: relative;
-
-  textarea {
-    display: block;
-    background: transparent;
-    border: 1px solid #dcdcdc;
-    border-radius: 3px;
-    outline: 0;
-    overflow: hidden;
-    position: relative;
-    resize: none;
-    width: 100%;
-
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-  }
-
-  .form-control[disabled] { background-color: transparent; }
-
-  .mentions-autocomplete-list {
-    background: white;
-    display: none;
-    left: 0;
-    margin-left: -1px;
-    position: absolute;
-    right: 0;
-    z-index: 10000;
-
-    ul {
-      border: 1px solid $border-dark-grey;
-      margin: 0;
-      padding: 0;
-
-      border-radius: 0px 0px 5px 5px;
-
-      li {
-        color: #444;
-        background: white;
-        border-bottom: 1px solid #ccc;
-        cursor: pointer;
-        font-size: 15px;
-        height: 26px;
-        line-height: 26px;
-        list-style: none;
-        margin: 0;
-        overflow: hidden;
-        padding: 5px;
-        white-space: nowrap;
-
-        &:hover, &.active { background: $background-grey; }
-        &:last-child { border-radius: 0px 0px 5px 5px; }
-
-        img, div.icon {
-          float: left;
-          height: 25px;
-          margin-right: 5px;
-          width: 25px;
-        }
-      }
-    }
-  }
-
-  .mentions-box {
-    position: absolute;
-    right: 0px;
-    bottom: 0px;
-    left: 0px;
-    top: 0px;
-    padding: $padding-base-vertical $padding-base-horizontal;
-  }
-
-  .mentions {
-    color: transparent;
-    font-size: $font-size-base;
-    font-family: Arial, Helvetica, sans-serif;
-    overflow: hidden;
-    width: 100%;
-    white-space: pre-wrap;
-    word-wrap: break-word;
-
-    > strong {
-      background: $background-blue;
-      font-weight: normal;
-    }
-  }
-}
--- a/app/assets/stylesheets/mobile/comments.scss
+++ b/app/assets/stylesheets/mobile/comments.scss
@@ -43,16 +43,15 @@
    display: flex;

    .count {
+      color: $text-color;
+      font-family: $font-family-base;
+      font-size: $font-size-base;
      line-height: 22px;
      margin-left: 5px;
+      vertical-align: top;
      z-index: 2;
    }

-    .icon-count-group {
-      display: flex;
-      margin: 0 7px;
-    }
-
    [class^="entypo"] {
      color: $text-grey;
      font-size: 24px;
@@ -73,6 +72,9 @@
  }

  .post-action {
+    display: flex;
+    margin: 0 7px;
+
    .disabled { color: $medium-gray; }
  }

--- a/app/assets/stylesheets/mobile/header.scss
+++ b/app/assets/stylesheets/mobile/header.scss
@@ -33,10 +33,15 @@ $mobile-navbar-height: 46px;
    li { float: left; }
  }

-  #header-title {
+  .header-title {
    padding: 7px 15px;
    margin: 0 0 0 -15px;
    height: $mobile-navbar-height;
+
+    img {
+      height: 30px;
+      width: 30px;
+    }
  }

  #nav-badges {
@@ -87,12 +92,6 @@ $mobile-navbar-height: 46px;
      background-color: $red;
    }
  }
-  #header-title{
-    img {
-      height: 30px;
-      width: 30px;
-    }
-  }
 }

 #drawer {
--- a/app/assets/stylesheets/mobile/markdown_editor.scss
+++ b/app/assets/stylesheets/mobile/markdown_editor.scss
@@ -0,0 +1,6 @@
+.md-editor {
+  border: 1px solid $light-grey;
+  border-radius: $btn-border-radius-base;
+
+  &.active { border-color: $text-grey; }
+}
--- a/app/assets/stylesheets/mobile/mobile.scss
+++ b/app/assets/stylesheets/mobile/mobile.scss
@@ -16,6 +16,8 @@
@import "mobile/stream_element";
@import "mobile/comments";
@import 'mobile/openid_connect_error_page';
+@import 'markdown-editor';
+@import 'mobile/markdown_editor';

@import 'typography';

@@ -42,8 +44,6 @@ h3 {  margin-top: 0; }
 .clear { clear: both; }
 #main { padding: 56px 10px 0 10px; }

-textarea { resize: vertical; }
-
 .avatar {
  border-radius: 4px;
 }
@@ -55,7 +55,6 @@ textarea { resize: vertical; }
  overflow: auto;
  position: relative;
  text-align: left;
-  min-height: 34px;
  padding: 10px 0 0 0;
  list-style: none;

@@ -84,7 +83,7 @@ textarea { resize: vertical; }

  > .content, .reshare > .content { padding: 6px; }
  .info{ margin-top: 0; }
-  .photo_attachments{ margin-top: 6px; }
+  .photo-attachments{ margin-top: 6px; }
  .timeago{ font-weight: normal; }
 }

@@ -173,7 +172,7 @@ footer {
    padding: 0;
  }

-  .photo_attachments {
+  .photo-attachments {
    border-radius: 3px 3px 0 0;

    border: {
@@ -195,7 +194,7 @@ footer {
  }
 }

-.photo_attachments {
+.photo-attachments {
  position: relative;
  left: 0;
  top: 0;
@@ -207,7 +206,7 @@ footer {
    padding: 0; } }


-#main_stream {
+#main-stream {
  .from {
    white-space: nowrap;
    overflow: hidden;
@@ -404,11 +403,6 @@ footer {
  .counter {
    font-size: 14px;
  }
-
-  textarea {
-    min-width: 100%;
-    max-width: 100%;
-  }
 }

 select {
@@ -492,7 +486,7 @@ select {
  margin-bottom: 5px;
 }

-.last_author {
+.last-author {
  position: relative;
  margin: 10px 10px 2px;
  float: right;
@@ -539,13 +533,6 @@ form#new_conversation.new_conversation {
  }
 }

-textarea#conversation_text {
-  font-size: larger;
-  width: 100%;
-  min-width: 100%;
-  max-width: 100%;
-}
-
 .registrations_error,
 .registrations_notice {
  color: #DF0101;
@@ -625,20 +612,6 @@ h1.session {
  font-weight: 200;
 }

-form p.checkbox_select {
-  position: relative;
-  label {
-    left: 25px;
-    top: 4px;
-    position: absolute;
-    font-size: 1em;
-  }
-  img {
-    position: relative;
-    top: 6px;
-  }
-}
-
 #profile_photo_upload {
  margin-top: 5px;
  min-height: 100px;
@@ -721,40 +694,13 @@ select#aspect_ids_ {
  .entypo-camera { margin-right: 0; }
 }

-#publisher_textarea_wrapper {
+#publisher-textarea-wrapper {
  border-radius: 2px;
  margin: 12px 0px;
  background: $framed-background;
  position: relative;
  padding-right: 10px;

-  #hide_publisher  {
-    opacity: 0.3;
-    z-index: 5;
-    padding: 3px;
-    position: absolute;
-    right: 6px;
-    top: 0;
-
-    &:hover {
-      opacity: 1;
-    }
-  }
-
-  &.active {
-    border: 1px solid $border-dark-grey;
-  }
-
-  textarea {
-    z-index: 2;
-    border: none;
-
-    &:focus {
-      outline: 0;
-      background: transparent;
-    }
-  }
-
  &.with_attachments {
    padding-bottom: 55px;
    border: 1px solid $border-medium-grey;
@@ -899,3 +845,9 @@ select#aspect_ids_ {
 .form-control:active, .form-control:focus { border-color: #999999; }

 .tag_following_action { margin: 5px 0 10px 0; }
+
+// --- Admin pages ---
+.pod-version {
+  // The fetching of the pod version is not done on mobile currently so we hide this alert.
+  display: none;
+}
--- a/app/assets/stylesheets/navbar_left.scss
+++ b/app/assets/stylesheets/navbar_left.scss
@@ -30,16 +30,14 @@
    }
  }

-  .all-aspects .hoverable.selected,
-  .followed-tags-sidebar .hoverable.selected,
+  .nested-list .hoverable.selected,
  .selected > .hoverable {
    color: $white;
    background: $gray;
    border-color: $gray;
  }

-  .all-aspects ul,
-  .followed-tags-sidebar ul {
+  .nested-list ul {
    background: $left-navbar-drawer-background;
    li { padding: 0; }
    .entypo-check { visibility: hidden; }
@@ -59,6 +57,16 @@
    .hoverable:hover > .action { visibility: visible; }
  }

+  .my-activity {
+    ul {
+      display: none;
+    }
+
+    &.activity-stream-selected ul {
+      display: block;
+    }
+  }
+
  #tags_list {
    #new_tag_following {
      padding: 10px 20px 10px 30px;
@@ -106,13 +114,15 @@
  padding: 10px 20px 0;

  .excellence-box,
-  .info-links {
+  .info-links,
+  .powered-box {
    border-top: 1px solid $border-grey;
    padding: 5px;
  }

  .excellence-box {
    margin-top: 10px;
+    text-align: center;

    .content {
      font-size: $font-size-base;
@@ -167,7 +177,6 @@

    ul {
      list-style: none;
-      margin-bottom: 5px;
      padding-left: 0;
    }

--- a/app/assets/stylesheets/notifications.scss
+++ b/app/assets/stylesheets/notifications.scss
@@ -96,6 +96,6 @@
      opacity: 0;
    }

-    .btn-group.aspect_membership_dropdown { margin: 5px 0; }
+    .btn-group.aspect-membership-dropdown { margin: 5px 0; }
  }
 }
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .3
 .4