Merge remote-tracking branch 'origin/develop' into release-candidate
No related branches found
No related tags found
Showing
- apps/meteor/app/analytics/client/loadScript.js 0 additions, 85 deletionsapps/meteor/app/analytics/client/loadScript.js
- apps/meteor/app/analytics/client/loadScript.ts 122 additions, 0 deletionsapps/meteor/app/analytics/client/loadScript.ts
- apps/meteor/app/cors/server/cors.js 11 additions, 1 deletionapps/meteor/app/cors/server/cors.js
- apps/meteor/app/lib/server/startup/settings.ts 5 additions, 0 deletionsapps/meteor/app/lib/server/startup/settings.ts
- apps/meteor/app/theme/client/imports/components/message-box.css 1 addition, 1 deletion...eteor/app/theme/client/imports/components/message-box.css
- apps/meteor/app/theme/client/imports/general/variables.css 1 addition, 1 deletionapps/meteor/app/theme/client/imports/general/variables.css
- apps/meteor/client/sidebar/hooks/useSidebarPaletteColor.ts 1 addition, 1 deletionapps/meteor/client/sidebar/hooks/useSidebarPaletteColor.ts
- apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx 1 addition, 0 deletions...ient/views/account/preferences/AccountPreferencesPage.tsx
- apps/meteor/client/views/admin/apps/AppsRoute.tsx 11 additions, 8 deletionsapps/meteor/client/views/admin/apps/AppsRoute.tsx
- apps/meteor/client/views/admin/routes.tsx 0 additions, 7 deletionsapps/meteor/client/views/admin/routes.tsx
- apps/meteor/client/views/room/MessageList/components/ThreadMessagePreview.tsx 11 additions, 5 deletions...iews/room/MessageList/components/ThreadMessagePreview.tsx
- apps/meteor/client/views/room/components/body/RoomForeword.tsx 2 additions, 4 deletions...meteor/client/views/room/components/body/RoomForeword.tsx
- apps/meteor/ee/server/services/package.json 5 additions, 5 deletionsapps/meteor/ee/server/services/package.json
- apps/meteor/package.json 15 additions, 15 deletionsapps/meteor/package.json
- apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json 3 additions, 1 deletionapps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
- apps/meteor/server/hooks/messages/markdownParser.ts 1 addition, 1 deletionapps/meteor/server/hooks/messages/markdownParser.ts
- apps/meteor/server/routes/health.ts 10 additions, 6 deletionsapps/meteor/server/routes/health.ts
- apps/meteor/tests/data/user.js 1 addition, 0 deletionsapps/meteor/tests/data/user.js
- apps/meteor/tests/end-to-end/api/01-users.js 8 additions, 7 deletionsapps/meteor/tests/end-to-end/api/01-users.js
- ee/apps/account-service/package.json 2 additions, 2 deletionsee/apps/account-service/package.json
Loading
Please register or sign in to comment