Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

9e043332

Commit 9e043332 authored 9 years ago by Gabriel Engel

Downloads
- Plain Diff

Merge pull request #1689 from RocketChat/improvements/settings

Add option to disable setting based in other setting and another improvements

parents 44b1e424 2ed257fc

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

packages/rocketchat-lib/server/functions/settings.coffee 3 additions, 0 deletions

packages/rocketchat-lib/server/functions/settings.coffee
packages/rocketchat-lib/server/startup/settings.coffee 23 additions, 17 deletions

packages/rocketchat-lib/server/startup/settings.coffee
packages/rocketchat-theme/assets/stylesheets/base.less 6 additions, 0 deletions

packages/rocketchat-theme/assets/stylesheets/base.less
packages/rocketchat-ui-admin/admin/admin.coffee 70 additions, 24 deletions

packages/rocketchat-ui-admin/admin/admin.coffee
packages/rocketchat-ui-admin/admin/admin.html 15 additions, 10 deletions

packages/rocketchat-ui-admin/admin/admin.html

with 117 additions and 51 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