Commits · v0.10.1 · Confidential and Proprietary / NYNJA / server

17 Sep, 2018 2 commits
- Merge remote-tracking branch 'origin/reply_link_3456' into dev · 64b7e752
  Dmitro Boiko authored Sep 17, 2018
  
  64b7e752
- Merge remote-tracking branch 'origin/broke_roster' into dev · c97564a9
  Dmitro Boiko authored Sep 17, 2018
  
  c97564a9
14 Sep, 2018 2 commits
- fix abilty to broke roster #3560 · 17c2e99b
  cryoflamer authored Sep 14, 2018
  
  17c2e99b
- upd test "Ability to Broke Roster" #3560 · 747b1df6
  cryoflamer authored Sep 14, 2018
  
  747b1df6
13 Sep, 2018 5 commits
- add roster:link_msg #3470 · 1fb12b67
  cryoflamer authored Sep 13, 2018
  
  1fb12b67
- add roster:sync_indexes #3511 · ea275af1
  cryoflamer authored Sep 13, 2018
  
  ea275af1
- upd tests for reply messages #3470 · 0613df28
  cryoflamer authored Sep 13, 2018
  
  0613df28
- upd reply message handler #3470 · 756d7166
  cryoflamer authored Sep 13, 2018
  
  756d7166
- fix reply msg if replied message is system #3470 · 5a78e1ab
  cryoflamer authored Sep 13, 2018
  
  5a78e1ab
12 Sep, 2018 2 commits
- remove unused indexes · 02bba87f
  cryoflamer authored Sep 12, 2018
  
  02bba87f
- upd message sending · 8f00e326
  cryoflamer authored Sep 12, 2018
  
  8f00e326
11 Sep, 2018 2 commits
- upd test for reply link #3456 · a753da24
  cryoflamer authored Sep 11, 2018
  
  a753da24
- set reply link as Message model for sent message · 49949a95
  cryoflamer authored Sep 11, 2018
  
  49949a95
10 Sep, 2018 1 commit
- Update protocol version to 9 (#3388) · 7fd0e499
  ne-luboff authored Sep 10, 2018
  
  7fd0e499
07 Sep, 2018 13 commits
- Merge branch 'dev' of https://github.com/NYNJA-MC/server into refactor · 9a41738d
  ne-luboff authored Sep 07, 2018
  
  9a41738d
- Merge branch 'dev' of https://github.com/NYNJA-MC/server into dev_push · fc9c7e9a
  ne-luboff authored Sep 07, 2018
  
  fc9c7e9a
- fix roster_test:test_multi_muc/0 · 9ca84c49
  cryoflamer authored Sep 07, 2018
  
  9ca84c49
- Fix merge conflict with dev (#3389) · c02a531d
  ne-luboff authored Sep 07, 2018
  
  c02a531d
- Fix merge conflict with dev (#3389) · c7be07b8
  ne-luboff authored Sep 07, 2018
  
  c7be07b8
- Merge branch 'dev_ban_bug' into dev · a4b5c682
  cryoflamer authored Sep 07, 2018
```
# Conflicts:
#	apps/roster/priv/macbert/json-bert.js
#	apps/roster/src/protocol/roster_history.erl
#	apps/roster/src/protocol/roster_message.erl
#	apps/roster/src/roster.erl
```
  a4b5c682
- Merge branch 'dev_merge_reply2' into dev_ban_bug · 6ac2dfc2
  cryoflamer authored Sep 07, 2018
```
# Conflicts:
#	apps/roster/src/protocol/roster_history.erl
#	apps/roster/src/protocol/roster_message.erl
```
  6ac2dfc2
- upd delete history merge · 5ac5b5f9
  cryoflamer authored Sep 07, 2018
  
  5ac5b5f9
- Merge branch 'dev' into dev_ban_bug · 5ca494d5
  cryoflamer authored Sep 07, 2018
```
# Conflicts:
#	apps/roster/src/protocol/roster_history.erl
#	apps/roster/src/protocol/roster_message.erl
```
  5ca494d5
- Fix merge conflict with dev (#3389) · a2729cb3
  ne-luboff authored Sep 07, 2018
  
  a2729cb3
- Delete records (CDR, Loc, Call, CallMember), delete module roster_loc.erl,... · f381673b
  ne-luboff authored Sep 07, 2018
```
Delete records (CDR, Loc, Call, CallMember), delete module roster_loc.erl, delete Call and CallMember references (#3387)
```
  f381673b
- upd prettify delete history · 946df937
  cryoflamer authored Sep 07, 2018
  
  946df937
- Fix merge conflict with local dev branch. Comment sync push sending · 7c0baa5d
  ne-luboff authored Sep 07, 2018
  
  7c0baa5d
06 Sep, 2018 3 commits
- upd delete history · 4189acad
  cryoflamer authored Sep 06, 2018
  
  4189acad
- upd history update and delete · 4427dcad
  cryoflamer authored Sep 06, 2018
  
  4427dcad
- add json-bert file. · a3846db7
  Dmitro Boiko authored Sep 06, 2018
  
  a3846db7
05 Sep, 2018 10 commits
- return permission denied if member is removed from room · d884c0e2
  cryoflamer authored Sep 05, 2018
  
  d884c0e2
- if feed type is muc and "to" field is empty then "to" field is replaced to room name from feed · bcc1ea30
  cryoflamer authored Sep 05, 2018
  
  bcc1ea30
- use roster:phone_id/2 in roster_message module · 673e0e19
  cryoflamer authored Sep 05, 2018
  
  673e0e19
- upd roster:phone_id/2 for system bpe client · 268d865a
  cryoflamer authored Sep 05, 2018
  
  268d865a
- forbidden of the ability to send messages if the contact status is not "friend" · d6acc10a
  cryoflamer authored Sep 05, 2018
  
  d6acc10a
- fix the ability to send messages to a banned user · 705d757b
  cryoflamer authored Sep 05, 2018
  
  705d757b
- add test for the ability to send messages to a banned user · bcfc3066
  cryoflamer authored Sep 05, 2018
  
  bcfc3066
- upd roster_message for send message · 7e05b6f3
  cryoflamer authored Sep 05, 2018
  
  7e05b6f3
- remove unused record #desc{} · 25579db0
  cryoflamer authored Sep 05, 2018
  
  25579db0
- Merge branch 'dev_reply2' into dev2 · df2d6276
  cryoflamer authored Sep 05, 2018
```
# Conflicts:
#	apps/roster/priv/macbert/json-bert.js
#	apps/roster/src/protocol/roster_history.erl
```
  df2d6276