Commits · v0.5.1 · Confidential and Proprietary / NYNJA / Android · GitLab

and though bugs are the bane of my existence, rest assured the wretched thing will get the best of care here

28 Sep, 2018 31 commits
- Merge branch 'Develop' · a10dd2de
  Max Chervatiuk authored Sep 28, 2018
```
# Conflicts:
#	app/src/main/res/values/strings.xml
```
  a10dd2de
- Merge remote-tracking branch 'origin/NY-4007' into Develop · a0b64df1
  Max Chervatiuk authored Sep 28, 2018
  
  a0b64df1
- Merge remote-tracking branch 'origin/NY-3986' into Develop · a4aaea6b
  Max Chervatiuk authored Sep 28, 2018
  
  a4aaea6b
- Merge remote-tracking branch 'origin/Develop' into NY-4007 · 81b3d17e
  Alexey Shishov authored Sep 28, 2018
```
# Conflicts:
#	app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ChatPresenter.java
```
  81b3d17e
- optimize mention · a4d384da
  Rusakov.Sergii.Dev authored Sep 28, 2018
  
  a4d384da
- NY-4007 Fixed bug for iOS · 881643c5
  Alexey Shishov authored Sep 28, 2018
  
  881643c5
- NY-4007 Fixed bug for iOS · bf576867
  Alexey Shishov authored Sep 28, 2018
  
  bf576867
- Merge remote-tracking branch 'origin/NY-3986' into Develop · 97fd211d
  Max Chervatiuk authored Sep 28, 2018
  
  97fd211d
- Merge branches 'Develop' and 'NY-3986' of https://github.com/NYNJA-MC/Android into NY-3986 · 62ac9b2d
  Rusakov.Sergii.Dev authored Sep 28, 2018
  
  62ac9b2d
- optimize mention · b10029e8
  Rusakov.Sergii.Dev authored Sep 28, 2018
  
  b10029e8
- optimize mention · 0965457c
  Rusakov.Sergii.Dev authored Sep 28, 2018
  
  0965457c
- Merge remote-tracking branch 'origin/NY-3997' into Develop · 8d59ccd9
  Max Chervatiuk authored Sep 28, 2018
  
  8d59ccd9
- NY-3997 Filter online status changing to show 1 in 0.5 sec · ea1d1354
  Roman Voronoy authored Sep 28, 2018
  
  ea1d1354
- NY-3997 Filter online status changing to show 1 in 0.5 sec · 2da23fec
  Roman Voronoy authored Sep 28, 2018
  
  2da23fec
- Merge remote-tracking branch 'origin/Develop' into Develop · ec9e686a
  Roman Voronoy authored Sep 28, 2018
  
  ec9e686a
- Merge branch 'Develop' of https://github.com/NYNJA-MC/Android into Develop · 951d7ddb
  Alexey Shishov authored Sep 28, 2018
  
  951d7ddb
- Merge remote-tracking branch 'origin/dev_test_fix_message_random_utils' into Develop · e8f30843
  Max Chervatiuk authored Sep 28, 2018
  
  e8f30843
- Merge remote-tracking branch 'origin/NY-3990' into Develop · 3a3f2ab4
  Max Chervatiuk authored Sep 28, 2018
  
  3a3f2ab4
- Merge remote-tracking branch 'origin/dev_translate_string' into Develop · 14f46942
  Max Chervatiuk authored Sep 28, 2018
  
  14f46942
- Merge remote-tracking branch 'origin/NY-3984' into Develop · 9b0b9585
  Max Chervatiuk authored Sep 28, 2018
  
  9b0b9585
- Merge remote-tracking branch 'origin/NY-3983' into Develop · e58b10eb
  Max Chervatiuk authored Sep 28, 2018
  
  e58b10eb
- Try to fix random method · 7c29028e
  dmitrylashin authored Sep 28, 2018
  
  7c29028e
- NY-3990 Camera settings UI fix · 2ed24b49
  Roman Voronoy authored Sep 28, 2018
  
  2ed24b49
- Try to fix random method · 13fe6837
  dmitrylashin authored Sep 28, 2018
  
  13fe6837
- Translate xml string · d59865e6
  Alexey Shishov authored Sep 28, 2018
  
  d59865e6
- used get Sort Id for sort messages · 6c67ae90
  Stas Safyanov authored Sep 28, 2018
  
  6c67ae90
- refactored tests · c956a81b
  Stas Safyanov authored Sep 28, 2018
  
  c956a81b
- Merge remote-tracking branch 'origin/Develop' into Develop · d8b51131
  Roman Voronoy authored Sep 28, 2018
  
  d8b51131
- NY-3984 fixed crash on empty myself chat · a6cecba8
  Stas Safyanov authored Sep 28, 2018
  
  a6cecba8
- Merge branches 'Develop' and 'NY-3983' of https://github.com/NYNJA-MC/Android into NY-3983 · 89e8985d
  Stas Safyanov authored Sep 28, 2018
  
  89e8985d
- NY-3983 fixed update reader on clear messages, return sort messages by serverid in chat · 60e5a99e
  Stas Safyanov authored Sep 28, 2018
  
  60e5a99e
27 Sep, 2018 9 commits
- Try to fix random method · efd2e98f
  dmitrylashin authored Sep 27, 2018
  
  efd2e98f
- Merge branch 'Develop' · 51d2562b
  Max Chervatiuk authored Sep 27, 2018
```
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/nynja/mobile/communicator/data/DataManager.java
#	app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ConferenceCallPresenter.java
```
  51d2562b
- Merge branch 'Develop' of https://github.com/NYNJA-MC/Android into Develop · f6e1e781
  Alexey Shishov authored Sep 27, 2018
  
  f6e1e781
- Merge branch 'Develop' of https://github.com/NYNJA-MC/Android into... · 5a7ea95f
  dmitrylashin authored Sep 27, 2018
```
Merge branch 'Develop' of https://github.com/NYNJA-MC/Android into dev_test_fix_message_random_utils
```
  5a7ea95f
- ignore test · ac5280fb
  Max Chervatiuk authored Sep 27, 2018
  
  ac5280fb
- Merge remote-tracking branch 'origin/Develop' into Develop · 56b08897
  Roman Voronoy authored Sep 27, 2018
  
  56b08897
- Merge remote-tracking branch 'origin/Develop' into Develop · 3114c84f
  Stas Safyanov authored Sep 27, 2018
  
  3114c84f
- Merge remote-tracking branch 'origin/NY-3542' into Develop · d4c2645d
  Max Chervatiuk authored Sep 27, 2018
  
  d4c2645d
- NY-3542 Fixed bug with dialog coming soon · dd99b49f
  Alexey Shishov authored Sep 27, 2018
  
  dd99b49f