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
..
assets	Make nsfw image easier to understand.	2018-05-16 13:01:17 +02:00
boot	Feature/bigger icons for mobile / #211	2018-12-18 18:26:14 +00:00
components	Merge remote-tracking branch 'upstream/develop' into user-profile-overhault	2018-12-18 22:43:26 +03:00
i18n	Merge remote-tracking branch 'upstream/develop' into async_follow	2018-12-14 17:17:58 +03:00
lib	Merge remote-tracking branch 'upstream/develop' into feature/theming2	2018-11-26 05:21:58 +03:00
modules	Merge remote-tracking branch 'upstream/develop' into user-profile-overhault	2018-12-18 22:43:26 +03:00
services	Merge branch 'feature/new-user-routes' into 'develop'	2018-12-18 15:26:00 +00:00
_variables.scss	checkbox radius	2018-11-23 07:28:53 +03:00
App.js	Merge remote-tracking branch 'upstream/develop' into search-mobile-fixes	2018-12-14 17:10:26 +03:00
App.scss	Feature/bigger icons for mobile / #211	2018-12-18 18:26:14 +00:00
App.vue	Feature/bigger icons for mobile / #211	2018-12-18 18:26:14 +00:00
main.js	fix old MR	2018-12-13 20:25:46 +03:00
sw.js	add checkbox to disable web push	2018-12-13 00:03:50 +07:00