Merge remote-tracking branch 'origin/develop' into release-candidate
Showing
- app/api/server/v1/channels.js 1 addition, 1 deletionapp/api/server/v1/channels.js
- app/api/server/v1/groups.js 1 addition, 1 deletionapp/api/server/v1/groups.js
- app/api/server/v1/im.js 1 addition, 1 deletionapp/api/server/v1/im.js
- app/api/server/v1/users.js 2 additions, 2 deletionsapp/api/server/v1/users.js
- app/lib/lib/roomTypes/direct.js 6 additions, 5 deletionsapp/lib/lib/roomTypes/direct.js
- app/lib/server/functions/getStatusText.js 19 additions, 0 deletionsapp/lib/server/functions/getStatusText.js
- app/lib/server/functions/index.js 2 additions, 1 deletionapp/lib/server/functions/index.js
- app/lib/server/functions/saveUser.js 2 additions, 2 deletionsapp/lib/server/functions/saveUser.js
- app/lib/server/functions/setStatusText.js 53 additions, 0 deletionsapp/lib/server/functions/setStatusText.js
- app/slashcommands-status/lib/status.js 19 additions, 22 deletionsapp/slashcommands-status/lib/status.js
- app/ui-cached-collection/client/models/CachedCollection.js 3 additions, 3 deletionsapp/ui-cached-collection/client/models/CachedCollection.js
- app/ui-flextab/client/tabs/userInfo.js 4 additions, 3 deletionsapp/ui-flextab/client/tabs/userInfo.js
- app/ui-sidenav/client/sidebarHeader.js 10 additions, 4 deletionsapp/ui-sidenav/client/sidebarHeader.js
- app/ui/client/components/header/headerRoom.js 51 additions, 8 deletionsapp/ui/client/components/header/headerRoom.js
- app/user-status/client/admin/userStatusEdit.html 2 additions, 2 deletionsapp/user-status/client/admin/userStatusEdit.html
- app/user-status/client/lib/customUserStatus.js 23 additions, 16 deletionsapp/user-status/client/lib/customUserStatus.js
- app/user-status/server/index.js 1 addition, 0 deletionsapp/user-status/server/index.js
- app/user-status/server/methods/getUserStatusText.js 14 additions, 0 deletionsapp/user-status/server/methods/getUserStatusText.js
- app/user-status/server/methods/listCustomUserStatus.js 5 additions, 0 deletionsapp/user-status/server/methods/listCustomUserStatus.js
- app/user-status/server/methods/setUserStatus.js 7 additions, 3 deletionsapp/user-status/server/methods/setUserStatus.js
Loading
Please register or sign in to comment