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

19 Dec, 2018 40 commits
- Merge remote-tracking branch 'origin/dev_fastfix_voice_v2' into Develop · f493843e
  Max Chervatiuk authored Dec 19, 2018
  
  f493843e
- Fixed bug with footer state · a8b3f411
  Alexey Shishov authored Dec 19, 2018
  
  a8b3f411
- commented update app dialog · 49222d85
  Max Chervatiuk authored Dec 19, 2018
  
  49222d85
- Merge branch 'Develop' of https://github.com/NYNJA-MC/Android into Develop · 2313129e
  Alexey Shishov authored Dec 19, 2018
  
  2313129e
- Fixed voice · 31de901a
  Alexey Shishov authored Dec 19, 2018
  
  31de901a
- Merge branch 'Develop' of https://github.com/NYNJA-MC/Android into Develop · fa89b9a5
  Alexey Shishov authored Dec 19, 2018
  
  fa89b9a5
- Merge remote-tracking branch 'origin/hotfix_add_cache_offline' into Develop · 9ab4c781
  Max Chervatiuk authored Dec 19, 2018
  
  9ab4c781
- Merge branch 'ref' of https://github.com/NYNJA-MC/Android into ref · 288062f9
  Roman Voronoy authored Dec 19, 2018
  
  288062f9
- hotfix voice record · 1418896b
  Roman Voronoy authored Dec 19, 2018
  
  1418896b
- changed new thread to rx · d0c6a1cf
  Max Chervatiuk authored Dec 19, 2018
  
  d0c6a1cf
- reuse encoder · e5586f9e
  Max Chervatiuk authored Dec 19, 2018
  
  e5586f9e
- hotfix · 64fb8cc9
  Stas Safyanov authored Dec 19, 2018
  
  64fb8cc9
- Merge remote-tracking branch 'origin/Develop' into Develop · 673bf379
  Stas Safyanov authored Dec 19, 2018
  
  673bf379
- Merge branch 'Develop' of https://github.com/NYNJA-MC/Android into Develop · b31d1419
  Alexey Shishov authored Dec 19, 2018
  
  b31d1419
- Merge remote-tracking branch 'origin/added_retry' into Develop · b879a0fb
  Max Chervatiuk authored Dec 19, 2018
  
  b879a0fb
- fixed crash · b1f32192
  Max Chervatiuk authored Dec 19, 2018
  
  b1f32192
- Merge branches 'Develop' and 'fix_datamanager' of... · 9db4ef1c
  Stas Safyanov authored Dec 19, 2018
```
Merge branches 'Develop' and 'fix_datamanager' of https://github.com/NYNJA-MC/Android into fix_datamanager
```
  9db4ef1c
- hotfix · d7bf1352
  Stas Safyanov authored Dec 19, 2018
  
  d7bf1352
- Merge remote-tracking branch 'origin/dev_test_history' into Develop · 8770994c
  Max Chervatiuk authored Dec 19, 2018
  
  8770994c
- Merge remote-tracking branch 'origin/hotfix_call_from_chat' into Develop · e29a33a1
  Max Chervatiuk authored Dec 19, 2018
  
  e29a33a1
- Merge remote-tracking branch 'origin/hotfix_call_crash' into Develop · e117495e
  Max Chervatiuk authored Dec 19, 2018
  
  e117495e
- Merge branch 'Develop' of https://github.com/NYNJA-MC/Android into Develop · c7615fe0
  Alexey Shishov authored Dec 19, 2018
  
  c7615fe0
- Added unit test for history model parser · 81bd8eb3
  Alexey Shishov authored Dec 19, 2018
  
  81bd8eb3
- Merge branches 'NY-5228' and 'multiple_acc/main' of... · 6ff3ff86
  Roman Voronoy authored Dec 19, 2018
```
Merge branches 'NY-5228' and 'multiple_acc/main' of https://github.com/NYNJA-MC/Android into NY-5228

# Conflicts:
#	app/src/main/java/com/nynja/mobile/communicator/data/sdk/account/AccountSDKModule.kt
```
  6ff3ff86
- Fixed calls in p2p chat · e6222524
  dmitrylashin authored Dec 19, 2018
  
  e6222524
- Merge branches 'NY-5228' and 'multiple_acc/main' of... · bbbc8710
  Roman Voronoy authored Dec 19, 2018
```
Merge branches 'NY-5228' and 'multiple_acc/main' of https://github.com/NYNJA-MC/Android into NY-5228

# Conflicts:
#	app/src/main/java/com/nynja/mobile/communicator/data/sdk/account/AccountSDKModule.kt
```
  bbbc8710
- hotfix · 7123b4b7
  Stas Safyanov authored Dec 19, 2018
  
  7123b4b7
- Merge branch 'Develop' of https://github.com/NYNJA-MC/Android into Develop · 93b3da27
  dmitrylashin authored Dec 19, 2018
  
  93b3da27
- hotfix · d24db2c1
  Stas Safyanov authored Dec 19, 2018
  
  d24db2c1
- hotfix · 75ca6c0f
  Stas Safyanov authored Dec 19, 2018
  
  75ca6c0f
- Merge branch 'Develop' of https://github.com/NYNJA-MC/Android into hotfix · b65de395
  Stas Safyanov authored Dec 19, 2018
  
  b65de395
- hotfix · 1e2d5a02
  Stas Safyanov authored Dec 19, 2018
  
  1e2d5a02
- Merge remote-tracking branch 'origin/Develop' into Develop · 38eb7484
  Roman Voronoy authored Dec 19, 2018
  
  38eb7484
- fixed merge issue · 702f7991
  Max Chervatiuk authored Dec 19, 2018
  
  702f7991
- Merge remote-tracking branch 'origin/Develop' into Develop · 679b843c
  Roman Voronoy authored Dec 19, 2018
  
  679b843c
- Merge remote-tracking branch 'origin/NY-6243' into Develop · 2a3990b4
  Max Chervatiuk authored Dec 19, 2018
```
# Conflicts:
#	app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/MainActivityPresenter.kt
```
  2a3990b4
- Merge remote-tracking branch 'origin/NY-6239' into Develop · 9c41af4a
  Max Chervatiuk authored Dec 19, 2018
  
  9c41af4a
- Merge remote-tracking branch 'origin/dev_fix_date_utils_test' into Develop · 328d1468
  Max Chervatiuk authored Dec 19, 2018
  
  328d1468
- NY-6248 · 8038392e
  Rusakov.Sergii.Dev authored Dec 19, 2018
  
  8038392e
- NY-6248 · b66380a9
  Rusakov.Sergii.Dev authored Dec 19, 2018
  
  b66380a9