Henry Jameson 81c83566cd Merge remote-tracking branch 'upstream/develop' into user-profile-overhault ... * 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 ...		2018-12-18 22:43:26 +03:00
..
api.js	cleanup, updated broken favorites look + localization strings	2018-08-16 13:41:45 +03:00
chat.js	Show chat only if channel is joined.	2018-02-01 19:18:47 +02:00
config.js	Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into feature/push-subscriptions	2018-12-13 18:22:15 +07:00
errors.js	Use Array.reduce instead of lodash.reduce	2018-12-05 13:44:12 +04:00
instance.js	Merge branch 'develop' into feature/new-user-routes	2018-12-17 02:39:37 +03:00
interface.js	Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into feature/push-subscriptions	2018-12-13 18:22:15 +07:00
oauth.js	Move login to oauth.	2018-10-26 15:16:23 +02:00
statuses.js	Refactor follower/friends out of statuses/timeline into user_profile where it	2018-12-17 19:14:38 +03:00
users.js	Merge remote-tracking branch 'upstream/develop' into user-profile-overhault	2018-12-17 19:18:35 +03:00