Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

pleroma-fe
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

14878976

Commit 14878976 authored 4 years ago by Shpuld Shpludson

Downloads
- Plain Diff

Merge branch 'fix/chat-misc-fixes' into 'develop'

Misc Chat fixes

See merge request !1265

parents 40ce3a9b 3ead79dd

No related branches found

No related tags found

2 merge requests!1278Merge develop into master for 2.2.0,!1265Misc Chat fixes

Pipeline #32448 passed 4 years ago

Stage: lint

Stage: build

Stage: test

Stage: deploy

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 2 additions, 0 deletions

CHANGELOG.md
src/components/chat/chat.js 11 additions, 4 deletions

src/components/chat/chat.js
src/components/chat/chat.scss 6 additions, 4 deletions

src/components/chat/chat.scss
src/components/chat_new/chat_new.scss 4 additions, 2 deletions

src/components/chat_new/chat_new.scss
src/services/chat_utils/chat_utils.js 1 addition, 1 deletion

src/services/chat_utils/chat_utils.js
src/services/promise_interval/promise_interval.js 8 additions, 1 deletion

src/services/promise_interval/promise_interval.js

with 32 additions and 12 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment