Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in / Register
Toggle navigation
sinblr
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Security & Compliance
Security & Compliance
Dependency List
Packages
Packages
List
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sinblr.com
sinblr
Commits
c7c8dc03
Commit
c7c8dc03
authored
Nov 29, 2019
by
Sander Snel
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'upstream/master'
parents
76d2573c
93b8aec7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
3 deletions
+25
-3
app/javascript/flavours/glitch/features/ui/index.js
app/javascript/flavours/glitch/features/ui/index.js
+16
-2
app/javascript/flavours/glitch/styles/components/index.scss
app/javascript/flavours/glitch/styles/components/index.scss
+8
-0
app/models/user.rb
app/models/user.rb
+1
-1
No files found.
app/javascript/flavours/glitch/features/ui/index.js
View file @
c7c8dc03
...
...
@@ -15,6 +15,7 @@ import { clearHeight } from 'flavours/glitch/actions/height_cache';
import
{
submitMarkers
}
from
'
flavours/glitch/actions/markers
'
;
import
{
WrappedSwitch
,
WrappedRoute
}
from
'
flavours/glitch/util/react_router_helpers
'
;
import
UploadArea
from
'
./components/upload_area
'
;
import
PermaLink
from
'
flavours/glitch/components/permalink
'
;
import
ColumnsAreaContainer
from
'
./containers/columns_area_container
'
;
import
classNames
from
'
classnames
'
;
import
Favico
from
'
favico.js
'
;
...
...
@@ -51,7 +52,7 @@ import {
}
from
'
flavours/glitch/util/async-components
'
;
import
{
HotKeys
}
from
'
react-hotkeys
'
;
import
{
me
}
from
'
flavours/glitch/util/initial_state
'
;
import
{
defineMessages
,
injectIntl
}
from
'
react-intl
'
;
import
{
defineMessages
,
FormattedMessage
,
injectIntl
}
from
'
react-intl
'
;
// Dummy import, to make sure that <Status /> ends up in the application bundle.
// Without this it ends up in ~8 very commonly used bundles.
...
...
@@ -72,6 +73,7 @@ const mapStateToProps = state => ({
unreadNotifications
:
state
.
getIn
([
'
notifications
'
,
'
unread
'
]),
showFaviconBadge
:
state
.
getIn
([
'
local_settings
'
,
'
notifications
'
,
'
favicon_badge
'
]),
hicolorPrivacyIcons
:
state
.
getIn
([
'
local_settings
'
,
'
hicolor_privacy_icons
'
]),
moved
:
state
.
getIn
([
'
accounts
'
,
me
,
'
moved
'
])
&&
state
.
getIn
([
'
accounts
'
,
state
.
getIn
([
'
accounts
'
,
me
,
'
moved
'
])]),
});
const
keyMap
=
{
...
...
@@ -254,6 +256,7 @@ class UI extends React.Component {
dropdownMenuIsOpen
:
PropTypes
.
bool
,
unreadNotifications
:
PropTypes
.
number
,
showFaviconBadge
:
PropTypes
.
bool
,
moved
:
PropTypes
.
map
,
};
state
=
{
...
...
@@ -539,7 +542,7 @@ class UI extends React.Component {
render
()
{
const
{
draggingOver
}
=
this
.
state
;
const
{
children
,
layout
,
isWide
,
navbarUnder
,
location
,
dropdownMenuIsOpen
}
=
this
.
props
;
const
{
children
,
layout
,
isWide
,
navbarUnder
,
location
,
dropdownMenuIsOpen
,
moved
}
=
this
.
props
;
const
columnsClass
=
layout
=>
{
switch
(
layout
)
{
...
...
@@ -583,6 +586,17 @@ class UI extends React.Component {
return
(
<
HotKeys
keyMap
=
{
keyMap
}
handlers
=
{
handlers
}
ref
=
{
this
.
setHotkeysRef
}
attach
=
{
window
}
focused
>
<
div
className
=
{
className
}
ref
=
{
this
.
setRef
}
style
=
{{
pointerEvents
:
dropdownMenuIsOpen
?
'
none
'
:
null
}}
>
{
moved
&&
(
<
div
className
=
'
flash-message alert
'
>
<
FormattedMessage
id
=
'
moved_to_warning
'
defaultMessage
=
'
This account is marked as moved to {moved_to_link}, and may thus not accept new follows.
'
values
=
{{
moved_to_link
:
(
<
PermaLink
href
=
{
moved
.
get
(
'
url
'
)}
to
=
{
`/accounts/
${
moved
.
get
(
'
id
'
)}
`
}
>
@{
moved
.
get
(
'
acct
'
)}
<
/PermaLink
>
)}}
/
>
<
/div>
)
}
<
SwitchingColumnsArea
location
=
{
location
}
layout
=
{
layout
}
navbarUnder
=
{
navbarUnder
}
onLayoutChange
=
{
this
.
handleLayoutChange
}
>
{
children
}
<
/SwitchingColumnsArea
>
...
...
app/javascript/flavours/glitch/styles/components/index.scss
View file @
c7c8dc03
...
...
@@ -1556,6 +1556,14 @@
}
}
.ui
.flash-message
{
margin-top
:
10px
;
margin-left
:
auto
;
margin-right
:
auto
;
margin-bottom
:
0
;
min-width
:
75%
;
}
::-webkit-scrollbar-thumb
{
border-radius
:
0
;
}
...
...
app/models/user.rb
View file @
c7c8dc03
...
...
@@ -169,7 +169,7 @@ class User < ApplicationRecord
end
def
functional?
confirmed?
&&
approved?
&&
!
disabled?
&&
!
account
.
suspended?
&&
account
.
moved_to_account_id
.
nil?
confirmed?
&&
approved?
&&
!
disabled?
&&
!
account
.
suspended?
end
def
unconfirmed_or_pending?
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment