Commits · 958b7c35551162b46dd31c49f12f88f4a0f64f2e · Administrator / AloqaIM-Android · GitLab

04 Apr, 2018 10 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
- 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 20 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
- Merge pull request #1015 from RocketChat/new/insert-username · 23cbdf2d
  Rafael Kellermann Streit authored Apr 03, 2018
```
[NEW] Add register username screen
```
  23cbdf2d
- Merge branch 'develop-2.x' into new/insert-username · a436dc0e
  Filipe de Lima Brito authored Apr 03, 2018
  
  a436dc0e
- Add register username when log in via OAuth for the first time (and there is no user created yet) · 2e8a0993
  Filipe de Lima Brito authored Apr 03, 2018
  
  2e8a0993
- Merge pull request #1014 from RocketChat/fix/missing-play-services · 30b3b8b0
  Rafael Kellermann Streit authored Apr 03, 2018
```
[FIX] Don't crash on missing Play Services.
```
  30b3b8b0
- Another NPE fix · 376c74ac
  Lucio Maciel authored Apr 03, 2018
  
  376c74ac
- Don't crash on missing Play Services. · 052c7e46
  Lucio Maciel authored Apr 03, 2018
  
  052c7e46
- Merge pull request #1013 from RocketChat/chore/increment_build_beta2 · 3ac4578e
  Rafael Kellermann Streit authored Apr 03, 2018
```
[CHORE] Increment version to beta2
```
  3ac4578e
- Increment version to beta2 · 8b5f9666
  Rafael Kellermann Streit authored Apr 03, 2018
  
  8b5f9666
- Merge pull request #1 from RocketChat/develop-2.x · f5f91c86
  divyanshu bhargava authored Apr 03, 2018
```
merge
```
  f5f91c86
- Merge branch 'develop-2.x' into ver-name-number · c73a06ae
  divyanshu bhargava authored Apr 03, 2018
  
  c73a06ae
- Merge pull request #1005 from RocketChat/fix/view-model-mapper-crash · ca864422
  Leonardo Aramaki authored Apr 03, 2018
```
[FIX] Crash on ViewModelMapper
```
  ca864422
- Fix · 27fb131c
  Lucio Maciel authored Apr 03, 2018
```
https://fabric.io/rocketchat3/android/apps/chat.rocket.android/issues/5ac2a7da36c7b235275e002c?time=last-twenty-four-hours
```
  27fb131c
- Merge branch 'develop-2.x' into ver-name-number · cb3ee75c
  divyanshu bhargava authored Apr 03, 2018
  
  cb3ee75c
- Merge pull request #993 from RocketChat/chore/increment_build_beta1 · 8ea28419
  Rafael Kellermann Streit authored Apr 03, 2018
```
[CHORE] Increment version to beta1 & 2001
```
  8ea28419
- Merge branch 'develop-2.x' into chore/increment_build_beta1 · 96d9ce1e
  Rafael Kellermann Streit authored Apr 03, 2018
  
  96d9ce1e
- Merge pull request #1003 from RocketChat/fix/oauth-crashes-when-using-new-user · dd39e2d3
  Rafael Kellermann Streit authored Apr 03, 2018
```
[FIX] Alerts the user about username creation using the web version.
```
  dd39e2d3
- Fix typo. · a5541edf
  Filipe de Lima Brito authored Apr 03, 2018
  
  a5541edf
02 Apr, 2018 10 commits
- Update toast duration. · 2760f3e9
  Filipe de Lima Brito authored Apr 02, 2018
  
  2760f3e9
- Merge branch develop-2.x into this PR. · 220f8a0d
  Filipe de Lima Brito authored Apr 02, 2018
  
  220f8a0d
- Add hind translation. · 58e3b9c1
  Filipe de Lima Brito authored Apr 02, 2018
  
  58e3b9c1
- Merge branch 'develop-2.x' of github.com:RocketChat/Rocket.Chat.Android into... · 79959291
  Filipe de Lima Brito authored Apr 02, 2018
```
Merge branch 'develop-2.x' of github.com:RocketChat/Rocket.Chat.Android into fix/oauth-crashes-when-using-new-user
```
  79959291
- Alerts the user about username creation using the web version. · 5c140bdb
  Filipe de Lima Brito authored Apr 02, 2018
  
  5c140bdb
- Merge branch 'develop-2.x' into chore/increment_build_beta1 · 70882c65
  Rafael Kellermann Streit authored Apr 02, 2018
  
  70882c65
- Merge pull request #1002 from RocketChat/fix/logout-when-invalid-token · 05e29725
  Rafael Kellermann Streit authored Apr 02, 2018
```
[FIX] Logout on invalid token.
```
  05e29725
- Merge branch 'develop-2.x' into fix/logout-when-invalid-token · b16d2ccc
  Lucio Maciel authored Apr 02, 2018
  
  b16d2ccc
- Logout on invalid token. · 7f8b2e7d
  Lucio Maciel authored Apr 02, 2018
  
  7f8b2e7d
- Merge branch 'develop-2.x' into chore/increment_build_beta1 · efa72c14
  Rafael Kellermann Streit authored Apr 02, 2018
  
  efa72c14

Technounit-GROUP 2023