* upstream/develop: (38 commits)
Feature/bigger icons for mobile / #211
Fix oauth url
clean up the unused stuff
Make user profile page cleaner
missing string and unification with counters (order)
collateral fix for tab display
collateral fixes for user-card: use still-image, styles for custom emoji
Refactor follower/friends out of statuses/timeline into user_profile where it belongs. Changed display of profile to single panel with tabs.
Redirect to /main/all
Move userProfile link to methods
Fix user profile test
Add temporary redirects
Add local profile test
Fix style
Add a way to get new captcha on click
Fix style
Separate captcha into the backendInteractor
more visual fixes
changed bottom-shadow hiding method to be more compatible with overflow
small fix for overflowing tab-switcher
...
* upstream/develop: (24 commits)
Feature/bigger icons for mobile / #211
Fix oauth url
Make user profile page cleaner
Redirect to /main/all
Move userProfile link to methods
Fix user profile test
Add temporary redirects
Add local profile test
Implement user_profile.spec.js
Use babel polyfill in karma
Use 'userProfileLink' to generate user-profile link
Rollback disableDotRule
Use "-1" in indexOf
Add generateProfileLink
Use "~" as a route namespace symbol
Disable dot rule
Pass userName instead of userId
Typo in tests
Fix redirect paths
Fix typo
...
* upstream/develop:
Fix style
Add a way to get new captcha on click
Fix style
Separate captcha into the backendInteractor
more visual fixes
changed bottom-shadow hiding method to be more compatible with overflow
small fix for overflowing tab-switcher
Support disabling captcha
Base support for CAPTCHA (kocaptcha)
* upstream/develop:
oof
slightly changed the code to have less mutations, added comments
more damage control
fix chrome
Prevent html-minifier to remove placeholder comment in index.html template
Add placeholder to insert server generated metatags. Related to #430
Added support for async following including delayed confirmation if we followed user or not
search button for user finder
hide logo when opening search bar on small screens
