Commits · v0.2.1 · Confidential and Proprietary / NYNJA / Android

06 Sep, 2018 18 commits
- NY-3359 fixed crash after change an avatar · e83258c4
  Max Chervatiuk authored Sep 06, 2018
  
  e83258c4
- fixed crash with corrupted image · 1ecc263c
  Max Chervatiuk authored Sep 06, 2018
  
  1ecc263c
- Merge remote-tracking branch 'origin/NY-3285' into Develop · cb585c08
  Max Chervatiuk authored Sep 06, 2018
  
  cb585c08
- hotifx · 7368113f
  Roman Voronoy authored Sep 06, 2018
  
  7368113f
- Merge remote-tracking branch 'origin/NY-3285' into Develop · b4b289ca
  Max Chervatiuk authored Sep 06, 2018
  
  b4b289ca
- Merge remote-tracking branch 'origin/NY-3269' into Develop · 3751485d
  Max Chervatiuk authored Sep 06, 2018
  
  3751485d
- Merge remote-tracking branch 'origin/NY-2147' into Develop · b660acd4
  Max Chervatiuk authored Sep 06, 2018
  
  b660acd4
- Merge remote-tracking branch 'origin/NY-2676' into Develop · 31d53865
  Max Chervatiuk authored Sep 06, 2018
```
# Conflicts:
#	app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ChatPresenter.java
```
  31d53865
- Merge remote-tracking branch 'origin/NY-3339' into Develop · eeccc5f7
  Max Chervatiuk authored Sep 06, 2018
  
  eeccc5f7
- NY-3269 Wheel position fixed · 074e0723
  Roman Voronoy authored Sep 06, 2018
  
  074e0723
- NY-2385 cancel file sending when chat history is deleted · b3b51512
  Roman Voronoy authored Sep 06, 2018
  
  b3b51512
- complete · 52419fdf
  Rusakov.Sergii.Dev authored Sep 06, 2018
  
  52419fdf
- complete · cc297fdc
  Rusakov.Sergii.Dev authored Sep 06, 2018
  
  cc297fdc
- NY-2147 fixed enable state for create button (group, channel) after app opens from background · 34d9174c
  Stas Safyanov authored Sep 06, 2018
  
  34d9174c
- fixed · 72b95753
  Rusakov.Sergii.Dev authored Sep 06, 2018
  
  72b95753
- fixed · 66b2c86b
  Rusakov.Sergii.Dev authored Sep 06, 2018
  
  66b2c86b
- NY-3339 Fixed crash with mentions in translate message · 564a16e1
  Alexey Shishov authored Sep 06, 2018
  
  564a16e1
- NY-3331 Fixed bug with auto translate send message · 02b51840
  Alexey Shishov authored Sep 06, 2018
  
  02b51840
05 Sep, 2018 22 commits
- Merge branches 'Develop' and 'NY-3168' of https://github.com/NYNJA-MC/Android into NY-3168 · 88165faf
  Rusakov.Sergii.Dev authored Sep 05, 2018
```
# Conflicts:
#	app/src/main/java/com/nynja/mobile/communicator/data/DataManager.java
#	app/src/main/java/com/nynja/mobile/communicator/data/NynjaAwsManager.java
#	app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ChatPresenter.java
```
  88165faf
- Merge branches 'Develop' and 'NY-3168' of https://github.com/NYNJA-MC/Android into NY-3168 · a36d1387
  Rusakov.Sergii.Dev authored Sep 05, 2018
```
# Conflicts:
#	app/src/main/java/com/nynja/mobile/communicator/data/DataManager.java
#	app/src/main/java/com/nynja/mobile/communicator/data/NynjaAwsManager.java
#	app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ChatPresenter.java
```
  a36d1387
- Merge branches 'Develop' and 'NY-3168' of https://github.com/NYNJA-MC/Android into NY-3168 · dd856ea5
  Rusakov.Sergii.Dev authored Sep 05, 2018
```
# Conflicts:
#	app/src/main/java/com/nynja/mobile/communicator/data/DataManager.java
#	app/src/main/java/com/nynja/mobile/communicator/data/NynjaAwsManager.java
#	app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ChatPresenter.java
```
  dd856ea5
- Merge branches 'Develop' and 'NY-3168' of https://github.com/NYNJA-MC/Android into NY-3168 · 9fef6a01
  Rusakov.Sergii.Dev authored Sep 05, 2018
```
# Conflicts:
#	app/src/main/java/com/nynja/mobile/communicator/data/DataManager.java
#	app/src/main/java/com/nynja/mobile/communicator/data/NynjaAwsManager.java
#	app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ChatPresenter.java
```
  9fef6a01
- create new async logic to copy media when send message · 6df0c46e
  Rusakov.Sergii.Dev authored Sep 05, 2018
  
  6df0c46e
- Merge remote-tracking branch 'origin/NY-3311' into Develop · 77b3d39f
  Max Chervatiuk authored Sep 05, 2018
  
  77b3d39f
- create new async logic to copy media when send message · fc3e4ce5
  Rusakov.Sergii.Dev authored Sep 05, 2018
  
  fc3e4ce5
- Merge remote-tracking branch 'origin/NY-3322' into Develop · ffaf4004
  Max Chervatiuk authored Sep 05, 2018
  
  ffaf4004
- Merge remote-tracking branch 'origin/NY-3322' into NY-3322 · ab50034d
  Stas Safyanov authored Sep 05, 2018
  
  ab50034d
- refactoring · c247d0e7
  Stas Safyanov authored Sep 05, 2018
  
  c247d0e7
- NY-3311 fixed broken filter on starred messages · 3c930e4f
  Stas Safyanov authored Sep 05, 2018
  
  3c930e4f
- Merge branch 'NY-3322' of https://github.com/NYNJA-MC/Android into NY-3322 · e36d44b8
  Roman Voronoy authored Sep 05, 2018
  
  e36d44b8
- NY-3322 App freeze fixed · 1e358686
  Roman Voronoy authored Sep 05, 2018
  
  1e358686
- NY-3311 fixed broken filter on starred messages · 2770232e
  Stas Safyanov authored Sep 05, 2018
  
  2770232e
- NY-3322 App freeze fixed · cab3ddb3
  Roman Voronoy authored Sep 05, 2018
  
  cab3ddb3
- Merge branches 'Develop' and 'NY-3273' of https://github.com/NYNJA-MC/Android into NY-3273 · 888b96a2
  dmitrylashin authored Sep 05, 2018
  
  888b96a2
- NY-3273 fixed 'member' status is shown on the Group Participants screen · 31cd4c77
  dmitrylashin authored Sep 05, 2018
  
  31cd4c77
- Merge branch 'Develop' of https://github.com/NYNJA-MC/Android into NY-3311 · b20f8fe4
  Stas Safyanov authored Sep 05, 2018
  
  b20f8fe4
- NY-3311 fixed broken filter on starred messages · 9dc5a835
  Stas Safyanov authored Sep 05, 2018
  
  9dc5a835
- Merge remote-tracking branch 'origin/NY-3265' into Develop · 014e85ed
  Max Chervatiuk authored Sep 05, 2018
  
  014e85ed
- Merge remote-tracking branch 'origin/marketplace/main' into Develop · 15867065
  Max Chervatiuk authored Sep 05, 2018
  
  15867065
- Merge remote-tracking branch 'origin/calls/main' into Develop · 14acf2db
  Max Chervatiuk authored Sep 05, 2018
  
  14acf2db