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 ...
This commit is contained in:
commit
81c83566cd
40 changed files with 1855 additions and 789 deletions
|
@ -12,8 +12,8 @@ const defaultState = {
|
|||
logo: '/static/logo.png',
|
||||
logoMask: true,
|
||||
logoMargin: '.2em',
|
||||
redirectRootNoLogin: '/main/all',
|
||||
redirectRootLogin: '/main/friends',
|
||||
redirectRootNoLogin: '/~/main/all',
|
||||
redirectRootLogin: '/~/main/friends',
|
||||
showInstanceSpecificPanel: false,
|
||||
scopeOptionsEnabled: true,
|
||||
formattingOptionsEnabled: false,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue