Merge branch 'develop' into feature/read-only-rooms
Showing
- .eslintrc 1 addition, 0 deletions.eslintrc
- .sandstorm/sandstorm-pkgdef.capnp 2 additions, 2 deletions.sandstorm/sandstorm-pkgdef.capnp
- packages/rocketchat-action-links/client/init.js 1 addition, 1 deletionpackages/rocketchat-action-links/client/init.js
- packages/rocketchat-action-links/client/stylesheets/actionLinks.less 8 additions, 5 deletions...cketchat-action-links/client/stylesheets/actionLinks.less
- packages/rocketchat-iframe-login/iframe_client.js 0 additions, 2 deletionspackages/rocketchat-iframe-login/iframe_client.js
- packages/rocketchat-ldap/server/ldap.js 1 addition, 1 deletionpackages/rocketchat-ldap/server/ldap.js
- packages/rocketchat-ldap/server/loginHandler.js 2 additions, 40 deletionspackages/rocketchat-ldap/server/loginHandler.js
- packages/rocketchat-ldap/server/settings.js 1 addition, 0 deletionspackages/rocketchat-ldap/server/settings.js
- packages/rocketchat-ldap/server/sync.js 63 additions, 2 deletionspackages/rocketchat-ldap/server/sync.js
- packages/rocketchat-lib/client/CustomTranslations.js 19 additions, 0 deletionspackages/rocketchat-lib/client/CustomTranslations.js
- packages/rocketchat-lib/i18n/ca.i18n.json 10 additions, 0 deletionspackages/rocketchat-lib/i18n/ca.i18n.json
- packages/rocketchat-lib/i18n/de-AT.i18n.json 1 addition, 0 deletionspackages/rocketchat-lib/i18n/de-AT.i18n.json
- packages/rocketchat-lib/i18n/de.i18n.json 21 additions, 0 deletionspackages/rocketchat-lib/i18n/de.i18n.json
- packages/rocketchat-lib/i18n/en.i18n.json 11 additions, 1 deletionpackages/rocketchat-lib/i18n/en.i18n.json
- packages/rocketchat-lib/i18n/hr.i18n.json 18 additions, 0 deletionspackages/rocketchat-lib/i18n/hr.i18n.json
- packages/rocketchat-lib/i18n/it.i18n.json 18 additions, 0 deletionspackages/rocketchat-lib/i18n/it.i18n.json
- packages/rocketchat-lib/i18n/sv.i18n.json 1 addition, 0 deletionspackages/rocketchat-lib/i18n/sv.i18n.json
- packages/rocketchat-lib/i18n/tr.i18n.json 83 additions, 62 deletionspackages/rocketchat-lib/i18n/tr.i18n.json
- packages/rocketchat-lib/package.js 1 addition, 0 deletionspackages/rocketchat-lib/package.js
- packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js 10 additions, 3 deletions...s/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
Loading
Please register or sign in to comment