Commits · edddc76b6fca7cf499e3e2b5b123d3a9c885a1c5 · Administrator / AloqaIM-Android

30 May, 2018 1 commit
- makes requested changes · edddc76b
  aniket authored May 30, 2018
  
  edddc76b
26 May, 2018 1 commit
- adds missing translations · c7dfe315
  aniket authored May 26, 2018
  
  c7dfe315
25 May, 2018 11 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
- 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 7 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
- Merge branch 'develop' into rtl-layout-fix · aa532ab2
  Filipe de Lima Brito authored May 24, 2018
  
  aa532ab2
23 May, 2018 10 commits
- Merge branch 'develop' into wear-module · fa71c38c
  Aniket Singh authored May 23, 2018
  
  fa71c38c
- deals with many more cases · 89aad912
  aniket authored May 23, 2018
  
  89aad912
- Merge pull request #1275 from aniketsingh03/feat/google-smart-lock · 5513c619
  Filipe de Lima Brito authored May 23, 2018
```
[NEW] Integration of Google Smart Lock
```
  5513c619
- adds missing strings in other languages · 2c4dffeb
  aniket authored May 23, 2018
  
  2c4dffeb
- deals with more cases · 866ff324
  aniket authored May 23, 2018
  
  866ff324
- completes basic implementation of adding users to a new channel · 7435abb5
  aniket authored May 23, 2018
  
  7435abb5
- minor changes · 93a590eb
  Divyanshu Bhargava authored May 23, 2018
  
  93a590eb
- fixed RTL layout · ffb8b4d0
  Divyanshu Bhargava authored May 23, 2018
  
  ffb8b4d0
- Merge branch 'develop' into aniket/feat/create-new-channel · 11b54eda
  aniket authored May 23, 2018
  
  11b54eda
- minor changes in the code to add members · 9f9c2ace
  aniket authored May 23, 2018
  
  9f9c2ace
22 May, 2018 5 commits
- improves coding style · 30ba3c17
  aniket authored May 22, 2018
  
  30ba3c17
- Merge branch 'develop' into wear-module · b7606345
  Filipe de Lima Brito authored May 22, 2018
  
  b7606345
- resolves minor issues · 2fa3abb1
  aniket authored May 22, 2018
  
  2fa3abb1
- fixes failing test · b2cc4390
  aniket authored May 22, 2018
  
  b2cc4390
- Merge pull request #17 from RocketChat/develop · 623f5147
  divyanshu bhargava authored May 22, 2018
```
merge
```
  623f5147
21 May, 2018 5 commits
- Merge branch 'develop' into feat/google-smart-lock · 6f8195b8
  aniket authored May 21, 2018
  
  6f8195b8
- changes #2 · 7db24109
  aniket authored May 21, 2018
  
  7db24109
- set of changes #1 · 9ba67a56
  aniket authored May 21, 2018
  
  9ba67a56
- minor fixes · f4c434e2
  aniket authored May 21, 2018
  
  f4c434e2
- Merge pull request #1290 from Poussinou/patch-1 · ca99f416
  Filipe de Lima Brito authored May 21, 2018
```
[IMPROVEMENT] Update gradle-wrapper.properties by adding SHA-256 comparasion
```
  ca99f416