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

23 Oct, 2018 3 commits
- Merge remote-tracking branch 'origin/hot_fix_own_contact' into Develop · f6ffa5f3
  Max Chervatiuk authored Oct 23, 2018
  
  f6ffa5f3
- changed flavor name · ceb2dd88
  Max Chervatiuk authored Oct 23, 2018
  
  ceb2dd88
- fix crash · b4046431
  Rusakov.Sergii.Dev authored Oct 23, 2018
  
  b4046431
22 Oct, 2018 1 commit
- Merge branch 'Develop' of https://github.com/NYNJA-MC/Android into Develop · f179f1d7
  Rusakov.Sergii.Dev authored Oct 22, 2018
  
  f179f1d7
19 Oct, 2018 1 commit
- NY-4263 fixed audio player issue · 46cfdfcd
  Max Chervatiuk authored Oct 19, 2018
  
  46cfdfcd
18 Oct, 2018 16 commits
- fix bug · 8f5d2cd0
  Rusakov.Sergii.Dev authored Oct 18, 2018
  
  8f5d2cd0
- Merge branch 'Develop' of https://github.com/NYNJA-MC/Android into Develop · df673390
  Rusakov.Sergii.Dev authored Oct 18, 2018
  
  df673390
- Merge remote-tracking branch 'origin/NY-4324' into Develop · f0a8d4cb
  Max Chervatiuk authored Oct 18, 2018
  
  f0a8d4cb
- NY-4437 fixed logic · 709fd4bc
  Stas Safyanov authored Oct 18, 2018
  
  709fd4bc
- Merge branch 'Develop' of https://github.com/NYNJA-MC/Android into Develop · 2c72f16c
  Rusakov.Sergii.Dev authored Oct 18, 2018
  
  2c72f16c
- Merge remote-tracking branch 'origin/NY-1595' into Develop · 39237f92
  Max Chervatiuk authored Oct 18, 2018
  
  39237f92
- Merge remote-tracking branch 'origin/NY-2171' into Develop · 61c34090
  Max Chervatiuk authored Oct 18, 2018
```
# Conflicts:
#	app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ChatPresenter.java
```
  61c34090
- update code by pr · 6678c608
  Rusakov.Sergii.Dev authored Oct 18, 2018
  
  6678c608
- update code by pr · bb9bc39c
  Rusakov.Sergii.Dev authored Oct 18, 2018
  
  bb9bc39c
- Merge remote-tracking branch 'origin/NY-4263' into Develop · e7bc1fbf
  Max Chervatiuk authored Oct 18, 2018
  
  e7bc1fbf
- Merge remote-tracking branch 'origin/NY-4344' into Develop · 27941d7d
  Max Chervatiuk authored Oct 18, 2018
```
# Conflicts:
#	app/src/main/java/com/nynja/mobile/communicator/data/DataManager.java
```
  27941d7d
- Merge remote-tracking branch 'origin/NY-4242' into Develop · 79a236ea
  Max Chervatiuk authored Oct 18, 2018
```
# Conflicts:
#	app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ChatPresenter.java
```
  79a236ea
- Merge remote-tracking branch 'origin/NY-4412' into Develop · c3f52e1c
  Max Chervatiuk authored Oct 18, 2018
  
  c3f52e1c
- Merge remote-tracking branch 'origin/NY-4337' into Develop · 385d7ee3
  Max Chervatiuk authored Oct 18, 2018
  
  385d7ee3
- NY-4324 fixed delete username · d5b545fd
  Stas Safyanov authored Oct 18, 2018
  
  d5b545fd
- NY-4263 fixed when outgoing message was sent from the same chat Play/ Stop... · 19d9a13d
  dmitrylashin authored Oct 18, 2018
```
NY-4263 fixed when outgoing message was sent from the same chat Play/ Stop button has the same state in both messages
```
  19d9a13d
17 Oct, 2018 3 commits
- fixed · 5153b2f1
  Rusakov.Sergii.Dev authored Oct 17, 2018
  
  5153b2f1
- fixed · 5f8ee103
  Rusakov.Sergii.Dev authored Oct 17, 2018
  
  5f8ee103
- NY-2171 fixed status on header in chat · b99a65d3
  Stas Safyanov authored Oct 17, 2018
  
  b99a65d3
16 Oct, 2018 6 commits
- total unread count fix · dab57895
  Rusakov.Sergii.Dev authored Oct 16, 2018
  
  dab57895
- NY-4242 fixed crash, added dialogs · 2a627980
  Max Chervatiuk authored Oct 16, 2018
  
  2a627980
- NY-4412 fixed send alias on server on creating group / adding members · 7505bb93
  Stas Safyanov authored Oct 16, 2018
  
  7505bb93
- Merge branch 'Develop' of https://github.com/NYNJA-MC/Android into NY-4344 · 1425aab2
  Rusakov.Sergii.Dev authored Oct 16, 2018
  
  1425aab2
- update by pr context · 53bc807f
  Rusakov.Sergii.Dev authored Oct 16, 2018
  
  53bc807f
- refactoring · aaffec17
  Stas Safyanov authored Oct 16, 2018
  
  aaffec17
12 Oct, 2018 10 commits
- NY-4337 fixed group counter in chat · ae16dfab
  Stas Safyanov authored Oct 12, 2018
  
  ae16dfab
- NY-4381 fixed android sends incorrect data on adding person to group · 614377f6
  dmitrylashin authored Oct 12, 2018
  
  614377f6
- Merge remote-tracking branch 'origin/Develop' into Develop · ed06e5ca
  Stas Safyanov authored Oct 12, 2018
  
  ed06e5ca
- Merge branch 'Develop' of https://github.com/NYNJA-MC/Android into Develope · 332714b8
  dmitrylashin authored Oct 12, 2018
  
  332714b8
- Merge remote-tracking branch 'origin/NY-4241' into Develop · 6861dbe8
  Max Chervatiuk authored Oct 12, 2018
  
  6861dbe8
- Merge remote-tracking branch 'origin/fix_migration' into Develop · 6ffa52b1
  Max Chervatiuk authored Oct 12, 2018
  
  6ffa52b1
- fixed test · ceb618c9
  Max Chervatiuk authored Oct 12, 2018
  
  ceb618c9
- Merge branches 'Develop' and 'fix_migration' of... · d7b299db
  Stas Safyanov authored Oct 12, 2018
```
Merge branches 'Develop' and 'fix_migration' of https://github.com/NYNJA-MC/Android into fix_migration
```
  d7b299db
- fixed migration · 43e93eec
  Stas Safyanov authored Oct 12, 2018
  
  43e93eec
- updated repositories · 15c791ec
  Max Chervatiuk authored Oct 12, 2018
  
  15c791ec