Merge branch 'develop' into groups-updates
* develop: Updated status component to use properStatus when going to status page Added floating action button to ui/index Removed floating action button from columns area Fix issue with notification badge number not showing on mobile Updated scrollable_list to use documentElement for (primary/only) scrolling functionality Added onScroll props to status_list Added timeline scrollTop action, added to status_list_container, scrollable_list Removed unnecessary scrollContainer in status, account_gallery Added missing isLoading prop to ScrollableList Updated scrollable_list intersectionObserverWrapper Updated floatingActionButton to only show if someone is logged in Updated timeline_queue_button_header Removed focus of compose/cw after submit or spoiler change Removed set height of 100% on body Removed unused redirect after compose submit Patch Fix for hidden poll choices and results on light theme. Updated notification badge number formatter Fixed status/repost functionality to show status if owned by given username admin tool for editing pro status of accounts
This commit is contained in:
@@ -155,8 +155,6 @@ export function submitCompose(routerHistory, group) {
|
||||
}).then(function (response) {
|
||||
if (response.data.visibility === 'direct' && getState().getIn(['conversations', 'mounted']) <= 0 && routerHistory) {
|
||||
routerHistory.push('/messages');
|
||||
} else if (routerHistory && routerHistory.location.pathname === '/posts/new' && window.history.state) {
|
||||
routerHistory.goBack();
|
||||
}
|
||||
|
||||
dispatch(insertIntoTagHistory(response.data.tags, status));
|
||||
|
||||
@@ -7,6 +7,7 @@ export const TIMELINE_DELETE = 'TIMELINE_DELETE';
|
||||
export const TIMELINE_CLEAR = 'TIMELINE_CLEAR';
|
||||
export const TIMELINE_UPDATE_QUEUE = 'TIMELINE_UPDATE_QUEUE';
|
||||
export const TIMELINE_DEQUEUE = 'TIMELINE_DEQUEUE';
|
||||
export const TIMELINE_SCROLL_TOP = 'TIMELINE_SCROLL_TOP';
|
||||
|
||||
export const TIMELINE_EXPAND_REQUEST = 'TIMELINE_EXPAND_REQUEST';
|
||||
export const TIMELINE_EXPAND_SUCCESS = 'TIMELINE_EXPAND_SUCCESS';
|
||||
@@ -210,3 +211,11 @@ export function disconnectTimeline(timeline) {
|
||||
timeline,
|
||||
};
|
||||
};
|
||||
|
||||
export function scrollTopTimeline(timeline, top) {
|
||||
return {
|
||||
type: TIMELINE_SCROLL_TOP,
|
||||
timeline,
|
||||
top,
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user