Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma-fe
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

4ba4772e

Commit 4ba4772e authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'cw-clickthrough' into 'develop'

Add support for configurable CW clickthrough

See merge request pleroma/pleroma-fe!310

parents 9982376f 3ec8e43a

Branches

Tags

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/components/settings/settings.js 4 additions, 0 deletions

src/components/settings/settings.js
src/components/settings/settings.vue 4 additions, 0 deletions

src/components/settings/settings.vue
src/components/status/status.js 39 additions, 13 deletions

src/components/status/status.js
src/components/status/status.vue 6 additions, 4 deletions

src/components/status/status.vue
src/i18n/messages.js 1 addition, 0 deletions

src/i18n/messages.js
src/main.js 3 additions, 1 deletion

src/main.js
src/modules/config.js 1 addition, 0 deletions

src/modules/config.js
static/config.json 2 additions, 1 deletion

static/config.json

with 60 additions and 19 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