Commits · v0.2.5 · 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

27 Sep, 2018 24 commits
- 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
- ignore test · ac5280fb
  Max Chervatiuk authored Sep 27, 2018
  
  ac5280fb
- 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
- NY-3542 Fixed bug with dialog coming soon · 71b1db7e
  Alexey Shishov authored Sep 27, 2018
  
  71b1db7e
- Merge remote-tracking branch 'origin/new_parser' into Develop · a1406ded
  Max Chervatiuk authored Sep 27, 2018
```
# Conflicts:
#	app/src/test/java/com/nynja/mobile/parser/BaseParserTest.kt
```
  a1406ded
- refactoring · aeb6da92
  Max Chervatiuk authored Sep 27, 2018
  
  aeb6da92
- Merge remote-tracking branch 'origin/dev_test_new_reader' into Develop · 8a15aa0e
  Max Chervatiuk authored Sep 27, 2018
  
  8a15aa0e
- Merge remote-tracking branch 'origin/NY-3933' into Develop · fc2964b6
  Max Chervatiuk authored Sep 27, 2018
  
  fc2964b6
- Merge remote-tracking branch 'origin/NY-3927' into Develop · 8bf0a1d5
  Max Chervatiuk authored Sep 27, 2018
  
  8bf0a1d5
- Merge remote-tracking branch 'origin/NY-3908' into Develop · 184be928
  Max Chervatiuk authored Sep 27, 2018
  
  184be928
- Merge remote-tracking branch 'origin/NY-3847' into Develop · 73815d40
  Max Chervatiuk authored Sep 27, 2018
  
  73815d40
- Merge remote-tracking branch 'origin/NY-3896' into Develop · bf6b5471
  Max Chervatiuk authored Sep 27, 2018
  
  bf6b5471
- Merge remote-tracking branch 'origin/dev_test_fix_message_random_utils' into Develop · f9e52f46
  Max Chervatiuk authored Sep 27, 2018
  
  f9e52f46
- Merge remote-tracking branch 'origin/NY-3901' into Develop · 767b761d
  Max Chervatiuk authored Sep 27, 2018
  
  767b761d
- Merge remote-tracking branch 'origin/NY-3861' into Develop · d4572b6e
  Max Chervatiuk authored Sep 27, 2018
  
  d4572b6e
- swap parser · 6c76e9b0
  Max Chervatiuk authored Sep 27, 2018
  
  6c76e9b0
- implemented second parser · 1fbb1fc2
  Max Chervatiuk authored Sep 27, 2018
  
  1fbb1fc2
- NY-3933 Change to not implementr · b60c69e8
  Alexey Shishov authored Sep 27, 2018
  
  b60c69e8
- NY-2283 Fixed bug with test · 14acd2f6
  Alexey Shishov authored Sep 27, 2018
  
  14acd2f6
- NY-3901 added check for connection to server · bd9d4748
  Stas Safyanov authored Sep 27, 2018
  
  bd9d4748
- NY-3901 fixed scroll to down on new unread messages · 5131828e
  Stas Safyanov authored Sep 27, 2018
  
  5131828e
- NY-3901 fixed send cursor on sys messages, refactoring · 69780036
  Stas Safyanov authored Sep 27, 2018
  
  69780036
- NY-3901 fixed update reader on chat · 970baaec
  Stas Safyanov authored Sep 27, 2018
  
  970baaec
26 Sep, 2018 13 commits
- NY-3933 Disabled channels · 0993efc9
  Alexey Shishov authored Sep 26, 2018
  
  0993efc9
- NY-3927 Fixed bug with preview reply message on chat list · 1ee9eed7
  Alexey Shishov authored Sep 26, 2018
  
  1ee9eed7
- improve parser · f157d0f3
  Max Chervatiuk authored Sep 26, 2018
  
  f157d0f3
- NY-3908 fixing crash on API19 · 28557517
  dmitrylashin authored Sep 26, 2018
  
  28557517
- NY-3908 fixing crash on API19 · 22c0b11d
  dmitrylashin authored Sep 26, 2018
  
  22c0b11d
- NY-3847 Fixed bug with history · 4d2eafa1
  Alexey Shishov authored Sep 26, 2018
  
  4d2eafa1
- Merge branch 'Develop' of https://github.com/NYNJA-MC/Android into Develop · f607fed7
  Alexey Shishov authored Sep 26, 2018
  
  f607fed7
- NY-3901 added save reader for members on saving message · 4b989968
  Stas Safyanov authored Sep 26, 2018
  
  4b989968
- NY-3896 Checking the time of sending messages for the schedule has been added · bae08f49
  Alexey Shishov authored Sep 26, 2018
  
  bae08f49
- Merge branch 'Develop' of https://github.com/NYNJA-MC/Android into Develope · 743f7366
  dmitrylashin authored Sep 26, 2018
  
  743f7366
- Merge branches 'Develop' and 'dev_test_fix_message_random_utils' of... · f72ba7f4
  dmitrylashin authored Sep 26, 2018
```
Merge branches 'Develop' and 'dev_test_fix_message_random_utils' of https://github.com/NYNJA-MC/Android into dev_test_fix_message_random_utils
```
  f72ba7f4
- Fixed method for creating random feature · f8569f17
  dmitrylashin authored Sep 26, 2018
  
  f8569f17
- added new parser · b858d387
  Max Chervatiuk authored Sep 26, 2018
  
  b858d387
25 Sep, 2018 3 commits
- Merge branches 'Develop' and 'NY-3901' of https://github.com/NYNJA-MC/Android into NY-3901 · eb8a8d74
  Stas Safyanov authored Sep 25, 2018
  
  eb8a8d74
- remove logs · a049d769
  Stas Safyanov authored Sep 25, 2018
  
  a049d769
- Merge remote-tracking branch 'origin/NY-3902' into Develop · 68e93ad3
  Max Chervatiuk authored Sep 25, 2018
  
  68e93ad3