-
- Downloads
Merge branch 'develop' of https://github.com/matthias-brun/Rocket.Chat into matthias-brun-develop
# Conflicts: # i18n/en.i18n.json # packages/rocketchat-channel-settings/client/views/channelSettings.coffee # packages/rocketchat-channel-settings/client/views/channelSettings.html # server/methods/unarchiveRoom.coffee # server/startup/roomPublishes.coffee
Showing
- i18n/en.i18n.json 9 additions, 2 deletionsi18n/en.i18n.json
- packages/rocketchat-channel-settings/client/views/channelSettings.coffee 16 additions, 19 deletions...chat-channel-settings/client/views/channelSettings.coffee
- packages/rocketchat-channel-settings/client/views/channelSettings.html 21 additions, 0 deletions...etchat-channel-settings/client/views/channelSettings.html
- packages/rocketchat-lib/server/models/Rooms.coffee 11 additions, 0 deletionspackages/rocketchat-lib/server/models/Rooms.coffee
- packages/rocketchat-lib/server/models/Subscriptions.coffee 1 addition, 1 deletionpackages/rocketchat-lib/server/models/Subscriptions.coffee
- packages/rocketchat-ui-sidenav/side-nav/createChannelFlex.coffee 3 additions, 0 deletions...s/rocketchat-ui-sidenav/side-nav/createChannelFlex.coffee
- packages/rocketchat-ui-sidenav/side-nav/createChannelFlex.html 6 additions, 0 deletions...ges/rocketchat-ui-sidenav/side-nav/createChannelFlex.html
- packages/rocketchat-ui-sidenav/side-nav/listPrivateGroupsFlex.coffee 1 addition, 1 deletion...cketchat-ui-sidenav/side-nav/listPrivateGroupsFlex.coffee
- packages/rocketchat-ui-sidenav/side-nav/privateGroupsFlex.coffee 3 additions, 0 deletions...s/rocketchat-ui-sidenav/side-nav/privateGroupsFlex.coffee
- packages/rocketchat-ui-sidenav/side-nav/privateGroupsFlex.html 6 additions, 0 deletions...ges/rocketchat-ui-sidenav/side-nav/privateGroupsFlex.html
- packages/rocketchat-ui/views/app/privateHistory.coffee 8 additions, 1 deletionpackages/rocketchat-ui/views/app/privateHistory.coffee
- packages/rocketchat-ui/views/app/privateHistory.html 23 additions, 0 deletionspackages/rocketchat-ui/views/app/privateHistory.html
- server/methods/channelsList.coffee 1 addition, 1 deletionserver/methods/channelsList.coffee
- server/methods/createChannel.coffee 4 additions, 1 deletionserver/methods/createChannel.coffee
- server/methods/createPrivateGroup.coffee 4 additions, 1 deletionserver/methods/createPrivateGroup.coffee
- server/methods/unarchiveRoom.coffee 2 additions, 2 deletionsserver/methods/unarchiveRoom.coffee
- server/publications/subscription.coffee 1 addition, 0 deletionsserver/publications/subscription.coffee
- server/startup/roomPublishes.coffee 2 additions, 0 deletionsserver/startup/roomPublishes.coffee
Loading
Please register or sign in to comment