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

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 11 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
- Merge branch 'dev_devops' into dev · dce25070
  Dmitro Boiko authored Sep 05, 2018
  
  dce25070
04 Sep, 2018 9 commits
- add json-bert file, add tests for transcribe. · 2e7c660e
  Dmitro Boiko authored Sep 04, 2018
  
  2e7c660e
- Merge branch 'dev_history_update' into dev · cf9018a3
  Dmitro Boiko authored Sep 04, 2018
```
# Conflicts:
#	apps/roster/src/roster.erl
```
  cf9018a3
- Allow traffic to the API port 8888 · 10888a52
  Nicolas Berthet authored Aug 31, 2018
```
(cherry picked from commit 8ed2905)
```
  10888a52
- Add Helm chart & production config for the VM deployment · 5067869c
  Nicolas Berthet authored Aug 31, 2018
```
(cherry picked from commit ab4daae)
```
  5067869c
- Merge branch 'dev_tests' into dev_reply2 · a297594f
  cryoflamer authored Sep 04, 2018
  
  a297594f
- NY-3250 - fixed bug with translate/transcribe, add test for translate/transcribe by two users. · c0379486
  Dmitro Boiko authored Sep 04, 2018
  
  c0379486
- Merge branch 'dev_tests' into dev_reply2 · 88454161
  cryoflamer authored Sep 04, 2018
```
# Conflicts:
#	apps/roster/src/protocol/roster_message.erl
#	apps/roster/src/protocol/roster_roster.erl
#	apps/roster/src/roster.erl
#	apps/roster/src/roster_data.erl
```
  88454161
- add test for multisession room subscribe if member was removed #3252 · d958e98c
  cryoflamer authored Sep 04, 2018
  
  d958e98c
- fix removed room member subscribe on a new session #3253 · 6ee51ebb
  cryoflamer authored Sep 04, 2018
  
  6ee51ebb
03 Sep, 2018 1 commit
- fix roster patch #3221, #3222 · 155917d0
  cryoflamer authored Sep 03, 2018
  
  155917d0
31 Aug, 2018 2 commits
- remove unused record desc · 3f371d86
  cryoflamer authored Aug 31, 2018
  
  3f371d86
- add messsage type verify · 28ead27a
  cryoflamer authored Aug 31, 2018
  
  28ead27a