Commits · v0.0.0.108_11 · Confidential and Proprietary / NYNJA / Android

30 Jan, 2018 20 commits
- Merge remote-tracking branch 'origin/#975' into dev · 81b78ae4
  Max Chervatiuk authored Jan 30, 2018
  
  81b78ae4
- fixed kick group · df271879
  Stas Safyanov authored Jan 30, 2018
  
  df271879
- Merge remote-tracking branch 'origin/new_logic_for_scheduled_messages' into dev · 63dc0fda
  Max Chervatiuk authored Jan 30, 2018
  
  63dc0fda
- changed app version · 5d2691b7
  Max Chervatiuk authored Jan 30, 2018
  
  5d2691b7
- fixed #1346 · dc13345f
  Max Chervatiuk authored Jan 30, 2018
  
  dc13345f
- Fixed bug with deleted message · 561fe7ea
  Alexey Shishov authored Jan 30, 2018
  
  561fe7ea
- Merge branch 'dev' into new_logic_for_scheduled_messages · 89fd31d5
  Alexey Shishov authored Jan 30, 2018
```
# Conflicts:
#	app/src/main/java/com/nynja/mobile/communicator/data/DataManager.java
#	app/src/main/java/com/nynja/mobile/communicator/data/db/DbHelper.java
```
  89fd31d5
- fixed #1334 · 7497f91c
  Max Chervatiuk authored Jan 30, 2018
  
  7497f91c
- Merge remote-tracking branch 'origin/#1312' into dev · bb62b8ad
  Max Chervatiuk authored Jan 30, 2018
  
  bb62b8ad
- refactoring · aca1310a
  Stas Safyanov authored Jan 30, 2018
  
  aca1310a
- changed app version · 286a1b75
  Max Chervatiuk authored Jan 30, 2018
  
  286a1b75
- Merge remote-tracking branch 'origin/release_106' into dev · a20cba36
  Max Chervatiuk authored Jan 30, 2018
```
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/nynja/mobile/communicator/data/DataManager.java
```
  a20cba36
- fixed descs. · a3732f74
  BoykoDmytro authored Jan 30, 2018
  
  a3732f74
- fixed UI for chat and chat rules · e5fd5e29
  Stas Safyanov authored Jan 30, 2018
  
  e5fd5e29
- changed connection version · 74b85590
  Max Chervatiuk authored Jan 30, 2018
  
  74b85590
- added testFairy logs, · 64a80454
  Max Chervatiuk authored Jan 30, 2018
```
refactoring
```
  64a80454
- Merge remote-tracking branch 'origin/#1302' into dev · ec2cce1f
  Max Chervatiuk authored Jan 30, 2018
  
  ec2cce1f
- add logs. · 1a660c49
  BoykoDmytro authored Jan 30, 2018
  
  1a660c49
- fixed desc ID, add logs. · 517e0711
  BoykoDmytro authored Jan 30, 2018
  
  517e0711
- fixed local statuses for messages, added logo · e39582da
  Stas Safyanov authored Jan 30, 2018
  
  e39582da
29 Jan, 2018 8 commits
- update version, fixed wheel selection. · 76d3dfc6
  BoykoDmytro authored Jan 29, 2018
  
  76d3dfc6
- Merge branch 'dev' into #1258 · 1fdd7623
  Alexey Shishov authored Jan 29, 2018
```
# Conflicts:
#	app/src/main/java/com/nynja/mobile/communicator/mvp/view/UserProfileView.kt
#	app/src/main/java/com/nynja/mobile/communicator/ui/fragments/profile/UserProfileFragment.java
```
  1fdd7623
- #1258 Fixed bug with scrolling. · 1383bebb
  Alexey Shishov authored Jan 29, 2018
  
  1383bebb
- new logic for scheduled messages. · 9633c001
  BoykoDmytro authored Jan 29, 2018
  
  9633c001
- Merge remote-tracking branch 'origin/#975' into dev · 6d0a0e9a
  BoykoDmytro authored Jan 29, 2018
  
  6d0a0e9a
- Merge remote-tracking branch 'origin/#1068' into dev · 1916735f
  BoykoDmytro authored Jan 29, 2018
  
  1916735f
- fixed group list · a2f30f34
  Stas Safyanov authored Jan 29, 2018
  
  a2f30f34
- fixed chat UI for removed users · 76241789
  Stas Safyanov authored Jan 29, 2018
  
  76241789
26 Jan, 2018 12 commits
- changed app version · 1af7c418
  Max Chervatiuk authored Jan 26, 2018
  
  1af7c418
- fixed merge issue · 1d24c5f5
  Max Chervatiuk authored Jan 26, 2018
  
  1d24c5f5
- Merge remote-tracking branch 'origin/fixed_keyboard' into dev · d86d51f6
  Max Chervatiuk authored Jan 26, 2018
  
  d86d51f6
- Merge remote-tracking branch 'origin/#1099' into dev · 610ca843
  Max Chervatiuk authored Jan 26, 2018
  
  610ca843
- fixed schedule msg crash, · 619a32b9
  Max Chervatiuk authored Jan 26, 2018
```
changed app version.
```
  619a32b9
- fixed keyboard issue on login screens. · a45d1040
  BoykoDmytro authored Jan 26, 2018
  
  a45d1040
- #1099 Fixed bug with clear history · 972e2e89
  Alexey Shishov authored Jan 26, 2018
  
  972e2e89
- changed app version · 1210d4c6
  Max Chervatiuk authored Jan 26, 2018
  
  1210d4c6
- changed app version · 61266c05
  Max Chervatiuk authored Jan 26, 2018
  
  61266c05
- Merge remote-tracking branch 'origin/#cursor_bug' into dev · 622c96ad
  Max Chervatiuk authored Jan 26, 2018
  
  622c96ad
- changed app version · e5f13d8c
  Max Chervatiuk authored Jan 26, 2018
  
  e5f13d8c
- fixed send cursor · 73afc3af
  Stas Safyanov authored Jan 26, 2018
  
  73afc3af