Commits · ebffff0225b9b98513df9d004de868e4681256e7 · Administrator / AloqaIM-Android

04 Jun, 2018 3 commits
- Merge branch 'develop' into aniket/feat/create-new-channel · ebffff02
  Aniket Singh authored Jun 04, 2018
  
  ebffff02
- Merge pull request #1339 from Pitstopper/patch-1 · 45f52fb7
  Filipe de Lima Brito authored Jun 04, 2018
```
[FIX] Update strings.xml (RU)
```
  45f52fb7
- Update strings.xml · 017338e8
  Pitstopper authored Jun 04, 2018
  
  017338e8
03 Jun, 2018 2 commits
- adds missing translations · 1da4cc52
  aniket authored Jun 03, 2018
  
  1da4cc52
- Merge branch 'develop' into aniket/feat/create-new-channel · 02023100
  Aniket Singh authored Jun 03, 2018
  
  02023100
02 Jun, 2018 4 commits
- Merge pull request #1336 from divyanshub024/toast-copy · e5b6f8bf
  Rafael Kellermann Streit authored Jun 02, 2018
```
[IMPROVEMENT] Show toast on copy message
```
  e5b6f8bf
- Type mismatch error fixed · d1636afc
  Divyanshu Bhargava authored Jun 02, 2018
  
  d1636afc
- Show toast on copy message · 5ce5e0e3
  Divyanshu Bhargava authored Jun 02, 2018
  
  5ce5e0e3
- Merge pull request #19 from RocketChat/develop · c8fe544a
  divyanshu bhargava authored Jun 02, 2018
```
merge
```
  c8fe544a
01 Jun, 2018 2 commits
- Merge pull request #1329 from Pitstopper/develop · 79dc4dbf
  Rafael Kellermann Streit authored Jun 01, 2018
```
[I18N] Russian translation file
```
  79dc4dbf
- Merge pull request #1326 from RocketChat/new/login-with-saml · 0d151af1
  Filipe de Lima Brito authored Jun 01, 2018
```
[NEW] SAML support
```
  0d151af1
31 May, 2018 5 commits
- Update strings.xml · 7087583f
  Pitstopper authored May 31, 2018
  
  7087583f
- Update strings.xml · 9df02397
  Pitstopper authored May 31, 2018
  
  9df02397
- Update strings.xml · 6ff21859
  Pitstopper authored May 31, 2018
  
  6ff21859
- Create strings.xml · 01c70b62
  Pitstopper authored May 31, 2018
  
  01c70b62
- Merge pull request #18 from RocketChat/develop · 1c8146c6
  divyanshu bhargava authored May 31, 2018
```
merge
```
  1c8146c6
30 May, 2018 5 commits
- Adds a delay before the SAML login request. · 8049507e
  Filipe de Lima Brito authored May 30, 2018
  
  8049507e
- Merge branch 'develop' into new/login-with-saml and implement the login support throught SAML · 47d0275e
  Filipe de Lima Brito authored May 30, 2018
  
  47d0275e
- Merge branch 'develop' into aniket/feat/create-new-channel · 6467d655
  Aniket Singh authored May 30, 2018
  
  6467d655
- makes requested changes · edddc76b
  aniket authored May 30, 2018
  
  edddc76b
- Merge pull request #1311 from RocketChat/revert-1310-revert-1280-wear-module · 23c88ff5
  Rafael Kellermann Streit authored May 30, 2018
```
[NEW] Wear Module
```
  23c88ff5
26 May, 2018 1 commit
- adds missing translations · c7dfe315
  aniket authored May 26, 2018
  
  c7dfe315
25 May, 2018 12 commits
- fixes minor issues · db741a34
  aniket authored May 25, 2018
  
  db741a34
- Merge branch 'develop' into aniket/feat/create-new-channel · fdc71a42
  Aniket Singh authored May 25, 2018
  
  fdc71a42
- Revert "Revert "[NEW] Wear Module"" · 66f74d53
  Rafael Kellermann Streit authored May 25, 2018
  
  66f74d53
- Merge pull request #1310 from RocketChat/revert-1280-wear-module · b9b18b2c
  Rafael Kellermann Streit authored May 25, 2018
```
Revert "[NEW] Wear Module"
```
  b9b18b2c
- Revert "[NEW] Wear Module" · af2efc9f
  Rafael Kellermann Streit authored May 25, 2018
  
  af2efc9f
- Merge pull request #1280 from aniketsingh03/wear-module · 10977a28
  Filipe de Lima Brito authored May 25, 2018
```
[NEW] Wear Module
```
  10977a28
- Merge branch 'develop' into wear-module · 8cef5d6a
  Filipe de Lima Brito authored May 25, 2018
  
  8cef5d6a
- Merge pull request #1309 from RocketChat/improvement/chat-room-icon · 693d6fad
  Rafael Kellermann Streit authored May 25, 2018
```
[IMPROVEMENT] Shows only the chat icon on the chat room view.
```
  693d6fad
- Shows only the chat icon on the chat room view. · 90cf5125
  Filipe de Lima Brito authored May 25, 2018
  
  90cf5125
- adds build tools version to build.gradle · 0a26da2b
  aniket authored May 25, 2018
  
  0a26da2b
- Merge branch 'develop' into wear-module · c07f3aa7
  Filipe de Lima Brito authored May 25, 2018
  
  c07f3aa7
- Merge pull request #1304 from RocketChat/new/file-list · 2ed0f6d7
  Filipe de Lima Brito authored May 25, 2018
```
[NEW] File list
```
  2ed0f6d7
24 May, 2018 6 commits
- Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/file-list · a4e4bad7
  Filipe de Lima Brito authored May 24, 2018
  
  a4e4bad7
- Adds file list feature. · 4b352b0f
  Filipe de Lima Brito authored May 24, 2018
  
  4b352b0f
- Merge branch 'develop' into aniket/feat/create-new-channel · b6f225f5
  Aniket Singh authored May 24, 2018
  
  b6f225f5
- supports infinite scrolling for search results · 94949958
  aniket authored May 24, 2018
  
  94949958
- Merge branch 'develop' into wear-module · a29c0ddf
  Filipe de Lima Brito authored May 24, 2018
  
  a29c0ddf
- Merge pull request #1301 from divyanshub024/rtl-layout-fix · bbfeb193
  Filipe de Lima Brito authored May 24, 2018
```
[BUG] RTL layout fixed for chatroom
```
  bbfeb193