Commits · 2a686bb5bb76ce79a0933a9eaab708bfaff17e03 · Administrator / AloqaIM-Android

25 May, 2018 19 commits
- Merge branch 'develop' into beta · 2a686bb5
  Leonardo Aramaki authored May 25, 2018
  
  2a686bb5
- Merge pull request #1312 from RocketChat/googbye-gcm · e0826c85
  Leonardo Aramaki authored May 25, 2018
```
[IMPROVEMENT] FCM in place of GCM
```
  e0826c85
- Merge branch 'beta' into googbye-gcm · 3624513d
  Leonardo Aramaki authored May 25, 2018
  
  3624513d
- Merge pull request #1313 from RocketChat/revert-1300-fix/push-better-multiserver-support · 2a645d78
  Leonardo Aramaki authored May 25, 2018
```
Revert "[FIX] Better multi-server support for push notifications"
```
  2a645d78
- Revert "[FIX] Better multi-server support for push notifications" · abe613c1
  Leonardo Aramaki authored May 25, 2018
  
  abe613c1
- Make FirebaseMessagingService exported · ae70fc75
  Leonardo Aramaki authored May 25, 2018
  
  ae70fc75
- Dismiss notification on tap if host is empty · 6fb08385
  Leonardo Aramaki authored May 25, 2018
  
  6fb08385
- 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 #1300 from RocketChat/fix/push-better-multiserver-support · e4d1724a
  Rafael Kellermann Streit authored May 25, 2018
```
[FIX] Better multi-server support for push notifications
```
  e4d1724a
- 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
- Update google-services.json · 0815edac
  Leonardo Aramaki authored May 25, 2018
  
  0815edac
- 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
- Farewell GCM · 6b599ca0
  Leonardo Aramaki authored May 25, 2018
  
  6b599ca0
24 May, 2018 5 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 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 4 commits
- Merge branch 'develop' into wear-module · fa71c38c
  Aniket Singh authored May 23, 2018
  
  fa71c38c
- 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
- minor changes · 93a590eb
  Divyanshu Bhargava authored May 23, 2018
  
  93a590eb
- fixed RTL layout · ffb8b4d0
  Divyanshu Bhargava authored May 23, 2018
  
  ffb8b4d0
22 May, 2018 11 commits
- If it's a test push message then make the notification to dismiss when tapped · c278feb2
  Leonardo Aramaki authored May 22, 2018
  
  c278feb2
- Save tokens with different keys for each connected server · fe14cdb0
  Leonardo Aramaki authored May 22, 2018
  
  fe14cdb0
- Merge pull request #1299 from RocketChat/fix/notification-not-showing-when-changing-users · 5a678af5
  Filipe de Lima Brito authored May 22, 2018
```
[FIX] Notification not showing after logging out and log in with different user on the same server
```
  5a678af5
- Invalidate token when logging out just after unregistering the push token on server · e0d8f3a4
  Leonardo Aramaki authored May 22, 2018
  
  e0d8f3a4
- improves coding style · 30ba3c17
  aniket authored May 22, 2018
  
  30ba3c17
- Merge pull request #1297 from RocketChat/fix/test-notifications-not-showing · ff46d5b3
  Filipe de Lima Brito authored May 22, 2018
```
[FIX] Test notifications not showing
```
  ff46d5b3
- Add support to push messages not containing a an ejson field and thus having... · cf48262f
  Leonardo Aramaki authored May 22, 2018
```
Add support to push messages not containing a an ejson field and thus having no more than a message an a title. This way, a simple notification should be shown and not attached to any real channel list of messages
```
  cf48262f
- 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 1 commit
- Merge branch 'develop' into feat/google-smart-lock · 6f8195b8
  aniket authored May 21, 2018
  
  6f8195b8