Commits · 232e03c2a3e06ab2bcd63c1bd0693d5804289242 · Administrator / AloqaIM-Android

06 Apr, 2018 9 commits
- Merge branch 'develop-2.x' into improvement/get-own-current-status · 232e03c2
  Filipe de Lima Brito authored Apr 06, 2018
  
  232e03c2
- Merge pull request #1035 from RocketChat/fix/chatroom-crash · 4b47b911
  Rafael Kellermann Streit authored Apr 06, 2018
```
[FIX] Crash on Chat Room screen
```
  4b47b911
- Merge branch 'develop-2.x' into fix/chatroom-crash · 9914172c
  Filipe de Lima Brito authored Apr 06, 2018
  
  9914172c
- Fix · f06bd9d1
  Lucio Maciel authored Apr 06, 2018
```
https://fabric.io/rocketchat3/android/apps/chat.rocket.android/issues/5ac6b5f636c7b23527a569d0
```
  f06bd9d1
- Merge branch 'develop-2.x' into improvement/get-own-current-status · 77b9cbe4
  Filipe de Lima Brito authored Apr 06, 2018
  
  77b9cbe4
- Merge pull request #989 from divyanshub024/ver-name-number · eea3cb16
  Filipe de Lima Brito authored Apr 06, 2018
```
[NEW] Show version name/code in about screen
```
  eea3cb16
- Merge branch 'develop-2.x' into ver-name-number · 7ffa0e14
  Filipe de Lima Brito authored Apr 06, 2018
  
  7ffa0e14
- Merge branch 'develop-2.x' of github.com:RocketChat/Rocket.Chat.Android into... · 46821a8a
  Filipe de Lima Brito authored Apr 06, 2018
```
Merge branch 'develop-2.x' of github.com:RocketChat/Rocket.Chat.Android into improvement/get-own-current-status
```
  46821a8a
- Get own current status. · 3e9e5475
  Filipe de Lima Brito authored Apr 06, 2018
  
  3e9e5475
05 Apr, 2018 17 commits
- Merge pull request #1033 from RocketChat/chore/increment_build_beta4 · c0a12e1e
  Rafael Kellermann Streit authored Apr 05, 2018
```
[CHORE] Increment versionCode
```
  c0a12e1e
- Merge branch 'develop-2.x' into chore/increment_build_beta4 · 39854442
  Rafael Kellermann Streit authored Apr 05, 2018
  
  39854442
- Increment version · 5c5ac001
  Rafael Kellermann Streit authored Apr 05, 2018
  
  5c5ac001
- Merge pull request #1031 from RocketChat/chore/increment_build_beta4 · c1b85553
  Rafael Kellermann Streit authored Apr 05, 2018
```
[CHORE] Increment build beta number to 4
```
  c1b85553
- Increment build beta number to 4 · ef2b5d5f
  Rafael Kellermann Streit authored Apr 05, 2018
  
  ef2b5d5f
- Merge pull request #1030 from RocketChat/fix/crash-fixes · 4b95f252
  Rafael Kellermann Streit authored Apr 05, 2018
```
[FIX] batch of crash fixes from beta3
```
  4b95f252
- Missing import · a6c3aca8
  Lucio Maciel authored Apr 05, 2018
  
  a6c3aca8
- Missing files from previous commit · c063b3ab
  Lucio Maciel authored Apr 05, 2018
  
  c063b3ab
- Merge branch 'develop-2.x' into fix/crash-fixes · 3a029395
  Lucio Maciel authored Apr 05, 2018
  
  3a029395
- Make sure all client calls are guarded by try/catch · 2993bdea
  Lucio Maciel authored Apr 05, 2018
```
Use retryIO to retry client calls (still missing on some places)
Better error logging
NPE fixes.
```
  2993bdea
- Fix crash when instantiating EndlessScrollListener · dff97592
  Lucio Maciel authored Apr 05, 2018
  
  dff97592
- Merge pull request #1026 from RocketChat/new/set-status · 6f0cc896
  Rafael Kellermann Streit authored Apr 05, 2018
```
[NEW] Add the possibility to change own status.
```
  6f0cc896
- Merge pull request #1024 from RocketChat/new/send-message-with-id · a4111e3b
  Rafael Kellermann Streit authored Apr 05, 2018
```
[IMPROVEMENT] Keep message on the text composer on fail to send message
```
  a4111e3b
- Add the posibility to change own status. · 236f3b02
  Filipe de Lima Brito authored Apr 05, 2018
  
  236f3b02
- Keep composer enabled when sending message; doing the opposite hides the keyboard · a2693fe4
  Leonardo Aramaki authored Apr 05, 2018
  
  a2693fe4
- Keep message on the composer if sending fails · bc4d466a
  Leonardo Aramaki authored Apr 05, 2018
  
  bc4d466a
- Fix typo on string · 8bf2fec0
  Leonardo Aramaki authored Apr 05, 2018
  
  8bf2fec0
04 Apr, 2018 11 commits
- Added hindi translation · 958b7c35
  Divyanshu Bhargava authored Apr 04, 2018
  
  958b7c35
- minor fix · 0ab5c264
  Divyanshu Bhargava authored Apr 04, 2018
  
  0ab5c264
- added vector images · 16d33b5d
  Divyanshu Bhargava authored Apr 04, 2018
  
  16d33b5d
- Merge remote-tracking branch 'origin/ver-name-number' into ver-name-number · 06af51f3
  Divyanshu Bhargava authored Apr 04, 2018
```
# Conflicts:
#	app/src/main/res/values-pt-rBR/strings.xml
#	app/src/main/res/values/strings.xml
```
  06af51f3
- added vector images · 97afb7d5
  Divyanshu Bhargava authored Apr 04, 2018
  
  97afb7d5
- Fix NPE on ChatRoomFragment · 2101e1f1
  Lucio Maciel authored Apr 04, 2018
  
  2101e1f1
- Merge branch 'develop-2.x' into ver-name-number · bc752e51
  Divyanshu Bhargava authored Apr 04, 2018
```
# Conflicts:
#	app/src/main/res/values-pt-rBR/strings.xml
#	app/src/main/res/values/strings.xml
```
  bc752e51
- Merge pull request #2 from RocketChat/develop-2.x · f2e5f6d1
  divyanshu bhargava authored Apr 04, 2018
```
merge
```
  f2e5f6d1
- Merge branch 'develop-2.x' into ver-name-number · 4e848ef2
  Divyanshu Bhargava authored Apr 04, 2018
```
# Conflicts:
#	app/src/main/res/values-pt-rBR/strings.xml
#	app/src/main/res/values/strings.xml
```
  4e848ef2
- Merge branch 'develop-2.x' into ver-name-number · 17a34c01
  divyanshu bhargava authored Apr 04, 2018
  
  17a34c01
- Merge pull request #1017 from RocketChat/fix/blank-screen · 0c9fb9cf
  Rafael Kellermann Streit authored Apr 04, 2018
```
[FIX] Blank screen.
```
  0c9fb9cf
03 Apr, 2018 3 commits
- Fix blank screen. · 4aad86b7
  Filipe de Lima Brito authored Apr 03, 2018
  
  4aad86b7
- Merge pull request #1016 from RocketChat/chore/increment_build_beta3 · 82db7cd0
  Rafael Kellermann Streit authored Apr 03, 2018
```
[CHORE] Increment version to beta 3
```
  82db7cd0
- Increment version to beta3 · f1c6609a
  Rafael Kellermann Streit authored Apr 03, 2018
  
  f1c6609a