Commits · v0.0.0.92_9 · Confidential and Proprietary / NYNJA / Android

12 Jan, 2018 10 commits
- changed app version code · 6ef98b21
  Max Chervatiuk authored Jan 12, 2018
  
  6ef98b21
- changed app version · c1fcf4e4
  Max Chervatiuk authored Jan 12, 2018
  
  c1fcf4e4
- Merge remote-tracking branch 'origin/#1043' into dev · 0979dc60
  Max Chervatiuk authored Jan 12, 2018
  
  0979dc60
- #1043 fixed get replied message · 33443487
  Stas Safyanov authored Jan 12, 2018
  
  33443487
- #1043 fixed get and update message · aa55468b
  Stas Safyanov authored Jan 12, 2018
  
  aa55468b
- changed app version · 9939434d
  Max Chervatiuk authored Jan 12, 2018
  
  9939434d
- #1041, #1047 fixed bubbles for text chat items, #1042 fixed add history to top... · cabe4a4c
  Stas Safyanov authored Jan 12, 2018
```
#1041, #1047 fixed bubbles for text chat items, #1042 fixed add history to top of messages, #1043 fixed sent cursor on replied message
```
  cabe4a4c
- changed app version · 3b3c844a
  Max Chervatiuk authored Jan 12, 2018
  
  3b3c844a
- fixed item my message · 07a6fa54
  Stas Safyanov authored Jan 12, 2018
  
  07a6fa54
- fixed merge · 8e36a60f
  Stas Safyanov authored Jan 12, 2018
  
  8e36a60f
11 Jan, 2018 24 commits
- Merge remote-tracking branch 'origin/#784_new_replies_view' into dev · 321e959c
  BoykoDmytro authored Jan 11, 2018
```
# Conflicts:
#	app/src/main/res/layout/li_chat_my_audio_message.xml
```
  321e959c
- Merge remote-tracking branch 'origin/#970' into dev · 368c7835
  BoykoDmytro authored Jan 11, 2018
  
  368c7835
- #784 Implemented new view for replies · 92dd14a1
  Alexey Shishov authored Jan 11, 2018
  
  92dd14a1
- Merge branch 'dev' into #1002 · 001ca787
  Stas Safyanov authored Jan 11, 2018
  
  001ca787
- fixed chat items · db451d3b
  Stas Safyanov authored Jan 11, 2018
  
  db451d3b
- #970 Implemented logic navigate to chat from starred list · ae3e753f
  Alexey Shishov authored Jan 11, 2018
  
  ae3e753f
- Merge remote-tracking branch 'origin/#480_fixed_crash' into dev · 7bab1c60
  BoykoDmytro authored Jan 11, 2018
  
  7bab1c60
- Merge remote-tracking branch 'origin/#1004' into dev · 7df3f3a6
  BoykoDmytro authored Jan 11, 2018
  
  7df3f3a6
- Merge remote-tracking branch 'origin/#986' into dev · 7c3d26c6
  BoykoDmytro authored Jan 11, 2018
  
  7c3d26c6
- Merge remote-tracking branch 'origin/#1001' into dev · f4d258d1
  BoykoDmytro authored Jan 11, 2018
```
# Conflicts:
#	app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ChatPresenter.java
```
  f4d258d1
- Merge branch '#975' into #1002 · c0575414
  Stas Safyanov authored Jan 11, 2018
  
  c0575414
- optimize db queries on get messages · 84db6f5f
  Stas Safyanov authored Jan 11, 2018
  
  84db6f5f
- Merge branch 'dev' into #970 · e1b3a32b
  Alexey Shishov authored Jan 11, 2018
  
  e1b3a32b
- #1004 Fixed bug with clearing history · a701bb49
  Alexey Shishov authored Jan 11, 2018
  
  a701bb49
- fixed audio / file chat items · 72c54cbd
  Stas Safyanov authored Jan 11, 2018
  
  72c54cbd
- fixed permissions check for honor. · d1257204
  BoykoDmytro authored Jan 11, 2018
  
  d1257204
- #480 Fixed crash on reply list · e71fb6da
  Alexey Shishov authored Jan 11, 2018
  
  e71fb6da
- fixed bug with call without internet connection. · 53d06cba
  BoykoDmytro authored Jan 11, 2018
  
  53d06cba
- Merge remote-tracking branch 'origin/#1000' into dev · 647a95bb
  Max Chervatiuk authored Jan 11, 2018
  
  647a95bb
- #785 fixed bug with context menu · 14aeb98b
  Alexey Shishov authored Jan 11, 2018
  
  14aeb98b
- #1000 fixed left and delete · ba6a14f5
  Stas Safyanov authored Jan 11, 2018
  
  ba6a14f5
- Merge branch 'dev' into #975 · 8940b67d
  Stas Safyanov authored Jan 11, 2018
```
# Conflicts:
#	app/src/main/java/com/nynja/mobile/communicator/data/DataManager.java
```
  8940b67d
- tmp · 5f582c96
  Alexey Shishov authored Jan 11, 2018
  
  5f582c96
- fixed save left members · b4eb9e1e
  Stas Safyanov authored Jan 11, 2018
  
  b4eb9e1e
10 Jan, 2018 6 commits
- fixed reply. · 2f80aee5
  BoykoDmytro authored Jan 10, 2018
  
  2f80aee5
- Merge branch 'dev' into #970 · 5eaa5526
  Alexey Shishov authored Jan 10, 2018
  
  5eaa5526
- tmp · 658cd121
  Alexey Shishov authored Jan 10, 2018
  
  658cd121
- Merge remote-tracking branch 'origin/#879' into dev · ff4416b6
  Max Chervatiuk authored Jan 10, 2018
  
  ff4416b6
- #975 implemented behavior for removed chats, added system message · c94e051e
  Stas Safyanov authored Jan 10, 2018
  
  c94e051e
- #999 fixed NPE · 818e6357
  Max Chervatiuk authored Jan 10, 2018
  
  818e6357