From 1f2b0b4b8816de46c12b092b69eea7fd06829252 Mon Sep 17 00:00:00 2001 From: qomputer Date: Wed, 27 Sep 2017 14:35:05 +0300 Subject: [PATCH 1/6] Add new cursor --- MnesiaCore.mq@127.0.0.1_1504_627676_166154 | Bin 0 -> 224741 bytes apps/rebar.config | 2 - apps/roster/include/roster.hrl | 97 + .../priv/macbert.xcodeproj/project.pbxproj | 152 +- apps/roster/priv/macbert/JSEnc/json-bert.js | 955 -- apps/roster/priv/macbert/Model/Auth.swift | 16 - apps/roster/priv/macbert/Model/CDR.swift | 13 - apps/roster/priv/macbert/Model/Contact.swift | 15 - apps/roster/priv/macbert/Model/Cursor.swift | 6 - apps/roster/priv/macbert/Model/Desc.swift | 8 - apps/roster/priv/macbert/Model/Email.swift | 5 - apps/roster/priv/macbert/Model/Friend.swift | 7 - apps/roster/priv/macbert/Model/History.swift | 8 - apps/roster/priv/macbert/Model/Loc.swift | 6 - apps/roster/priv/macbert/Model/Member.swift | 19 - apps/roster/priv/macbert/Model/Message.swift | 16 - apps/roster/priv/macbert/Model/Person.swift | 17 - apps/roster/priv/macbert/Model/Profile.swift | 10 - apps/roster/priv/macbert/Model/Room.swift | 11 - apps/roster/priv/macbert/Model/Roster.swift | 16 - apps/roster/priv/macbert/Model/Search.swift | 9 - apps/roster/priv/macbert/Model/Star.swift | 7 - apps/roster/priv/macbert/Model/Tag.swift | 7 - apps/roster/priv/macbert/Model/Typing.swift | 5 - apps/roster/priv/macbert/Model/chain.swift | 7 - .../roster/priv/macbert/Model/container.swift | 7 - apps/roster/priv/macbert/Model/cur.swift | 10 - apps/roster/priv/macbert/Model/error.swift | 4 - apps/roster/priv/macbert/Model/error2.swift | 5 - apps/roster/priv/macbert/Model/io.swift | 5 - apps/roster/priv/macbert/Model/iter.swift | 7 - apps/roster/priv/macbert/Model/iterator.swift | 9 - apps/roster/priv/macbert/Model/log.swift | 7 - apps/roster/priv/macbert/Model/muc.swift | 4 - apps/roster/priv/macbert/Model/ok.swift | 4 - apps/roster/priv/macbert/Model/ok2.swift | 5 - .../roster/priv/macbert/Model/operation.swift | 9 - apps/roster/priv/macbert/Model/p2p.swift | 5 - apps/roster/priv/macbert/Model/push.swift | 9 - apps/roster/priv/macbert/Source/Bert.swift | 693 -- apps/roster/priv/macbert/Source/Decoder.swift | 367 - apps/roster/priv/macbert/Source/Encoder.swift | 382 - .../priv/macbert/Source/StringAtom.swift | 16 - .../roster/priv/macbert/Source/TypeSpec.swift | 376 - apps/roster/priv/macbert/Spec/Auth_Spec.swift | 43 - apps/roster/priv/macbert/Spec/CDR_Spec.swift | 30 - .../priv/macbert/Spec/Contact_Spec.swift | 44 - .../priv/macbert/Spec/Cursor_Spec.swift | 8 - apps/roster/priv/macbert/Spec/Desc_Spec.swift | 15 - .../roster/priv/macbert/Spec/Email_Spec.swift | 9 - .../priv/macbert/Spec/Friend_Spec.swift | 24 - .../priv/macbert/Spec/History_Spec.swift | 20 - apps/roster/priv/macbert/Spec/Loc_Spec.swift | 11 - .../priv/macbert/Spec/Member_Spec.swift | 53 - .../priv/macbert/Spec/Message_Spec.swift | 55 - .../priv/macbert/Spec/Person_Spec.swift | 20 - .../priv/macbert/Spec/Profile_Spec.swift | 19 - apps/roster/priv/macbert/Spec/Room_Spec.swift | 35 - .../priv/macbert/Spec/Roster_Spec.swift | 43 - .../priv/macbert/Spec/Search_Spec.swift | 21 - apps/roster/priv/macbert/Spec/Star_Spec.swift | 13 - apps/roster/priv/macbert/Spec/Tag_Spec.swift | 12 - .../priv/macbert/Spec/Typing_Spec.swift | 4 - .../roster/priv/macbert/Spec/chain_Spec.swift | 12 - .../priv/macbert/Spec/container_Spec.swift | 12 - apps/roster/priv/macbert/Spec/cur_Spec.swift | 21 - .../priv/macbert/Spec/error2_Spec.swift | 9 - .../roster/priv/macbert/Spec/error_Spec.swift | 6 - apps/roster/priv/macbert/Spec/io_Spec.swift | 16 - apps/roster/priv/macbert/Spec/iter_Spec.swift | 12 - .../priv/macbert/Spec/iterator_Spec.swift | 14 - apps/roster/priv/macbert/Spec/log_Spec.swift | 12 - apps/roster/priv/macbert/Spec/muc_Spec.swift | 5 - apps/roster/priv/macbert/Spec/ok2_Spec.swift | 9 - apps/roster/priv/macbert/Spec/ok_Spec.swift | 6 - .../priv/macbert/Spec/operation_Spec.swift | 14 - apps/roster/priv/macbert/Spec/p2p_Spec.swift | 8 - apps/roster/priv/macbert/Spec/push_Spec.swift | 20 - apps/roster/priv/macbert/main.swift | 43 - apps/roster/rebar.config | 3 +- apps/roster/src/Freind Protocol.html | 10 + apps/roster/src/Protocol | 22 + apps/roster/src/protocol/roster_friend.erl | 3 + apps/roster/src/protocol/roster_message.erl | 75 +- apps/roster/src/protocol/roster_presence.erl | 1 + apps/roster/src/roster_proto.erl | 10 +- apps/roster/src/roster_test.erl | 13 +- apps/roster/src/test | 511 + et qq | 7865 ++++++++++++++ hq | 6825 +++++++++++++ rebar.config | 2 +- sys.config | 2 - tatq | 9038 +++++++++++++++++ ttb_last_config | Bin 0 -> 551 bytes 94 files changed, 24472 insertions(+), 3944 deletions(-) create mode 100644 MnesiaCore.mq@127.0.0.1_1504_627676_166154 delete mode 100644 apps/rebar.config delete mode 100644 apps/roster/priv/macbert/JSEnc/json-bert.js delete mode 100644 apps/roster/priv/macbert/Model/Auth.swift delete mode 100644 apps/roster/priv/macbert/Model/CDR.swift delete mode 100644 apps/roster/priv/macbert/Model/Contact.swift delete mode 100644 apps/roster/priv/macbert/Model/Cursor.swift delete mode 100644 apps/roster/priv/macbert/Model/Desc.swift delete mode 100644 apps/roster/priv/macbert/Model/Email.swift delete mode 100644 apps/roster/priv/macbert/Model/Friend.swift delete mode 100644 apps/roster/priv/macbert/Model/History.swift delete mode 100644 apps/roster/priv/macbert/Model/Loc.swift delete mode 100644 apps/roster/priv/macbert/Model/Member.swift delete mode 100644 apps/roster/priv/macbert/Model/Message.swift delete mode 100644 apps/roster/priv/macbert/Model/Person.swift delete mode 100644 apps/roster/priv/macbert/Model/Profile.swift delete mode 100644 apps/roster/priv/macbert/Model/Room.swift delete mode 100644 apps/roster/priv/macbert/Model/Roster.swift delete mode 100644 apps/roster/priv/macbert/Model/Search.swift delete mode 100644 apps/roster/priv/macbert/Model/Star.swift delete mode 100644 apps/roster/priv/macbert/Model/Tag.swift delete mode 100644 apps/roster/priv/macbert/Model/Typing.swift delete mode 100644 apps/roster/priv/macbert/Model/chain.swift delete mode 100644 apps/roster/priv/macbert/Model/container.swift delete mode 100644 apps/roster/priv/macbert/Model/cur.swift delete mode 100644 apps/roster/priv/macbert/Model/error.swift delete mode 100644 apps/roster/priv/macbert/Model/error2.swift delete mode 100644 apps/roster/priv/macbert/Model/io.swift delete mode 100644 apps/roster/priv/macbert/Model/iter.swift delete mode 100644 apps/roster/priv/macbert/Model/iterator.swift delete mode 100644 apps/roster/priv/macbert/Model/log.swift delete mode 100644 apps/roster/priv/macbert/Model/muc.swift delete mode 100644 apps/roster/priv/macbert/Model/ok.swift delete mode 100644 apps/roster/priv/macbert/Model/ok2.swift delete mode 100644 apps/roster/priv/macbert/Model/operation.swift delete mode 100644 apps/roster/priv/macbert/Model/p2p.swift delete mode 100644 apps/roster/priv/macbert/Model/push.swift delete mode 100644 apps/roster/priv/macbert/Source/Bert.swift delete mode 100644 apps/roster/priv/macbert/Source/Decoder.swift delete mode 100644 apps/roster/priv/macbert/Source/Encoder.swift delete mode 100644 apps/roster/priv/macbert/Source/StringAtom.swift delete mode 100644 apps/roster/priv/macbert/Source/TypeSpec.swift delete mode 100644 apps/roster/priv/macbert/Spec/Auth_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/CDR_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/Contact_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/Cursor_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/Desc_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/Email_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/Friend_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/History_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/Loc_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/Member_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/Message_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/Person_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/Profile_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/Room_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/Roster_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/Search_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/Star_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/Tag_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/Typing_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/chain_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/container_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/cur_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/error2_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/error_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/io_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/iter_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/iterator_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/log_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/muc_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/ok2_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/ok_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/operation_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/p2p_Spec.swift delete mode 100644 apps/roster/priv/macbert/Spec/push_Spec.swift delete mode 100644 apps/roster/priv/macbert/main.swift create mode 100644 apps/roster/src/Freind Protocol.html create mode 100644 apps/roster/src/Protocol create mode 100644 apps/roster/src/test create mode 100644 et qq create mode 100644 hq create mode 100644 tatq create mode 100644 ttb_last_config diff --git a/MnesiaCore.mq@127.0.0.1_1504_627676_166154 b/MnesiaCore.mq@127.0.0.1_1504_627676_166154 new file mode 100644 index 0000000000000000000000000000000000000000..9854ed4237c33790681be9d6a836b2dbbf6cf587 GIT binary patch literal 224741 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%0Asyy|R( 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 UhmM{&di?#BlLrpwaA#)z2MFOJeE> :: [] | binary(), + payload = [] :: [] | binary(), + size= 0 :: integer(), + filename= [] :: [] | binary(), + info= [] :: [] | binary()}). + +-record('Message', {id=[] :: [] | integer(), + container = chain :: chain | cur, + feed_id=[] :: #room{} | #p2p{}, + prev=[] :: [] | integer(), + next=[] :: [] | integer(), + msg_id = [] :: [] | binary(), + from = [] :: [] | binary(), + to = [] :: [] | binary(), + created = [] :: [] | integer() | binary(), + files = [] :: [] | list(#'Desc'{}), + type = [] :: [] | reply | forward | sched + | online | offline | join | leave, + edit_msg = [] :: [] | integer(), + status = [] :: [] | atom() | client | async + | sent | internal | last_read | edit + | muc}). + +-record('Star', {roster_id=[]::[] | binary(), + message=[] :: #'Message'{}, + tag=[] :: [] | binary(), + status=[] :: [] | add | remove}). + +-record('Tag', {roster_id=[] :: [] | binary(), + name=[] :: binary(), + color=[] :: binary(), + status=[] :: [] | create | remove | edit}). + +-record('History', {roster_id=[] :: [] | binary(), + contact_id=[] :: [] | binary(), + cursor=0 :: [] | integer() | binary(), + size=0 :: [] | integer(), + data=[] :: list(#'Message'{}), + status=[] :: atom() | updated + | last_loaded | last_msg + | get }). + +-record('Typing', {phone_id=[] :: binary(), + comments=[] :: term()}). + +-record('Contact', {phone_id=[] :: [] | binary(), + avatar=[] :: [] | binary(), + names=[] :: [] | binary(), + surnames=[] :: [] | binary(), + nick= [] :: [] | binary(), + email = [] :: [] | binary(), + person_id=[] :: [] | binary(), + unread=0 :: [] | integer(), + last_msg=[] :: [] | #'Message'{}, + update=0 :: [] | integer(), + presence=[] :: [] | atom(), + status=[] :: [] | request | authorization + | friend | last_msg | atom()}). + +-record('Auth', {token=[] :: [] | binary(), + dev_key=[] :: [] | binary(), + user_id=[] :: [] | binary(), + phone=[] :: [] | binary(), + client_id=[] :: [] | binary(), + type=[] :: [] | atom(), + sms_code=[] :: [] | binary(), + attempts=[] :: [] | integer(), + services=[] :: list(atom()), + push=[] :: [] | binary(), + os=[] :: [] | ios | android | web, + created = [] :: [] | integer() | binary(), + last_online = [] :: [] | integer() | binary()}). + + +-record('Email', {mail=[] :: [] | binary(), + status=[] :: [] | verified | added}). +>>>>>>> Add new cursor -record('Loc', {x=[] :: [] | binary(), y=[] :: [] | binary(), diff --git a/apps/roster/priv/macbert.xcodeproj/project.pbxproj b/apps/roster/priv/macbert.xcodeproj/project.pbxproj index 193add4dc..fa7f92901 100644 --- a/apps/roster/priv/macbert.xcodeproj/project.pbxproj +++ b/apps/roster/priv/macbert.xcodeproj/project.pbxproj @@ -14,50 +14,27 @@ 94253F341F30BB4400AA1BCC /* Search_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94253F331F30BB4400AA1BCC /* Search_Spec.swift */; }; 94253F361F34A98000AA1BCC /* Desc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94253F351F34A98000AA1BCC /* Desc.swift */; }; 94253F381F34A98A00AA1BCC /* Desc_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94253F371F34A98A00AA1BCC /* Desc_Spec.swift */; }; - 9445D1CA1F7B499600C77A83 /* CDR_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1BC1F7B499600C77A83 /* CDR_Spec.swift */; }; - 9445D1CB1F7B499600C77A83 /* chain_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1BD1F7B499600C77A83 /* chain_Spec.swift */; }; - 9445D1CC1F7B499600C77A83 /* container_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1BE1F7B499600C77A83 /* container_Spec.swift */; }; - 9445D1CD1F7B499600C77A83 /* cur_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1BF1F7B499600C77A83 /* cur_Spec.swift */; }; - 9445D1CE1F7B499600C77A83 /* Email_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1C01F7B499600C77A83 /* Email_Spec.swift */; }; - 9445D1CF1F7B499600C77A83 /* iter_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1C11F7B499600C77A83 /* iter_Spec.swift */; }; - 9445D1D01F7B499600C77A83 /* iterator_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1C21F7B499600C77A83 /* iterator_Spec.swift */; }; - 9445D1D11F7B499600C77A83 /* Loc_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1C31F7B499600C77A83 /* Loc_Spec.swift */; }; - 9445D1D21F7B499600C77A83 /* log_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1C41F7B499600C77A83 /* log_Spec.swift */; }; - 9445D1D31F7B499600C77A83 /* Member_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1C51F7B499600C77A83 /* Member_Spec.swift */; }; - 9445D1D41F7B499600C77A83 /* muc_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1C61F7B499600C77A83 /* muc_Spec.swift */; }; - 9445D1D51F7B499600C77A83 /* operation_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1C71F7B499600C77A83 /* operation_Spec.swift */; }; - 9445D1D61F7B499600C77A83 /* Star_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1C81F7B499600C77A83 /* Star_Spec.swift */; }; - 9445D1D71F7B499600C77A83 /* Tag_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1C91F7B499600C77A83 /* Tag_Spec.swift */; }; - 9445D1E61F7B49A800C77A83 /* CDR.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1D81F7B49A800C77A83 /* CDR.swift */; }; - 9445D1E71F7B49A800C77A83 /* chain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1D91F7B49A800C77A83 /* chain.swift */; }; - 9445D1E81F7B49A800C77A83 /* container.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1DA1F7B49A800C77A83 /* container.swift */; }; - 9445D1E91F7B49A800C77A83 /* cur.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1DB1F7B49A800C77A83 /* cur.swift */; }; - 9445D1EA1F7B49A800C77A83 /* Email.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1DC1F7B49A800C77A83 /* Email.swift */; }; - 9445D1EB1F7B49A800C77A83 /* iter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1DD1F7B49A800C77A83 /* iter.swift */; }; - 9445D1EC1F7B49A800C77A83 /* iterator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1DE1F7B49A800C77A83 /* iterator.swift */; }; - 9445D1ED1F7B49A800C77A83 /* Loc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1DF1F7B49A800C77A83 /* Loc.swift */; }; - 9445D1EE1F7B49A800C77A83 /* log.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1E01F7B49A800C77A83 /* log.swift */; }; - 9445D1EF1F7B49A800C77A83 /* Member.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1E11F7B49A800C77A83 /* Member.swift */; }; - 9445D1F01F7B49A800C77A83 /* muc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1E21F7B49A800C77A83 /* muc.swift */; }; - 9445D1F11F7B49A800C77A83 /* operation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1E31F7B49A800C77A83 /* operation.swift */; }; - 9445D1F21F7B49A800C77A83 /* Star.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1E41F7B49A800C77A83 /* Star.swift */; }; - 9445D1F31F7B49A800C77A83 /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445D1E51F7B49A800C77A83 /* Tag.swift */; }; 945151421F39F4DD00EB320C /* Cursor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 945151411F39F4DD00EB320C /* Cursor.swift */; }; 945151441F39F4E600EB320C /* Cursor_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 945151431F39F4E600EB320C /* Cursor_Spec.swift */; }; 946724081F4C6C9C00603784 /* p2p.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946724071F4C6C9C00603784 /* p2p.swift */; }; 9467240A1F4C6CA600603784 /* p2p_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946724091F4C6CA600603784 /* p2p_Spec.swift */; }; + 94ED6AD51F1FF39200146C08 /* Approve_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AC11F1FF39200146C08 /* Approve_Spec.swift */; }; 94ED6AD61F1FF39200146C08 /* Auth_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AC21F1FF39200146C08 /* Auth_Spec.swift */; }; + 94ED6AD71F1FF39200146C08 /* Confirm_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AC31F1FF39200146C08 /* Confirm_Spec.swift */; }; 94ED6AD81F1FF39200146C08 /* Contact_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AC41F1FF39200146C08 /* Contact_Spec.swift */; }; 94ED6AD91F1FF39200146C08 /* error_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AC51F1FF39200146C08 /* error_Spec.swift */; }; 94ED6ADA1F1FF39200146C08 /* error2_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AC61F1FF39200146C08 /* error2_Spec.swift */; }; 94ED6ADB1F1FF39200146C08 /* Friend_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AC71F1FF39200146C08 /* Friend_Spec.swift */; }; 94ED6ADC1F1FF39200146C08 /* History_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AC81F1FF39200146C08 /* History_Spec.swift */; }; 94ED6ADD1F1FF39200146C08 /* io_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AC91F1FF39200146C08 /* io_Spec.swift */; }; + 94ED6ADE1F1FF39200146C08 /* Join_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6ACA1F1FF39200146C08 /* Join_Spec.swift */; }; + 94ED6ADF1F1FF39200146C08 /* Leave_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6ACB1F1FF39200146C08 /* Leave_Spec.swift */; }; 94ED6AE01F1FF39200146C08 /* Message_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6ACC1F1FF39200146C08 /* Message_Spec.swift */; }; 94ED6AE11F1FF39200146C08 /* ok_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6ACD1F1FF39200146C08 /* ok_Spec.swift */; }; 94ED6AE21F1FF39200146C08 /* ok2_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6ACE1F1FF39200146C08 /* ok2_Spec.swift */; }; 94ED6AE31F1FF39200146C08 /* Person_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6ACF1F1FF39200146C08 /* Person_Spec.swift */; }; 94ED6AE41F1FF39200146C08 /* Profile_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AD01F1FF39200146C08 /* Profile_Spec.swift */; }; + 94ED6AE51F1FF39200146C08 /* Revoke_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AD11F1FF39200146C08 /* Revoke_Spec.swift */; }; 94ED6AE61F1FF39200146C08 /* Room_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AD21F1FF39200146C08 /* Room_Spec.swift */; }; 94ED6AE71F1FF39200146C08 /* Roster_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AD31F1FF39200146C08 /* Roster_Spec.swift */; }; 94ED6AE81F1FF39200146C08 /* Typing_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AD41F1FF39200146C08 /* Typing_Spec.swift */; }; @@ -65,18 +42,23 @@ 94ED6AF01F1FF39E00146C08 /* StringAtom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AEB1F1FF39E00146C08 /* StringAtom.swift */; }; 94ED6AF11F1FF39E00146C08 /* TypeSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AEC1F1FF39E00146C08 /* TypeSpec.swift */; }; 94ED6AF21F1FF39E00146C08 /* Bert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AED1F1FF39E00146C08 /* Bert.swift */; }; + 94ED6B071F1FF3AB00146C08 /* Approve.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AF31F1FF3AB00146C08 /* Approve.swift */; }; 94ED6B081F1FF3AB00146C08 /* Auth.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AF41F1FF3AB00146C08 /* Auth.swift */; }; + 94ED6B091F1FF3AB00146C08 /* Confirm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AF51F1FF3AB00146C08 /* Confirm.swift */; }; 94ED6B0A1F1FF3AB00146C08 /* Contact.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AF61F1FF3AB00146C08 /* Contact.swift */; }; 94ED6B0B1F1FF3AB00146C08 /* error.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AF71F1FF3AB00146C08 /* error.swift */; }; 94ED6B0C1F1FF3AB00146C08 /* error2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AF81F1FF3AB00146C08 /* error2.swift */; }; 94ED6B0D1F1FF3AB00146C08 /* Friend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AF91F1FF3AB00146C08 /* Friend.swift */; }; 94ED6B0E1F1FF3AB00146C08 /* History.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AFA1F1FF3AB00146C08 /* History.swift */; }; 94ED6B0F1F1FF3AB00146C08 /* io.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AFB1F1FF3AB00146C08 /* io.swift */; }; + 94ED6B101F1FF3AB00146C08 /* Join.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AFC1F1FF3AB00146C08 /* Join.swift */; }; + 94ED6B111F1FF3AB00146C08 /* Leave.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AFD1F1FF3AB00146C08 /* Leave.swift */; }; 94ED6B121F1FF3AB00146C08 /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AFE1F1FF3AB00146C08 /* Message.swift */; }; 94ED6B131F1FF3AB00146C08 /* ok.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6AFF1F1FF3AB00146C08 /* ok.swift */; }; 94ED6B141F1FF3AB00146C08 /* ok2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6B001F1FF3AB00146C08 /* ok2.swift */; }; 94ED6B151F1FF3AB00146C08 /* Person.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6B011F1FF3AB00146C08 /* Person.swift */; }; 94ED6B161F1FF3AB00146C08 /* Profile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6B021F1FF3AB00146C08 /* Profile.swift */; }; + 94ED6B171F1FF3AB00146C08 /* Revoke.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6B031F1FF3AB00146C08 /* Revoke.swift */; }; 94ED6B181F1FF3AB00146C08 /* Room.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6B041F1FF3AB00146C08 /* Room.swift */; }; 94ED6B191F1FF3AB00146C08 /* Roster.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6B051F1FF3AB00146C08 /* Roster.swift */; }; 94ED6B1A1F1FF3AB00146C08 /* Typing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94ED6B061F1FF3AB00146C08 /* Typing.swift */; }; @@ -103,50 +85,27 @@ 94253F331F30BB4400AA1BCC /* Search_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Search_Spec.swift; path = Spec/Search_Spec.swift; sourceTree = ""; }; 94253F351F34A98000AA1BCC /* Desc.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Desc.swift; path = Model/Desc.swift; sourceTree = ""; }; 94253F371F34A98A00AA1BCC /* Desc_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Desc_Spec.swift; path = Spec/Desc_Spec.swift; sourceTree = ""; }; - 9445D1BC1F7B499600C77A83 /* CDR_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CDR_Spec.swift; path = Spec/CDR_Spec.swift; sourceTree = ""; }; - 9445D1BD1F7B499600C77A83 /* chain_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = chain_Spec.swift; path = Spec/chain_Spec.swift; sourceTree = ""; }; - 9445D1BE1F7B499600C77A83 /* container_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = container_Spec.swift; path = Spec/container_Spec.swift; sourceTree = ""; }; - 9445D1BF1F7B499600C77A83 /* cur_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = cur_Spec.swift; path = Spec/cur_Spec.swift; sourceTree = ""; }; - 9445D1C01F7B499600C77A83 /* Email_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Email_Spec.swift; path = Spec/Email_Spec.swift; sourceTree = ""; }; - 9445D1C11F7B499600C77A83 /* iter_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iter_Spec.swift; path = Spec/iter_Spec.swift; sourceTree = ""; }; - 9445D1C21F7B499600C77A83 /* iterator_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iterator_Spec.swift; path = Spec/iterator_Spec.swift; sourceTree = ""; }; - 9445D1C31F7B499600C77A83 /* Loc_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Loc_Spec.swift; path = Spec/Loc_Spec.swift; sourceTree = ""; }; - 9445D1C41F7B499600C77A83 /* log_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = log_Spec.swift; path = Spec/log_Spec.swift; sourceTree = ""; }; - 9445D1C51F7B499600C77A83 /* Member_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Member_Spec.swift; path = Spec/Member_Spec.swift; sourceTree = ""; }; - 9445D1C61F7B499600C77A83 /* muc_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = muc_Spec.swift; path = Spec/muc_Spec.swift; sourceTree = ""; }; - 9445D1C71F7B499600C77A83 /* operation_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = operation_Spec.swift; path = Spec/operation_Spec.swift; sourceTree = ""; }; - 9445D1C81F7B499600C77A83 /* Star_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Star_Spec.swift; path = Spec/Star_Spec.swift; sourceTree = ""; }; - 9445D1C91F7B499600C77A83 /* Tag_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Tag_Spec.swift; path = Spec/Tag_Spec.swift; sourceTree = ""; }; - 9445D1D81F7B49A800C77A83 /* CDR.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CDR.swift; path = Model/CDR.swift; sourceTree = ""; }; - 9445D1D91F7B49A800C77A83 /* chain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = chain.swift; path = Model/chain.swift; sourceTree = ""; }; - 9445D1DA1F7B49A800C77A83 /* container.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = container.swift; path = Model/container.swift; sourceTree = ""; }; - 9445D1DB1F7B49A800C77A83 /* cur.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = cur.swift; path = Model/cur.swift; sourceTree = ""; }; - 9445D1DC1F7B49A800C77A83 /* Email.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Email.swift; path = Model/Email.swift; sourceTree = ""; }; - 9445D1DD1F7B49A800C77A83 /* iter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iter.swift; path = Model/iter.swift; sourceTree = ""; }; - 9445D1DE1F7B49A800C77A83 /* iterator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iterator.swift; path = Model/iterator.swift; sourceTree = ""; }; - 9445D1DF1F7B49A800C77A83 /* Loc.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Loc.swift; path = Model/Loc.swift; sourceTree = ""; }; - 9445D1E01F7B49A800C77A83 /* log.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = log.swift; path = Model/log.swift; sourceTree = ""; }; - 9445D1E11F7B49A800C77A83 /* Member.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Member.swift; path = Model/Member.swift; sourceTree = ""; }; - 9445D1E21F7B49A800C77A83 /* muc.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = muc.swift; path = Model/muc.swift; sourceTree = ""; }; - 9445D1E31F7B49A800C77A83 /* operation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = operation.swift; path = Model/operation.swift; sourceTree = ""; }; - 9445D1E41F7B49A800C77A83 /* Star.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Star.swift; path = Model/Star.swift; sourceTree = ""; }; - 9445D1E51F7B49A800C77A83 /* Tag.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Tag.swift; path = Model/Tag.swift; sourceTree = ""; }; 945151411F39F4DD00EB320C /* Cursor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Cursor.swift; path = Model/Cursor.swift; sourceTree = ""; }; 945151431F39F4E600EB320C /* Cursor_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Cursor_Spec.swift; path = Spec/Cursor_Spec.swift; sourceTree = ""; }; 946724071F4C6C9C00603784 /* p2p.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = p2p.swift; path = Model/p2p.swift; sourceTree = ""; }; 946724091F4C6CA600603784 /* p2p_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = p2p_Spec.swift; path = Spec/p2p_Spec.swift; sourceTree = ""; }; + 94ED6AC11F1FF39200146C08 /* Approve_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Approve_Spec.swift; path = Spec/Approve_Spec.swift; sourceTree = ""; }; 94ED6AC21F1FF39200146C08 /* Auth_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Auth_Spec.swift; path = Spec/Auth_Spec.swift; sourceTree = ""; }; + 94ED6AC31F1FF39200146C08 /* Confirm_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Confirm_Spec.swift; path = Spec/Confirm_Spec.swift; sourceTree = ""; }; 94ED6AC41F1FF39200146C08 /* Contact_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Contact_Spec.swift; path = Spec/Contact_Spec.swift; sourceTree = ""; }; 94ED6AC51F1FF39200146C08 /* error_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = error_Spec.swift; path = Spec/error_Spec.swift; sourceTree = ""; }; 94ED6AC61F1FF39200146C08 /* error2_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = error2_Spec.swift; path = Spec/error2_Spec.swift; sourceTree = ""; }; 94ED6AC71F1FF39200146C08 /* Friend_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Friend_Spec.swift; path = Spec/Friend_Spec.swift; sourceTree = ""; }; 94ED6AC81F1FF39200146C08 /* History_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = History_Spec.swift; path = Spec/History_Spec.swift; sourceTree = ""; }; 94ED6AC91F1FF39200146C08 /* io_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = io_Spec.swift; path = Spec/io_Spec.swift; sourceTree = ""; }; + 94ED6ACA1F1FF39200146C08 /* Join_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Join_Spec.swift; path = Spec/Join_Spec.swift; sourceTree = ""; }; + 94ED6ACB1F1FF39200146C08 /* Leave_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Leave_Spec.swift; path = Spec/Leave_Spec.swift; sourceTree = ""; }; 94ED6ACC1F1FF39200146C08 /* Message_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Message_Spec.swift; path = Spec/Message_Spec.swift; sourceTree = ""; }; 94ED6ACD1F1FF39200146C08 /* ok_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ok_Spec.swift; path = Spec/ok_Spec.swift; sourceTree = ""; }; 94ED6ACE1F1FF39200146C08 /* ok2_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ok2_Spec.swift; path = Spec/ok2_Spec.swift; sourceTree = ""; }; 94ED6ACF1F1FF39200146C08 /* Person_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Person_Spec.swift; path = Spec/Person_Spec.swift; sourceTree = ""; }; 94ED6AD01F1FF39200146C08 /* Profile_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Profile_Spec.swift; path = Spec/Profile_Spec.swift; sourceTree = ""; }; + 94ED6AD11F1FF39200146C08 /* Revoke_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Revoke_Spec.swift; path = Spec/Revoke_Spec.swift; sourceTree = ""; }; 94ED6AD21F1FF39200146C08 /* Room_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Room_Spec.swift; path = Spec/Room_Spec.swift; sourceTree = ""; }; 94ED6AD31F1FF39200146C08 /* Roster_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Roster_Spec.swift; path = Spec/Roster_Spec.swift; sourceTree = ""; }; 94ED6AD41F1FF39200146C08 /* Typing_Spec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Typing_Spec.swift; path = Spec/Typing_Spec.swift; sourceTree = ""; }; @@ -155,18 +114,23 @@ 94ED6AEB1F1FF39E00146C08 /* StringAtom.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StringAtom.swift; path = Source/StringAtom.swift; sourceTree = ""; }; 94ED6AEC1F1FF39E00146C08 /* TypeSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TypeSpec.swift; path = Source/TypeSpec.swift; sourceTree = ""; }; 94ED6AED1F1FF39E00146C08 /* Bert.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Bert.swift; path = Source/Bert.swift; sourceTree = ""; }; + 94ED6AF31F1FF3AB00146C08 /* Approve.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Approve.swift; path = Model/Approve.swift; sourceTree = ""; }; 94ED6AF41F1FF3AB00146C08 /* Auth.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Auth.swift; path = Model/Auth.swift; sourceTree = ""; }; + 94ED6AF51F1FF3AB00146C08 /* Confirm.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Confirm.swift; path = Model/Confirm.swift; sourceTree = ""; }; 94ED6AF61F1FF3AB00146C08 /* Contact.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Contact.swift; path = Model/Contact.swift; sourceTree = ""; }; 94ED6AF71F1FF3AB00146C08 /* error.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = error.swift; path = Model/error.swift; sourceTree = ""; }; 94ED6AF81F1FF3AB00146C08 /* error2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = error2.swift; path = Model/error2.swift; sourceTree = ""; }; 94ED6AF91F1FF3AB00146C08 /* Friend.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Friend.swift; path = Model/Friend.swift; sourceTree = ""; }; 94ED6AFA1F1FF3AB00146C08 /* History.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = History.swift; path = Model/History.swift; sourceTree = ""; }; 94ED6AFB1F1FF3AB00146C08 /* io.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = io.swift; path = Model/io.swift; sourceTree = ""; }; + 94ED6AFC1F1FF3AB00146C08 /* Join.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Join.swift; path = Model/Join.swift; sourceTree = ""; }; + 94ED6AFD1F1FF3AB00146C08 /* Leave.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Leave.swift; path = Model/Leave.swift; sourceTree = ""; }; 94ED6AFE1F1FF3AB00146C08 /* Message.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Message.swift; path = Model/Message.swift; sourceTree = ""; }; 94ED6AFF1F1FF3AB00146C08 /* ok.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ok.swift; path = Model/ok.swift; sourceTree = ""; }; 94ED6B001F1FF3AB00146C08 /* ok2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ok2.swift; path = Model/ok2.swift; sourceTree = ""; }; 94ED6B011F1FF3AB00146C08 /* Person.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Person.swift; path = Model/Person.swift; sourceTree = ""; }; 94ED6B021F1FF3AB00146C08 /* Profile.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Profile.swift; path = Model/Profile.swift; sourceTree = ""; }; + 94ED6B031F1FF3AB00146C08 /* Revoke.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Revoke.swift; path = Model/Revoke.swift; sourceTree = ""; }; 94ED6B041F1FF3AB00146C08 /* Room.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Room.swift; path = Model/Room.swift; sourceTree = ""; }; 94ED6B051F1FF3AB00146C08 /* Roster.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Roster.swift; path = Model/Roster.swift; sourceTree = ""; }; 94ED6B061F1FF3AB00146C08 /* Typing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Typing.swift; path = Model/Typing.swift; sourceTree = ""; }; @@ -213,37 +177,28 @@ 94ED6ABE1F1FF36B00146C08 /* Model */ = { isa = PBXGroup; children = ( - 9445D1D81F7B49A800C77A83 /* CDR.swift */, - 9445D1D91F7B49A800C77A83 /* chain.swift */, - 9445D1DA1F7B49A800C77A83 /* container.swift */, - 9445D1DB1F7B49A800C77A83 /* cur.swift */, - 9445D1DC1F7B49A800C77A83 /* Email.swift */, - 9445D1DD1F7B49A800C77A83 /* iter.swift */, - 9445D1DE1F7B49A800C77A83 /* iterator.swift */, - 9445D1DF1F7B49A800C77A83 /* Loc.swift */, - 9445D1E01F7B49A800C77A83 /* log.swift */, - 9445D1E11F7B49A800C77A83 /* Member.swift */, - 9445D1E21F7B49A800C77A83 /* muc.swift */, - 9445D1E31F7B49A800C77A83 /* operation.swift */, - 9445D1E41F7B49A800C77A83 /* Star.swift */, - 9445D1E51F7B49A800C77A83 /* Tag.swift */, 9407D1501F5ADC7A00CAC0AE /* push.swift */, 946724071F4C6C9C00603784 /* p2p.swift */, 945151411F39F4DD00EB320C /* Cursor.swift */, 94253F351F34A98000AA1BCC /* Desc.swift */, 94253F311F30BB3C00AA1BCC /* Search.swift */, + 94ED6AF31F1FF3AB00146C08 /* Approve.swift */, 94ED6AF41F1FF3AB00146C08 /* Auth.swift */, + 94ED6AF51F1FF3AB00146C08 /* Confirm.swift */, 94ED6AF61F1FF3AB00146C08 /* Contact.swift */, 94ED6AF71F1FF3AB00146C08 /* error.swift */, 94ED6AF81F1FF3AB00146C08 /* error2.swift */, 94ED6AF91F1FF3AB00146C08 /* Friend.swift */, 94ED6AFA1F1FF3AB00146C08 /* History.swift */, 94ED6AFB1F1FF3AB00146C08 /* io.swift */, + 94ED6AFC1F1FF3AB00146C08 /* Join.swift */, + 94ED6AFD1F1FF3AB00146C08 /* Leave.swift */, 94ED6AFE1F1FF3AB00146C08 /* Message.swift */, 94ED6AFF1F1FF3AB00146C08 /* ok.swift */, 94ED6B001F1FF3AB00146C08 /* ok2.swift */, 94ED6B011F1FF3AB00146C08 /* Person.swift */, 94ED6B021F1FF3AB00146C08 /* Profile.swift */, + 94ED6B031F1FF3AB00146C08 /* Revoke.swift */, 94ED6B041F1FF3AB00146C08 /* Room.swift */, 94ED6B051F1FF3AB00146C08 /* Roster.swift */, 94ED6B061F1FF3AB00146C08 /* Typing.swift */, @@ -266,37 +221,28 @@ 94ED6AC01F1FF38900146C08 /* Spec */ = { isa = PBXGroup; children = ( - 9445D1BC1F7B499600C77A83 /* CDR_Spec.swift */, - 9445D1BD1F7B499600C77A83 /* chain_Spec.swift */, - 9445D1BE1F7B499600C77A83 /* container_Spec.swift */, - 9445D1BF1F7B499600C77A83 /* cur_Spec.swift */, - 9445D1C01F7B499600C77A83 /* Email_Spec.swift */, - 9445D1C11F7B499600C77A83 /* iter_Spec.swift */, - 9445D1C21F7B499600C77A83 /* iterator_Spec.swift */, - 9445D1C31F7B499600C77A83 /* Loc_Spec.swift */, - 9445D1C41F7B499600C77A83 /* log_Spec.swift */, - 9445D1C51F7B499600C77A83 /* Member_Spec.swift */, - 9445D1C61F7B499600C77A83 /* muc_Spec.swift */, - 9445D1C71F7B499600C77A83 /* operation_Spec.swift */, - 9445D1C81F7B499600C77A83 /* Star_Spec.swift */, - 9445D1C91F7B499600C77A83 /* Tag_Spec.swift */, 9407D1521F5ADC8500CAC0AE /* push_Spec.swift */, 946724091F4C6CA600603784 /* p2p_Spec.swift */, 945151431F39F4E600EB320C /* Cursor_Spec.swift */, 94253F371F34A98A00AA1BCC /* Desc_Spec.swift */, 94253F331F30BB4400AA1BCC /* Search_Spec.swift */, + 94ED6AC11F1FF39200146C08 /* Approve_Spec.swift */, 94ED6AC21F1FF39200146C08 /* Auth_Spec.swift */, + 94ED6AC31F1FF39200146C08 /* Confirm_Spec.swift */, 94ED6AC41F1FF39200146C08 /* Contact_Spec.swift */, 94ED6AC51F1FF39200146C08 /* error_Spec.swift */, 94ED6AC61F1FF39200146C08 /* error2_Spec.swift */, 94ED6AC71F1FF39200146C08 /* Friend_Spec.swift */, 94ED6AC81F1FF39200146C08 /* History_Spec.swift */, 94ED6AC91F1FF39200146C08 /* io_Spec.swift */, + 94ED6ACA1F1FF39200146C08 /* Join_Spec.swift */, + 94ED6ACB1F1FF39200146C08 /* Leave_Spec.swift */, 94ED6ACC1F1FF39200146C08 /* Message_Spec.swift */, 94ED6ACD1F1FF39200146C08 /* ok_Spec.swift */, 94ED6ACE1F1FF39200146C08 /* ok2_Spec.swift */, 94ED6ACF1F1FF39200146C08 /* Person_Spec.swift */, 94ED6AD01F1FF39200146C08 /* Profile_Spec.swift */, + 94ED6AD11F1FF39200146C08 /* Revoke_Spec.swift */, 94ED6AD21F1FF39200146C08 /* Room_Spec.swift */, 94ED6AD31F1FF39200146C08 /* Roster_Spec.swift */, 94ED6AD41F1FF39200146C08 /* Typing_Spec.swift */, @@ -364,70 +310,51 @@ buildActionMask = 2147483647; files = ( 94ED6B0E1F1FF3AB00146C08 /* History.swift in Sources */, - 9445D1E71F7B49A800C77A83 /* chain.swift in Sources */, 9467240A1F4C6CA600603784 /* p2p_Spec.swift in Sources */, 94ED6B0B1F1FF3AB00146C08 /* error.swift in Sources */, 94ED6B0F1F1FF3AB00146C08 /* io.swift in Sources */, 94ED6AF21F1FF39E00146C08 /* Bert.swift in Sources */, - 9445D1EE1F7B49A800C77A83 /* log.swift in Sources */, 946724081F4C6C9C00603784 /* p2p.swift in Sources */, 94ED6AE61F1FF39200146C08 /* Room_Spec.swift in Sources */, 945151421F39F4DD00EB320C /* Cursor.swift in Sources */, - 9445D1D61F7B499600C77A83 /* Star_Spec.swift in Sources */, + 94ED6B101F1FF3AB00146C08 /* Join.swift in Sources */, 94253F361F34A98000AA1BCC /* Desc.swift in Sources */, - 9445D1CD1F7B499600C77A83 /* cur_Spec.swift in Sources */, - 9445D1ED1F7B49A800C77A83 /* Loc.swift in Sources */, 94ED6B0C1F1FF3AB00146C08 /* error2.swift in Sources */, - 9445D1D71F7B499600C77A83 /* Tag_Spec.swift in Sources */, - 9445D1EA1F7B49A800C77A83 /* Email.swift in Sources */, 94ED6B121F1FF3AB00146C08 /* Message.swift in Sources */, 94ED6B1A1F1FF3AB00146C08 /* Typing.swift in Sources */, - 9445D1D11F7B499600C77A83 /* Loc_Spec.swift in Sources */, - 9445D1E81F7B49A800C77A83 /* container.swift in Sources */, - 9445D1CC1F7B499600C77A83 /* container_Spec.swift in Sources */, + 94ED6B091F1FF3AB00146C08 /* Confirm.swift in Sources */, 94253F321F30BB3C00AA1BCC /* Search.swift in Sources */, - 9445D1CF1F7B499600C77A83 /* iter_Spec.swift in Sources */, 9407D1531F5ADC8500CAC0AE /* push_Spec.swift in Sources */, 94ED6ADA1F1FF39200146C08 /* error2_Spec.swift in Sources */, 94ED6B181F1FF3AB00146C08 /* Room.swift in Sources */, - 9445D1F01F7B49A800C77A83 /* muc.swift in Sources */, + 94ED6AD51F1FF39200146C08 /* Approve_Spec.swift in Sources */, 945151441F39F4E600EB320C /* Cursor_Spec.swift in Sources */, - 9445D1CE1F7B499600C77A83 /* Email_Spec.swift in Sources */, - 9445D1EB1F7B49A800C77A83 /* iter.swift in Sources */, 94ED6ADD1F1FF39200146C08 /* io_Spec.swift in Sources */, + 94ED6AD71F1FF39200146C08 /* Confirm_Spec.swift in Sources */, + 94ED6B071F1FF3AB00146C08 /* Approve.swift in Sources */, 94ED6AE81F1FF39200146C08 /* Typing_Spec.swift in Sources */, - 9445D1D41F7B499600C77A83 /* muc_Spec.swift in Sources */, 94ED6AE71F1FF39200146C08 /* Roster_Spec.swift in Sources */, - 9445D1D31F7B499600C77A83 /* Member_Spec.swift in Sources */, 94ED6B191F1FF3AB00146C08 /* Roster.swift in Sources */, - 9445D1F31F7B49A800C77A83 /* Tag.swift in Sources */, 94ED6B141F1FF3AB00146C08 /* ok2.swift in Sources */, - 9445D1EF1F7B49A800C77A83 /* Member.swift in Sources */, - 9445D1D51F7B499600C77A83 /* operation_Spec.swift in Sources */, - 9445D1D01F7B499600C77A83 /* iterator_Spec.swift in Sources */, - 9445D1E61F7B49A800C77A83 /* CDR.swift in Sources */, 94ED6AE11F1FF39200146C08 /* ok_Spec.swift in Sources */, 94ED6AD61F1FF39200146C08 /* Auth_Spec.swift in Sources */, + 94ED6B171F1FF3AB00146C08 /* Revoke.swift in Sources */, 94ED6B0A1F1FF3AB00146C08 /* Contact.swift in Sources */, - 9445D1EC1F7B49A800C77A83 /* iterator.swift in Sources */, 94ED6B081F1FF3AB00146C08 /* Auth.swift in Sources */, 94ED6AD81F1FF39200146C08 /* Contact_Spec.swift in Sources */, 94ED6AE41F1FF39200146C08 /* Profile_Spec.swift in Sources */, 9407D1511F5ADC7A00CAC0AE /* push.swift in Sources */, - 9445D1D21F7B499600C77A83 /* log_Spec.swift in Sources */, 94ED6B151F1FF3AB00146C08 /* Person.swift in Sources */, - 9445D1E91F7B49A800C77A83 /* cur.swift in Sources */, + 94ED6B111F1FF3AB00146C08 /* Leave.swift in Sources */, + 94ED6AE51F1FF39200146C08 /* Revoke_Spec.swift in Sources */, 94ED6ADC1F1FF39200146C08 /* History_Spec.swift in Sources */, 94ED6B0D1F1FF3AB00146C08 /* Friend.swift in Sources */, 94253F381F34A98A00AA1BCC /* Desc_Spec.swift in Sources */, 94ED6AE01F1FF39200146C08 /* Message_Spec.swift in Sources */, - 9445D1F11F7B49A800C77A83 /* operation.swift in Sources */, - 9445D1CA1F7B499600C77A83 /* CDR_Spec.swift in Sources */, 94ED6B131F1FF3AB00146C08 /* ok.swift in Sources */, - 9445D1CB1F7B499600C77A83 /* chain_Spec.swift in Sources */, 94ED6B161F1FF3AB00146C08 /* Profile.swift in Sources */, 94ED6AE21F1FF39200146C08 /* ok2_Spec.swift in Sources */, - 9445D1F21F7B49A800C77A83 /* Star.swift in Sources */, + 94ED6ADE1F1FF39200146C08 /* Join_Spec.swift in Sources */, 3A022FAE1F16A40A00B7B612 /* main.swift in Sources */, 94ED6AF11F1FF39E00146C08 /* TypeSpec.swift in Sources */, 94ED6ADB1F1FF39200146C08 /* Friend_Spec.swift in Sources */, @@ -435,6 +362,7 @@ 94ED6AEE1F1FF39E00146C08 /* Decoder.swift in Sources */, 94253F341F30BB4400AA1BCC /* Search_Spec.swift in Sources */, 94ED6AE31F1FF39200146C08 /* Person_Spec.swift in Sources */, + 94ED6ADF1F1FF39200146C08 /* Leave_Spec.swift in Sources */, 94ED6AD91F1FF39200146C08 /* error_Spec.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/apps/roster/priv/macbert/JSEnc/json-bert.js b/apps/roster/priv/macbert/JSEnc/json-bert.js deleted file mode 100644 index bbe47dde3..000000000 --- a/apps/roster/priv/macbert/JSEnc/json-bert.js +++ /dev/null @@ -1,955 +0,0 @@ -function clean(r) { for(var k in r) if(!r[k]) delete r[k]; return r; } -function check_len(x) { try { return (eval('len'+utf8_dec(x.v[0].v))() == x.v.length) ? true : false } - catch (e) { return false; } } - -function type(data) { - var res = undefined; - switch (typeof data) { - case 'string': case 'number': res = data; break; - case 'object': res = utf8_dec(data); break; - case 'undefined': res = ''; break; - default: console.log('Strange data: ' + data); } - return res; }; - -function scalar(data) { - var res = undefined; - switch (typeof data) { - case 'string': res = bin(data); break; case 'number': res = number(data); break; - default: console.log('Strange data: ' + data); } - return res; }; -function nil() { return {t: 106, v: undefined}; }; - -function decode(x) { - if (x.t == 108) { - var r = []; x.v.forEach(function(y) { r.push(decode(y)) }); return r; - } else if (x.t == 109) { - return utf8_dec(x.v); - } else if (x.t == 104 && check_len(x)) { - return eval('dec'+x.v[0].v)(x); - } else if (x.t == 104) { - var r=[]; x.v.forEach(function(a){r.push(decode(a))}); - return Object.assign({tup:'$'}, r); - } else return x.v; -} - -function encode(x) { - if (Array.isArray(x)) { - var r = []; x.forEach(function(y) { r.push(encode(y)) }); return {t:108,v:r}; - } else if (typeof x == 'object') { - switch (x.tup) { - case '$': delete x['tup']; var r=[]; - Object.keys(x).map(function(p){return x[p];}).forEach(function(a){r.push(encode(a))}); - return {t:104, v:r}; - default: return eval('enc'+x.tup)(x); } - } else return scalar(x); -} - -function encwriter(d) { - var tup = atom('writer'); - var id = 'id' in d && d.id ? encode(d.id) : nil(); - var count = 'count' in d && d.count ? number(d.count) : nil(); - var cache = 'cache' in d && d.cache ? encode(d.cache) : nil(); - var args = 'args' in d && d.args ? encode(d.args) : nil(); - var first = 'first' in d && d.first ? encode(d.first) : nil(); - return tuple(tup,id,count,cache,args,first); } - -function lenwriter() { return 6; } -function decwriter(d) { - var r={}; r.tup = 'writer'; - r.id = d && d.v[1] ? decode(d.v[1].v) : undefined; - r.count = d && d.v[2] ? type(d.v[2].v) : undefined; - r.cache = d && d.v[3] ? decode(d.v[3].v) : undefined; - r.args = d && d.v[4] ? decode(d.v[4].v) : undefined; - r.first = d && d.v[5] ? decode(d.v[5].v) : undefined; - return clean(r); } - -function encreader(d) { - var tup = atom('reader'); - var id = 'id' in d && d.id ? encode(d.id) : nil(); - var pos = 'pos' in d && d.pos ? number(d.pos) : nil(); - var cache = 'cache' in d && d.cache ? encode(d.cache) : nil(); - var args = 'args' in d && d.args ? encode(d.args) : nil(); - var feed = 'feed' in d && d.feed ? encode(d.feed) : nil(); - var dir = 'dir' in d && d.dir ? encode(d.dir) : nil(); - return tuple(tup,id,pos,cache,args,feed,dir); } - -function lenreader() { return 7; } -function decreader(d) { - var r={}; r.tup = 'reader'; - r.id = d && d.v[1] ? decode(d.v[1].v) : undefined; - r.pos = d && d.v[2] ? type(d.v[2].v) : undefined; - r.cache = d && d.v[3] ? decode(d.v[3].v) : undefined; - r.args = d && d.v[4] ? decode(d.v[4].v) : undefined; - r.feed = d && d.v[5] ? decode(d.v[5].v) : undefined; - r.dir = d && d.v[6] ? decode(d.v[6]) : undefined; - return clean(r); } - -function enccur(d) { - var tup = atom('cur'); - var id = 'id' in d && d.id ? encode(d.id) : nil(); - var top = 'top' in d && d.top ? number(d.top) : nil(); - var bot = 'bot' in d && d.bot ? number(d.bot) : nil(); - var dir = 'dir' in d && d.dir ? encode(d.dir) : nil(); - var reader = 'reader' in d && d.reader ? encode(d.reader) : nil(); - var writer = 'writer' in d && d.writer ? encode(d.writer) : nil(); - var args = []; if ('args' in d && d.args) - { d.args.forEach(function(x){ - args.push(encode(x))}); - args={t:108,v:args}; } else { args = nil() }; - return tuple(tup,id,top,bot,dir,reader,writer,args); } - -function lencur() { return 8; } -function deccur(d) { - var r={}; r.tup = 'cur'; - r.id = d && d.v[1] ? decode(d.v[1].v) : undefined; - r.top = d && d.v[2] ? type(d.v[2].v) : undefined; - r.bot = d && d.v[3] ? type(d.v[3].v) : undefined; - r.dir = d && d.v[4] ? decode(d.v[4]) : undefined; - r.reader = d && d.v[5] ? decode(d.v[5].v) : undefined; - r.writer = d && d.v[6] ? decode(d.v[6].v) : undefined; - r.args = []; - (d && d.v[7] && d.v[7].v) ? - d.v[7].v.forEach(function(x){r.args.push(decode(x))}) : - r.args = undefined; - return clean(r); } - -function enciter(d) { - var tup = atom('iter'); - var id = 'id' in d && d.id ? number(d.id) : nil(); - var feed = 'feed' in d && d.feed ? encode(d.feed) : nil(); - var next = 'next' in d && d.next ? number(d.next) : nil(); - var prev = 'prev' in d && d.prev ? number(d.prev) : nil(); - return tuple(tup,id,feed,next,prev); } - -function leniter() { return 5; } -function deciter(d) { - var r={}; r.tup = 'iter'; - r.id = d && d.v[1] ? type(d.v[1].v) : undefined; - r.feed = d && d.v[2] ? decode(d.v[2].v) : undefined; - r.next = d && d.v[3] ? type(d.v[3].v) : undefined; - r.prev = d && d.v[4] ? type(d.v[4].v) : undefined; - return clean(r); } - -function enccontainer(d) { - var tup = atom('container'); - var id = 'id' in d && d.id ? number(d.id) : nil(); - var top = 'top' in d && d.top ? number(d.top) : nil(); - var rear = 'rear' in d && d.rear ? number(d.rear) : nil(); - var count = 'count' in d && d.count ? number(d.count) : nil(); - return tuple(tup,id,top,rear,count); } - -function lencontainer() { return 5; } -function deccontainer(d) { - var r={}; r.tup = 'container'; - r.id = d && d.v[1] ? type(d.v[1].v) : undefined; - r.top = d && d.v[2] ? type(d.v[2].v) : undefined; - r.rear = d && d.v[3] ? type(d.v[3].v) : undefined; - r.count = d && d.v[4] ? type(d.v[4].v) : undefined; - return clean(r); } - -function enciterator(d) { - var tup = atom('iterator'); - var id = 'id' in d && d.id ? number(d.id) : nil(); - var container = 'container' in d && d.container ? atom(d.container) : nil(); - var feed_id = 'feed_id' in d && d.feed_id ? encode(d.feed_id) : nil(); - var prev = 'prev' in d && d.prev ? number(d.prev) : nil(); - var next = 'next' in d && d.next ? number(d.next) : nil(); - var feeds = []; if ('feeds' in d && d.feeds) - { d.feeds.forEach(function(x){ - feeds.push(encode(x))}); - feeds={t:108,v:feeds}; } else { feeds = nil() }; - return tuple(tup,id,container,feed_id,prev,next,feeds); } - -function leniterator() { return 7; } -function deciterator(d) { - var r={}; r.tup = 'iterator'; - r.id = d && d.v[1] ? type(d.v[1].v) : undefined; - r.container = d && d.v[2] ? type(d.v[2].v) : undefined; - r.feed_id = d && d.v[3] ? decode(d.v[3].v) : undefined; - r.prev = d && d.v[4] ? type(d.v[4].v) : undefined; - r.next = d && d.v[5] ? type(d.v[5].v) : undefined; - r.feeds = []; - (d && d.v[6] && d.v[6].v) ? - d.v[6].v.forEach(function(x){r.feeds.push(decode(x))}) : - r.feeds = undefined; - return clean(r); } - -function enclog(d) { - var tup = atom('log'); - var id = 'id' in d && d.id ? number(d.id) : nil(); - var top = 'top' in d && d.top ? number(d.top) : nil(); - var rear = 'rear' in d && d.rear ? number(d.rear) : nil(); - var count = 'count' in d && d.count ? number(d.count) : nil(); - return tuple(tup,id,top,rear,count); } - -function lenlog() { return 5; } -function declog(d) { - var r={}; r.tup = 'log'; - r.id = d && d.v[1] ? type(d.v[1].v) : undefined; - r.top = d && d.v[2] ? type(d.v[2].v) : undefined; - r.rear = d && d.v[3] ? type(d.v[3].v) : undefined; - r.count = d && d.v[4] ? type(d.v[4].v) : undefined; - return clean(r); } - -function encoperation(d) { - var tup = atom('operation'); - var id = 'id' in d && d.id ? number(d.id) : nil(); - var container = 'container' in d && d.container ? atom(d.container) : nil(); - var feed_id = 'feed_id' in d && d.feed_id ? encode(d.feed_id) : nil(); - var prev = 'prev' in d && d.prev ? number(d.prev) : nil(); - var next = 'next' in d && d.next ? number(d.next) : nil(); - var feeds = []; if ('feeds' in d && d.feeds) - { d.feeds.forEach(function(x){ - feeds.push(encode(x))}); - feeds={t:108,v:feeds}; } else { feeds = nil() }; - return tuple(tup,id,container,feed_id,prev,next,feeds); } - -function lenoperation() { return 7; } -function decoperation(d) { - var r={}; r.tup = 'operation'; - r.id = d && d.v[1] ? type(d.v[1].v) : undefined; - r.container = d && d.v[2] ? type(d.v[2].v) : undefined; - r.feed_id = d && d.v[3] ? decode(d.v[3].v) : undefined; - r.prev = d && d.v[4] ? type(d.v[4].v) : undefined; - r.next = d && d.v[5] ? type(d.v[5].v) : undefined; - r.feeds = []; - (d && d.v[6] && d.v[6].v) ? - d.v[6].v.forEach(function(x){r.feeds.push(decode(x))}) : - r.feeds = undefined; - return clean(r); } - -function encerror(d) { - var tup = atom('error'); - var code = 'code' in d && d.code ? encode(d.code) : nil(); - return tuple(tup,code); } - -function lenerror() { return 2; } -function decerror(d) { - var r={}; r.tup = 'error'; - r.code = d && d.v[1] ? decode(d.v[1]) : undefined; - return clean(r); } - -function encok(d) { - var tup = atom('ok'); - var code = 'code' in d && d.code ? encode(d.code) : nil(); - return tuple(tup,code); } - -function lenok() { return 2; } -function decok(d) { - var r={}; r.tup = 'ok'; - r.code = d && d.v[1] ? decode(d.v[1]) : undefined; - return clean(r); } - -function encerror2(d) { - var tup = atom('error2'); - var code = 'code' in d && d.code ? atom(d.code) : nil(); - var src = 'src' in d && d.src ? encode(d.src) : nil(); - return tuple(tup,code,src); } - -function lenerror2() { return 3; } -function decerror2(d) { - var r={}; r.tup = 'error2'; - r.code = d && d.v[1] ? type(d.v[1].v) : undefined; - r.src = d && d.v[2] ? decode(d.v[2]) : undefined; - return clean(r); } - -function encok2(d) { - var tup = atom('ok2'); - var code = 'code' in d && d.code ? encode(d.code) : nil(); - var src = 'src' in d && d.src ? encode(d.src) : nil(); - return tuple(tup,code,src); } - -function lenok2() { return 3; } -function decok2(d) { - var r={}; r.tup = 'ok2'; - r.code = d && d.v[1] ? decode(d.v[1].v) : undefined; - r.src = d && d.v[2] ? decode(d.v[2]) : undefined; - return clean(r); } - -function encio(d) { - var tup = atom('io'); - var code = 'code' in d && d.code ? encode(d.code) : nil(); - var data = 'data' in d && d.data ? encode(d.data) : nil(); - return tuple(tup,code,data); } - -function lenio() { return 3; } -function decio(d) { - var r={}; r.tup = 'io'; - r.code = d && d.v[1] ? decode(d.v[1]) : undefined; - r.data = d && d.v[2] ? decode(d.v[2]) : undefined; - return clean(r); } - -function encchain(d) { - var tup = atom('chain'); - var id = 'id' in d && d.id ? number(d.id) : nil(); - var top = 'top' in d && d.top ? number(d.top) : nil(); - var rear = 'rear' in d && d.rear ? number(d.rear) : nil(); - var count = 'count' in d && d.count ? number(d.count) : nil(); - return tuple(tup,id,top,rear,count); } - -function lenchain() { return 5; } -function decchain(d) { - var r={}; r.tup = 'chain'; - r.id = d && d.v[1] ? type(d.v[1].v) : undefined; - r.top = d && d.v[2] ? type(d.v[2].v) : undefined; - r.rear = d && d.v[3] ? type(d.v[3].v) : undefined; - r.count = d && d.v[4] ? type(d.v[4].v) : undefined; - return clean(r); } - -function encpush(d) { - var tup = atom('push'); - var model = 'model' in d && d.model ? bin(d.model) : nil(); - var type = 'type' in d && d.type ? bin(d.type) : nil(); - var title = 'title' in d && d.title ? bin(d.title) : nil(); - var alert = 'alert' in d && d.alert ? bin(d.alert) : nil(); - var badge = 'badge' in d && d.badge ? number(d.badge) : nil(); - var sound = 'sound' in d && d.sound ? bin(d.sound) : nil(); - return tuple(tup,model,type,title,alert,badge,sound); } - -function lenpush() { return 7; } -function decpush(d) { - var r={}; r.tup = 'push'; - r.model = d && d.v[1] ? type(d.v[1].v) : undefined; - r.type = d && d.v[2] ? type(d.v[2].v) : undefined; - r.title = d && d.v[3] ? type(d.v[3].v) : undefined; - r.alert = d && d.v[4] ? type(d.v[4].v) : undefined; - r.badge = d && d.v[5] ? type(d.v[5].v) : undefined; - r.sound = d && d.v[6] ? type(d.v[6].v) : undefined; - return clean(r); } - -function encSearch(d) { - var tup = atom('Search'); - var id = 'id' in d && d.id ? number(d.id) : nil(); - var phone = []; if ('phone' in d && d.phone) - { d.phone.forEach(function(x){ - phone.push(encode(x))}); - phone={t:108,v:phone}; } else { phone = nil() }; - var names = 'names' in d && d.names ? bin(d.names) : nil(); - var surnames = 'surnames' in d && d.surnames ? bin(d.surnames) : nil(); - var query = 'query' in d && d.query ? bin(d.query) : nil(); - var status = 'status' in d && d.status ? atom(d.status) : nil(); - return tuple(tup,id,phone,names,surnames,query,status); } - -function lenSearch() { return 7; } -function decSearch(d) { - var r={}; r.tup = 'Search'; - r.id = d && d.v[1] ? type(d.v[1].v) : undefined; - r.phone = []; - (d && d.v[2] && d.v[2].v) ? - d.v[2].v.forEach(function(x){r.phone.push(decode(x))}) : - r.phone = undefined; - r.names = d && d.v[3] ? type(d.v[3].v) : undefined; - r.surnames = d && d.v[4] ? type(d.v[4].v) : undefined; - r.query = d && d.v[5] ? type(d.v[5].v) : undefined; - r.status = d && d.v[6] ? decode(d.v[6]) : undefined; - return clean(r); } - -function encp2p(d) { - var tup = atom('p2p'); - var from = 'from' in d && d.from ? bin(d.from) : nil(); - var to = 'to' in d && d.to ? bin(d.to) : nil(); - return tuple(tup,from,to); } - -function lenp2p() { return 3; } -function decp2p(d) { - var r={}; r.tup = 'p2p'; - r.from = d && d.v[1] ? type(d.v[1].v) : undefined; - r.to = d && d.v[2] ? type(d.v[2].v) : undefined; - return clean(r); } - -function encmuc(d) { - var tup = atom('muc'); - var name = 'name' in d && d.name ? bin(d.name) : nil(); - return tuple(tup,name); } - -function lenmuc() { return 2; } -function decmuc(d) { - var r={}; r.tup = 'muc'; - r.name = d && d.v[1] ? type(d.v[1].v) : undefined; - return clean(r); } - -function encCDR(d) { - var tup = atom('CDR'); - var id = 'id' in d && d.id ? number(d.id) : nil(); - var feed = 'feed' in d && d.feed ? encode(d.feed) : nil(); - var next = 'next' in d && d.next ? number(d.next) : nil(); - var prev = 'prev' in d && d.prev ? number(d.prev) : nil(); - var from = 'from' in d && d.from ? bin(d.from) : nil(); - var to = 'to' in d && d.to ? bin(d.to) : nil(); - var start = 'start' in d && d.start ? number(d.start) : nil(); - var stop = 'stop' in d && d.stop ? number(d.stop) : nil(); - var bill = 'bill' in d && d.bill ? number(d.bill) : nil(); - var tariff = 'tariff' in d && d.tariff ? bin(d.tariff) : nil(); - return tuple(tup,id,feed,next,prev,from,to,start,stop,bill,tariff); } - -function lenCDR() { return 11; } -function decCDR(d) { - var r={}; r.tup = 'CDR'; - r.id = d && d.v[1] ? type(d.v[1].v) : undefined; - r.feed = d && d.v[2] ? decode(d.v[2].v) : undefined; - r.next = d && d.v[3] ? type(d.v[3].v) : undefined; - r.prev = d && d.v[4] ? type(d.v[4].v) : undefined; - r.from = d && d.v[5] ? type(d.v[5].v) : undefined; - r.to = d && d.v[6] ? type(d.v[6].v) : undefined; - r.start = d && d.v[7] ? type(d.v[7].v) : undefined; - r.stop = d && d.v[8] ? type(d.v[8].v) : undefined; - r.bill = d && d.v[9] ? type(d.v[9].v) : undefined; - r.tariff = d && d.v[10] ? type(d.v[10].v) : undefined; - return clean(r); } - -function encMember(d) { - var tup = atom('Member'); - var id = 'id' in d && d.id ? number(d.id) : nil(); - var container = 'container' in d && d.container ? encode(d.container) : nil(); - var feed_id = 'feed_id' in d && d.feed_id ? encode(d.feed_id) : nil(); - var prev = 'prev' in d && d.prev ? number(d.prev) : nil(); - var next = 'next' in d && d.next ? number(d.next) : nil(); - var phone_id = 'phone_id' in d && d.phone_id ? bin(d.phone_id) : nil(); - var avatar = 'avatar' in d && d.avatar ? bin(d.avatar) : nil(); - var names = 'names' in d && d.names ? bin(d.names) : nil(); - var surnames = 'surnames' in d && d.surnames ? bin(d.surnames) : nil(); - var nick = 'nick' in d && d.nick ? bin(d.nick) : nil(); - var email = 'email' in d && d.email ? bin(d.email) : nil(); - var person_id = 'person_id' in d && d.person_id ? bin(d.person_id) : nil(); - var unread = 'unread' in d && d.unread ? number(d.unread) : nil(); - var update = 'update' in d && d.update ? number(d.update) : nil(); - var presence = 'presence' in d && d.presence ? atom(d.presence) : nil(); - var status = 'status' in d && d.status ? atom(d.status) : nil(); - return tuple(tup,id,container,feed_id,prev,next,phone_id,avatar,names,surnames,nick, - email,person_id,unread,update,presence,status); } - -function lenMember() { return 17; } -function decMember(d) { - var r={}; r.tup = 'Member'; - r.id = d && d.v[1] ? type(d.v[1].v) : undefined; - r.container = d && d.v[2] ? decode(d.v[2]) : undefined; - r.feed_id = d && d.v[3] ? decode(d.v[3]) : undefined; - r.prev = d && d.v[4] ? type(d.v[4].v) : undefined; - r.next = d && d.v[5] ? type(d.v[5].v) : undefined; - r.phone_id = d && d.v[6] ? type(d.v[6].v) : undefined; - r.avatar = d && d.v[7] ? type(d.v[7].v) : undefined; - r.names = d && d.v[8] ? type(d.v[8].v) : undefined; - r.surnames = d && d.v[9] ? type(d.v[9].v) : undefined; - r.nick = d && d.v[10] ? type(d.v[10].v) : undefined; - r.email = d && d.v[11] ? type(d.v[11].v) : undefined; - r.person_id = d && d.v[12] ? type(d.v[12].v) : undefined; - r.unread = d && d.v[13] ? type(d.v[13].v) : undefined; - r.update = d && d.v[14] ? type(d.v[14].v) : undefined; - r.presence = d && d.v[15] ? decode(d.v[15]) : undefined; - r.status = d && d.v[16] ? decode(d.v[16]) : undefined; - return clean(r); } - -function encRoom(d) { - var tup = atom('Room'); - var room = 'room' in d && d.room ? bin(d.room) : nil(); - var description = 'description' in d && d.description ? bin(d.description) : nil(); - var settings = []; if ('settings' in d && d.settings) - { d.settings.forEach(function(x){ - settings.push(encode(x))}); - settings={t:108,v:settings}; } else { settings = nil() }; - var members = []; if ('members' in d && d.members) - { d.members.forEach(function(x){ - members.push(encode(x))}); - members={t:108,v:members}; } else { members = nil() }; - var admins = []; if ('admins' in d && d.admins) - { d.admins.forEach(function(x){ - admins.push(encode(x))}); - admins={t:108,v:admins}; } else { admins = nil() }; - var type = 'type' in d && d.type ? atom(d.type) : nil(); - var tos = 'tos' in d && d.tos ? bin(d.tos) : nil(); - var status = 'status' in d && d.status ? atom(d.status) : nil(); - return tuple(tup,room,description,settings,members,admins,type,tos,status); } - -function lenRoom() { return 9; } -function decRoom(d) { - var r={}; r.tup = 'Room'; - r.room = d && d.v[1] ? type(d.v[1].v) : undefined; - r.description = d && d.v[2] ? type(d.v[2].v) : undefined; - r.settings = []; - (d && d.v[3] && d.v[3].v) ? - d.v[3].v.forEach(function(x){r.settings.push(decode(x))}) : - r.settings = undefined; - r.members = []; - (d && d.v[4] && d.v[4].v) ? - d.v[4].v.forEach(function(x){r.members.push(decode(x))}) : - r.members = undefined; - r.admins = []; - (d && d.v[5] && d.v[5].v) ? - d.v[5].v.forEach(function(x){r.admins.push(decode(x))}) : - r.admins = undefined; - r.type = d && d.v[6] ? decode(d.v[6]) : undefined; - r.tos = d && d.v[7] ? type(d.v[7].v) : undefined; - r.status = d && d.v[8] ? decode(d.v[8]) : undefined; - return clean(r); } - -function encCursor(d) { - var tup = atom('Cursor'); - var feed = 'feed' in d && d.feed ? encode(d.feed) : nil(); - var aux = 'aux' in d && d.aux ? number(d.aux) : nil(); - var position = 'position' in d && d.position ? number(d.position) : nil(); - return tuple(tup,feed,aux,position); } - -function lenCursor() { return 4; } -function decCursor(d) { - var r={}; r.tup = 'Cursor'; - r.feed = d && d.v[1] ? decode(d.v[1].v) : undefined; - r.aux = d && d.v[2] ? type(d.v[2].v) : undefined; - r.position = d && d.v[3] ? type(d.v[3].v) : undefined; - return clean(r); } - -function encPerson(d) { - var tup = atom('Person'); - var id = 'id' in d && d.id ? bin(d.id) : nil(); - var phonelist = []; if ('phonelist' in d && d.phonelist) - { d.phonelist.forEach(function(x){ - phonelist.push(encode(x))}); - phonelist={t:108,v:phonelist}; } else { phonelist = nil() }; - var alias = []; if ('alias' in d && d.alias) - { d.alias.forEach(function(x){ - alias.push(encode(x))}); - alias={t:108,v:alias}; } else { alias = nil() }; - var localize = []; if ('localize' in d && d.localize) - { d.localize.forEach(function(x){ - localize.push(encode(x))}); - localize={t:108,v:localize}; } else { localize = nil() }; - var NotificationSettings = []; if ('NotificationSettings' in d && d.NotificationSettings) - { d.NotificationSettings.forEach(function(x){ - NotificationSettings.push(encode(x))}); - NotificationSettings={t:108,v:NotificationSettings}; } else { NotificationSettings = nil() }; - var SoundSettings = []; if ('SoundSettings' in d && d.SoundSettings) - { d.SoundSettings.forEach(function(x){ - SoundSettings.push(encode(x))}); - SoundSettings={t:108,v:SoundSettings}; } else { SoundSettings = nil() }; - var ThemeID = 'ThemeID' in d && d.ThemeID ? bin(d.ThemeID) : nil(); - var voxImplantID = 'voxImplantID' in d && d.voxImplantID ? bin(d.voxImplantID) : nil(); - var voxImplantLogin = 'voxImplantLogin' in d && d.voxImplantLogin ? bin(d.voxImplantLogin) : nil(); - var voxImplantPassword = 'voxImplantPassword' in d && d.voxImplantPassword ? bin(d.voxImplantPassword) : nil(); - var BlockUsers = []; if ('BlockUsers' in d && d.BlockUsers) - { d.BlockUsers.forEach(function(x){ - BlockUsers.push(encode(x))}); - BlockUsers={t:108,v:BlockUsers}; } else { BlockUsers = nil() }; - var balance = 'balance' in d && d.balance ? number(d.balance) : nil(); - var isParticipants = []; if ('isParticipants' in d && d.isParticipants) - { d.isParticipants.forEach(function(x){ - isParticipants.push(encode(x))}); - isParticipants={t:108,v:isParticipants}; } else { isParticipants = nil() }; - var status = 'status' in d && d.status ? encode(d.status) : nil(); - return tuple(tup,id,phonelist,alias,localize,NotificationSettings,SoundSettings,ThemeID,voxImplantID,voxImplantLogin,voxImplantPassword, - BlockUsers,balance,isParticipants,status); } - -function lenPerson() { return 15; } -function decPerson(d) { - var r={}; r.tup = 'Person'; - r.id = d && d.v[1] ? type(d.v[1].v) : undefined; - r.phonelist = []; - (d && d.v[2] && d.v[2].v) ? - d.v[2].v.forEach(function(x){r.phonelist.push(decode(x))}) : - r.phonelist = undefined; - r.alias = []; - (d && d.v[3] && d.v[3].v) ? - d.v[3].v.forEach(function(x){r.alias.push(decode(x))}) : - r.alias = undefined; - r.localize = []; - (d && d.v[4] && d.v[4].v) ? - d.v[4].v.forEach(function(x){r.localize.push(decode(x))}) : - r.localize = undefined; - r.NotificationSettings = []; - (d && d.v[5] && d.v[5].v) ? - d.v[5].v.forEach(function(x){r.NotificationSettings.push(decode(x))}) : - r.NotificationSettings = undefined; - r.SoundSettings = []; - (d && d.v[6] && d.v[6].v) ? - d.v[6].v.forEach(function(x){r.SoundSettings.push(decode(x))}) : - r.SoundSettings = undefined; - r.ThemeID = d && d.v[7] ? type(d.v[7].v) : undefined; - r.voxImplantID = d && d.v[8] ? type(d.v[8].v) : undefined; - r.voxImplantLogin = d && d.v[9] ? type(d.v[9].v) : undefined; - r.voxImplantPassword = d && d.v[10] ? type(d.v[10].v) : undefined; - r.BlockUsers = []; - (d && d.v[11] && d.v[11].v) ? - d.v[11].v.forEach(function(x){r.BlockUsers.push(decode(x))}) : - r.BlockUsers = undefined; - r.balance = d && d.v[12] ? type(d.v[12].v) : undefined; - r.isParticipants = []; - (d && d.v[13] && d.v[13].v) ? - d.v[13].v.forEach(function(x){r.isParticipants.push(decode(x))}) : - r.isParticipants = undefined; - r.status = d && d.v[14] ? decode(d.v[14]) : undefined; - return clean(r); } - -function encDesc(d) { - var tup = atom('Desc'); - var mime = 'mime' in d && d.mime ? bin(d.mime) : nil(); - var payload = 'payload' in d && d.payload ? bin(d.payload) : nil(); - var size = 'size' in d && d.size ? number(d.size) : nil(); - var filename = 'filename' in d && d.filename ? bin(d.filename) : nil(); - var info = 'info' in d && d.info ? bin(d.info) : nil(); - return tuple(tup,mime,payload,size,filename,info); } - -function lenDesc() { return 6; } -function decDesc(d) { - var r={}; r.tup = 'Desc'; - r.mime = d && d.v[1] ? type(d.v[1].v) : undefined; - r.payload = d && d.v[2] ? type(d.v[2].v) : undefined; - r.size = d && d.v[3] ? type(d.v[3].v) : undefined; - r.filename = d && d.v[4] ? type(d.v[4].v) : undefined; - r.info = d && d.v[5] ? type(d.v[5].v) : undefined; - return clean(r); } - -function encMessage(d) { - var tup = atom('Message'); - var id = 'id' in d && d.id ? number(d.id) : nil(); - var container = 'container' in d && d.container ? encode(d.container) : nil(); - var feed_id = 'feed_id' in d && d.feed_id ? encode(d.feed_id) : nil(); - var prev = 'prev' in d && d.prev ? number(d.prev) : nil(); - var next = 'next' in d && d.next ? number(d.next) : nil(); - var msg_id = 'msg_id' in d && d.msg_id ? bin(d.msg_id) : nil(); - var from = 'from' in d && d.from ? bin(d.from) : nil(); - var to = 'to' in d && d.to ? bin(d.to) : nil(); - var created = 'created' in d && d.created ? encode(d.created) : nil(); - var files = []; if ('files' in d && d.files) - { d.files.forEach(function(x){ - files.push(encode(x))}); - files={t:108,v:files}; } else { files = nil() }; - var type = 'type' in d && d.type ? atom(d.type) : nil(); - var edit_msg = 'edit_msg' in d && d.edit_msg ? number(d.edit_msg) : nil(); - var status = 'status' in d && d.status ? encode(d.status) : nil(); - return tuple(tup,id,container,feed_id,prev,next,msg_id,from,to,created,files, - type,edit_msg,status); } - -function lenMessage() { return 14; } -function decMessage(d) { - var r={}; r.tup = 'Message'; - r.id = d && d.v[1] ? type(d.v[1].v) : undefined; - r.container = d && d.v[2] ? decode(d.v[2]) : undefined; - r.feed_id = d && d.v[3] ? decode(d.v[3]) : undefined; - r.prev = d && d.v[4] ? type(d.v[4].v) : undefined; - r.next = d && d.v[5] ? type(d.v[5].v) : undefined; - r.msg_id = d && d.v[6] ? type(d.v[6].v) : undefined; - r.from = d && d.v[7] ? type(d.v[7].v) : undefined; - r.to = d && d.v[8] ? type(d.v[8].v) : undefined; - r.created = d && d.v[9] ? decode(d.v[9]) : undefined; - r.files = []; - (d && d.v[10] && d.v[10].v) ? - d.v[10].v.forEach(function(x){r.files.push(decode(x))}) : - r.files = undefined; - r.type = d && d.v[11] ? decode(d.v[11]) : undefined; - r.edit_msg = d && d.v[12] ? type(d.v[12].v) : undefined; - r.status = d && d.v[13] ? decode(d.v[13]) : undefined; - return clean(r); } - -function encStar(d) { - var tup = atom('Star'); - var roster_id = 'roster_id' in d && d.roster_id ? bin(d.roster_id) : nil(); - var message = 'message' in d && d.message ? encode(d.message) : nil(); - var tag = 'tag' in d && d.tag ? bin(d.tag) : nil(); - var status = 'status' in d && d.status ? atom(d.status) : nil(); - return tuple(tup,roster_id,message,tag,status); } - -function lenStar() { return 5; } -function decStar(d) { - var r={}; r.tup = 'Star'; - r.roster_id = d && d.v[1] ? type(d.v[1].v) : undefined; - r.message = d && d.v[2] ? decode(d.v[2]) : undefined; - r.tag = d && d.v[3] ? type(d.v[3].v) : undefined; - r.status = d && d.v[4] ? decode(d.v[4]) : undefined; - return clean(r); } - -function encTag(d) { - var tup = atom('Tag'); - var roster_id = 'roster_id' in d && d.roster_id ? bin(d.roster_id) : nil(); - var name = 'name' in d && d.name ? bin(d.name) : nil(); - var color = 'color' in d && d.color ? bin(d.color) : nil(); - var status = 'status' in d && d.status ? atom(d.status) : nil(); - return tuple(tup,roster_id,name,color,status); } - -function lenTag() { return 5; } -function decTag(d) { - var r={}; r.tup = 'Tag'; - r.roster_id = d && d.v[1] ? type(d.v[1].v) : undefined; - r.name = d && d.v[2] ? type(d.v[2].v) : undefined; - r.color = d && d.v[3] ? type(d.v[3].v) : undefined; - r.status = d && d.v[4] ? decode(d.v[4]) : undefined; - return clean(r); } - -function encHistory(d) { - var tup = atom('History'); - var roster_id = 'roster_id' in d && d.roster_id ? bin(d.roster_id) : nil(); - var contact_id = 'contact_id' in d && d.contact_id ? bin(d.contact_id) : nil(); - var cursor = 'cursor' in d && d.cursor ? encode(d.cursor) : nil(); - var data = []; if ('data' in d && d.data) - { d.data.forEach(function(x){ - data.push(encode(x))}); - data={t:108,v:data}; } else { data = nil() }; - var status = 'status' in d && d.status ? encode(d.status) : nil(); - return tuple(tup,roster_id,contact_id,cursor,data,status); } - -function lenHistory() { return 6; } -function decHistory(d) { - var r={}; r.tup = 'History'; - r.roster_id = d && d.v[1] ? type(d.v[1].v) : undefined; - r.contact_id = d && d.v[2] ? type(d.v[2].v) : undefined; - r.cursor = d && d.v[3] ? decode(d.v[3]) : undefined; - r.data = []; - (d && d.v[4] && d.v[4].v) ? - d.v[4].v.forEach(function(x){r.data.push(decode(x))}) : - r.data = undefined; - r.status = d && d.v[5] ? decode(d.v[5]) : undefined; - return clean(r); } - -function encTyping(d) { - var tup = atom('Typing'); - var phone_id = 'phone_id' in d && d.phone_id ? bin(d.phone_id) : nil(); - var comments = 'comments' in d && d.comments ? encode(d.comments) : nil(); - return tuple(tup,phone_id,comments); } - -function lenTyping() { return 3; } -function decTyping(d) { - var r={}; r.tup = 'Typing'; - r.phone_id = d && d.v[1] ? type(d.v[1].v) : undefined; - r.comments = d && d.v[2] ? decode(d.v[2].v) : undefined; - return clean(r); } - -function encContact(d) { - var tup = atom('Contact'); - var phone_id = 'phone_id' in d && d.phone_id ? bin(d.phone_id) : nil(); - var avatar = 'avatar' in d && d.avatar ? bin(d.avatar) : nil(); - var names = 'names' in d && d.names ? bin(d.names) : nil(); - var surnames = 'surnames' in d && d.surnames ? bin(d.surnames) : nil(); - var nick = 'nick' in d && d.nick ? bin(d.nick) : nil(); - var email = 'email' in d && d.email ? bin(d.email) : nil(); - var person_id = 'person_id' in d && d.person_id ? bin(d.person_id) : nil(); - var unread = 'unread' in d && d.unread ? number(d.unread) : nil(); - var last_msg = 'last_msg' in d && d.last_msg ? encode(d.last_msg) : nil(); - var update = 'update' in d && d.update ? number(d.update) : nil(); - var presence = 'presence' in d && d.presence ? atom(d.presence) : nil(); - var status = 'status' in d && d.status ? atom(d.status) : nil(); - return tuple(tup,phone_id,avatar,names,surnames,nick,email,person_id,unread,last_msg,update, - presence,status); } - -function lenContact() { return 13; } -function decContact(d) { - var r={}; r.tup = 'Contact'; - r.phone_id = d && d.v[1] ? type(d.v[1].v) : undefined; - r.avatar = d && d.v[2] ? type(d.v[2].v) : undefined; - r.names = d && d.v[3] ? type(d.v[3].v) : undefined; - r.surnames = d && d.v[4] ? type(d.v[4].v) : undefined; - r.nick = d && d.v[5] ? type(d.v[5].v) : undefined; - r.email = d && d.v[6] ? type(d.v[6].v) : undefined; - r.person_id = d && d.v[7] ? type(d.v[7].v) : undefined; - r.unread = d && d.v[8] ? type(d.v[8].v) : undefined; - r.last_msg = d && d.v[9] ? decode(d.v[9]) : undefined; - r.update = d && d.v[10] ? type(d.v[10].v) : undefined; - r.presence = d && d.v[11] ? type(d.v[11].v) : undefined; - r.status = d && d.v[12] ? decode(d.v[12]) : undefined; - return clean(r); } - -function encAuth(d) { - var tup = atom('Auth'); - var token = 'token' in d && d.token ? bin(d.token) : nil(); - var dev_key = 'dev_key' in d && d.dev_key ? bin(d.dev_key) : nil(); - var user_id = 'user_id' in d && d.user_id ? bin(d.user_id) : nil(); - var phone = 'phone' in d && d.phone ? bin(d.phone) : nil(); - var client_id = 'client_id' in d && d.client_id ? bin(d.client_id) : nil(); - var type = 'type' in d && d.type ? atom(d.type) : nil(); - var sms_code = 'sms_code' in d && d.sms_code ? bin(d.sms_code) : nil(); - var attempts = 'attempts' in d && d.attempts ? number(d.attempts) : nil(); - var services = []; if ('services' in d && d.services) - { d.services.forEach(function(x){ - services.push(encode(x))}); - services={t:108,v:services}; } else { services = nil() }; - var push = 'push' in d && d.push ? bin(d.push) : nil(); - var os = 'os' in d && d.os ? atom(d.os) : nil(); - var created = 'created' in d && d.created ? encode(d.created) : nil(); - var last_online = 'last_online' in d && d.last_online ? encode(d.last_online) : nil(); - return tuple(tup,token,dev_key,user_id,phone,client_id,type,sms_code,attempts,services,push, - os,created,last_online); } - -function lenAuth() { return 14; } -function decAuth(d) { - var r={}; r.tup = 'Auth'; - r.token = d && d.v[1] ? type(d.v[1].v) : undefined; - r.dev_key = d && d.v[2] ? type(d.v[2].v) : undefined; - r.user_id = d && d.v[3] ? type(d.v[3].v) : undefined; - r.phone = d && d.v[4] ? type(d.v[4].v) : undefined; - r.client_id = d && d.v[5] ? type(d.v[5].v) : undefined; - r.type = d && d.v[6] ? type(d.v[6].v) : undefined; - r.sms_code = d && d.v[7] ? type(d.v[7].v) : undefined; - r.attempts = d && d.v[8] ? type(d.v[8].v) : undefined; - r.services = []; - (d && d.v[9] && d.v[9].v) ? - d.v[9].v.forEach(function(x){r.services.push(decode(x))}) : - r.services = undefined; - r.push = d && d.v[10] ? type(d.v[10].v) : undefined; - r.os = d && d.v[11] ? decode(d.v[11]) : undefined; - r.created = d && d.v[12] ? decode(d.v[12]) : undefined; - r.last_online = d && d.v[13] ? decode(d.v[13]) : undefined; - return clean(r); } - -function encService(d) { - var tup = atom('Service'); - var id = 'id' in d && d.id ? bin(d.id) : nil(); - var type = 'type' in d && d.type ? atom(d.type) : nil(); - var external = 'external' in d && d.external ? encode(d.external) : nil(); - var status = 'status' in d && d.status ? atom(d.status) : nil(); - return tuple(tup,id,type,external,status); } - -function lenService() { return 5; } -function decService(d) { - var r={}; r.tup = 'Service'; - r.id = d && d.v[1] ? type(d.v[1].v) : undefined; - r.type = d && d.v[2] ? decode(d.v[2]) : undefined; - r.external = d && d.v[3] ? decode(d.v[3]) : undefined; - r.status = d && d.v[4] ? decode(d.v[4]) : undefined; - return clean(r); } - -function encRoster(d) { - var tup = atom('Roster'); - var id = 'id' in d && d.id ? number(d.id) : nil(); - var names = 'names' in d && d.names ? bin(d.names) : nil(); - var surnames = 'surnames' in d && d.surnames ? bin(d.surnames) : nil(); - var email = 'email' in d && d.email ? bin(d.email) : nil(); - var nick = 'nick' in d && d.nick ? bin(d.nick) : nil(); - var userlist = []; if ('userlist' in d && d.userlist) - { d.userlist.forEach(function(x){ - userlist.push(encode(x))}); - userlist={t:108,v:userlist}; } else { userlist = nil() }; - var roomlist = []; if ('roomlist' in d && d.roomlist) - { d.roomlist.forEach(function(x){ - roomlist.push(encode(x))}); - roomlist={t:108,v:roomlist}; } else { roomlist = nil() }; - var favorite = []; if ('favorite' in d && d.favorite) - { d.favorite.forEach(function(x){ - favorite.push(encode(x))}); - favorite={t:108,v:favorite}; } else { favorite = nil() }; - var tags = []; if ('tags' in d && d.tags) - { d.tags.forEach(function(x){ - tags.push(encode(x))}); - tags={t:108,v:tags}; } else { tags = nil() }; - var phone = 'phone' in d && d.phone ? bin(d.phone) : nil(); - var avatar = 'avatar' in d && d.avatar ? bin(d.avatar) : nil(); - var update = 'update' in d && d.update ? number(d.update) : nil(); - var status = 'status' in d && d.status ? atom(d.status) : nil(); - return tuple(tup,id,names,surnames,email,nick,userlist,roomlist,favorite,tags,phone, - avatar,update,status); } - -function lenRoster() { return 14; } -function decRoster(d) { - var r={}; r.tup = 'Roster'; - r.id = d && d.v[1] ? type(d.v[1].v) : undefined; - r.names = d && d.v[2] ? type(d.v[2].v) : undefined; - r.surnames = d && d.v[3] ? type(d.v[3].v) : undefined; - r.email = d && d.v[4] ? type(d.v[4].v) : undefined; - r.nick = d && d.v[5] ? type(d.v[5].v) : undefined; - r.userlist = []; - (d && d.v[6] && d.v[6].v) ? - d.v[6].v.forEach(function(x){r.userlist.push(decode(x))}) : - r.userlist = undefined; - r.roomlist = []; - (d && d.v[7] && d.v[7].v) ? - d.v[7].v.forEach(function(x){r.roomlist.push(decode(x))}) : - r.roomlist = undefined; - r.favorite = []; - (d && d.v[8] && d.v[8].v) ? - d.v[8].v.forEach(function(x){r.favorite.push(decode(x))}) : - r.favorite = undefined; - r.tags = []; - (d && d.v[9] && d.v[9].v) ? - d.v[9].v.forEach(function(x){r.tags.push(decode(x))}) : - r.tags = undefined; - r.phone = d && d.v[10] ? type(d.v[10].v) : undefined; - r.avatar = d && d.v[11] ? type(d.v[11].v) : undefined; - r.update = d && d.v[12] ? type(d.v[12].v) : undefined; - r.status = d && d.v[13] ? decode(d.v[13]) : undefined; - return clean(r); } - -function encFeature(d) { - var tup = atom('Feature'); - var id = 'id' in d && d.id ? bin(d.id) : nil(); - var key = 'key' in d && d.key ? bin(d.key) : nil(); - var value = 'value' in d && d.value ? bin(d.value) : nil(); - var group = 'group' in d && d.group ? bin(d.group) : nil(); - return tuple(tup,id,key,value,group); } - -function lenFeature() { return 5; } -function decFeature(d) { - var r={}; r.tup = 'Feature'; - r.id = d && d.v[1] ? type(d.v[1].v) : undefined; - r.key = d && d.v[2] ? type(d.v[2].v) : undefined; - r.value = d && d.v[3] ? type(d.v[3].v) : undefined; - r.group = d && d.v[4] ? type(d.v[4].v) : undefined; - return clean(r); } - -function encProfile(d) { - var tup = atom('Profile'); - var phone = 'phone' in d && d.phone ? bin(d.phone) : nil(); - var services = []; if ('services' in d && d.services) - { d.services.forEach(function(x){ - services.push(encode(x))}); - services={t:108,v:services}; } else { services = nil() }; - var rosters = []; if ('rosters' in d && d.rosters) - { d.rosters.forEach(function(x){ - rosters.push(encode(x))}); - rosters={t:108,v:rosters}; } else { rosters = nil() }; - var settings = []; if ('settings' in d && d.settings) - { d.settings.forEach(function(x){ - settings.push(encode(x))}); - settings={t:108,v:settings}; } else { settings = nil() }; - var update = 'update' in d && d.update ? number(d.update) : nil(); - var presence = 'presence' in d && d.presence ? atom(d.presence) : nil(); - var status = 'status' in d && d.status ? atom(d.status) : nil(); - return tuple(tup,phone,services,rosters,settings,update,presence,status); } - -function lenProfile() { return 8; } -function decProfile(d) { - var r={}; r.tup = 'Profile'; - r.phone = d && d.v[1] ? type(d.v[1].v) : undefined; - r.services = []; - (d && d.v[2] && d.v[2].v) ? - d.v[2].v.forEach(function(x){r.services.push(decode(x))}) : - r.services = undefined; - r.rosters = []; - (d && d.v[3] && d.v[3].v) ? - d.v[3].v.forEach(function(x){r.rosters.push(decode(x))}) : - r.rosters = undefined; - r.settings = []; - (d && d.v[4] && d.v[4].v) ? - d.v[4].v.forEach(function(x){r.settings.push(decode(x))}) : - r.settings = undefined; - r.update = d && d.v[5] ? type(d.v[5].v) : undefined; - r.presence = d && d.v[6] ? type(d.v[6].v) : undefined; - r.status = d && d.v[7] ? type(d.v[7].v) : undefined; - return clean(r); } - -function encLoc(d) { - var tup = atom('Loc'); - var x = 'x' in d && d.x ? bin(d.x) : nil(); - var y = 'y' in d && d.y ? bin(d.y) : nil(); - var z = 'z' in d && d.z ? bin(d.z) : nil(); - return tuple(tup,x,y,z); } - -function lenLoc() { return 4; } -function decLoc(d) { - var r={}; r.tup = 'Loc'; - r.x = d && d.v[1] ? type(d.v[1].v) : undefined; - r.y = d && d.v[2] ? type(d.v[2].v) : undefined; - r.z = d && d.v[3] ? type(d.v[3].v) : undefined; - return clean(r); } - -function encFriend(d) { - var tup = atom('Friend'); - var id = 'id' in d && d.id ? bin(d.id) : nil(); - var roster_id = 'roster_id' in d && d.roster_id ? number(d.roster_id) : nil(); - var friend_id = 'friend_id' in d && d.friend_id ? bin(d.friend_id) : nil(); - var status = 'status' in d && d.status ? atom(d.status) : nil(); - return tuple(tup,id,roster_id,friend_id,status); } - -function lenFriend() { return 5; } -function decFriend(d) { - var r={}; r.tup = 'Friend'; - r.id = d && d.v[1] ? type(d.v[1].v) : undefined; - r.roster_id = d && d.v[2] ? type(d.v[2].v) : undefined; - r.friend_id = d && d.v[3] ? type(d.v[3].v) : undefined; - r.status = d && d.v[4] ? decode(d.v[4]) : undefined; - return clean(r); } - diff --git a/apps/roster/priv/macbert/Model/Auth.swift b/apps/roster/priv/macbert/Model/Auth.swift deleted file mode 100644 index 8799d227b..000000000 --- a/apps/roster/priv/macbert/Model/Auth.swift +++ /dev/null @@ -1,16 +0,0 @@ - -class Auth { - var token: String? - var dev_key: String? - var user_id: String? - var phone: String? - var client_id: String? - var type: StringAtom? - var sms_code: String? - var attempts: Int64? - var services: [String]? - var push: String? - var os: AnyObject? - var created: AnyObject? - var last_online: AnyObject? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/CDR.swift b/apps/roster/priv/macbert/Model/CDR.swift deleted file mode 100644 index b6aa23bf1..000000000 --- a/apps/roster/priv/macbert/Model/CDR.swift +++ /dev/null @@ -1,13 +0,0 @@ - -class CDR { - var id: Int64? - var feed: AnyObject? - var next: Int64? - var prev: Int64? - var from: String? - var to: String? - var start: Int64? - var stop: Int64? - var bill: Int64? - var tariff: String? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/Contact.swift b/apps/roster/priv/macbert/Model/Contact.swift deleted file mode 100644 index ac5ba16b7..000000000 --- a/apps/roster/priv/macbert/Model/Contact.swift +++ /dev/null @@ -1,15 +0,0 @@ - -class Contact { - var phone_id: String? - var avatar: String? - var names: String? - var surnames: String? - var nick: String? - var email: String? - var person_id: String? - var unread: Int64? - var last_msg: Message? - var update: Int64? - var presence: StringAtom? - var status: AnyObject? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/Cursor.swift b/apps/roster/priv/macbert/Model/Cursor.swift deleted file mode 100644 index ce7040e50..000000000 --- a/apps/roster/priv/macbert/Model/Cursor.swift +++ /dev/null @@ -1,6 +0,0 @@ - -class Cursor { - var feed: [AnyObject]? - var aux: Int64? - var position: Int64? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/Desc.swift b/apps/roster/priv/macbert/Model/Desc.swift deleted file mode 100644 index d6ef85071..000000000 --- a/apps/roster/priv/macbert/Model/Desc.swift +++ /dev/null @@ -1,8 +0,0 @@ - -class Desc { - var mime: String? - var payload: String? - var size: Int64? - var filename: String? - var info: String? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/Email.swift b/apps/roster/priv/macbert/Model/Email.swift deleted file mode 100644 index a2aaad7a5..000000000 --- a/apps/roster/priv/macbert/Model/Email.swift +++ /dev/null @@ -1,5 +0,0 @@ - -class Email { - var mail: String? - var status: AnyObject? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/Friend.swift b/apps/roster/priv/macbert/Model/Friend.swift deleted file mode 100644 index ecbd5d143..000000000 --- a/apps/roster/priv/macbert/Model/Friend.swift +++ /dev/null @@ -1,7 +0,0 @@ - -class Friend { - var id: String? - var roster_id: Int64? - var friend_id: String? - var status: AnyObject? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/History.swift b/apps/roster/priv/macbert/Model/History.swift deleted file mode 100644 index 0f5064fda..000000000 --- a/apps/roster/priv/macbert/Model/History.swift +++ /dev/null @@ -1,8 +0,0 @@ - -class History { - var roster_id: String? - var contact_id: String? - var cursor: AnyObject? - var data: [Message]? - var status: AnyObject? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/Loc.swift b/apps/roster/priv/macbert/Model/Loc.swift deleted file mode 100644 index 6ed7c7a6a..000000000 --- a/apps/roster/priv/macbert/Model/Loc.swift +++ /dev/null @@ -1,6 +0,0 @@ - -class Loc { - var x: String? - var y: String? - var z: String? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/Member.swift b/apps/roster/priv/macbert/Model/Member.swift deleted file mode 100644 index 72f320d8a..000000000 --- a/apps/roster/priv/macbert/Model/Member.swift +++ /dev/null @@ -1,19 +0,0 @@ - -class Member { - var id: Int64? - var container: AnyObject? - var feed_id: AnyObject? - var prev: Int64? - var next: Int64? - var phone_id: String? - var avatar: String? - var names: String? - var surnames: String? - var nick: String? - var email: String? - var person_id: String? - var unread: Int64? - var update: Int64? - var presence: AnyObject? - var status: AnyObject? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/Message.swift b/apps/roster/priv/macbert/Model/Message.swift deleted file mode 100644 index 958f24cb5..000000000 --- a/apps/roster/priv/macbert/Model/Message.swift +++ /dev/null @@ -1,16 +0,0 @@ - -class Message { - var id: Int64? - var container: AnyObject? - var feed_id: AnyObject? - var prev: Int64? - var next: Int64? - var msg_id: String? - var from: String? - var to: String? - var created: AnyObject? - var files: [Desc]? - var type: AnyObject? - var edit_msg: Int64? - var status: AnyObject? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/Person.swift b/apps/roster/priv/macbert/Model/Person.swift deleted file mode 100644 index 7996a1f2f..000000000 --- a/apps/roster/priv/macbert/Model/Person.swift +++ /dev/null @@ -1,17 +0,0 @@ - -class Person { - var id: String? - var phonelist: [AnyObject]? - var alias: [AnyObject]? - var localize: [AnyObject]? - var NotificationSettings: [AnyObject]? - var SoundSettings: [AnyObject]? - var ThemeID: String? - var voxImplantID: String? - var voxImplantLogin: String? - var voxImplantPassword: String? - var BlockUsers: [AnyObject]? - var balance: Int64? - var isParticipants: [String]? - var status: StringAtom? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/Profile.swift b/apps/roster/priv/macbert/Model/Profile.swift deleted file mode 100644 index a91f63ae7..000000000 --- a/apps/roster/priv/macbert/Model/Profile.swift +++ /dev/null @@ -1,10 +0,0 @@ - -class Profile { - var phone: String? - var services: [Service]? - var rosters: [AnyObject]? - var settings: [Feature]? - var update: Int64? - var presence: StringAtom? - var status: StringAtom? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/Room.swift b/apps/roster/priv/macbert/Model/Room.swift deleted file mode 100644 index 82fc4d9b3..000000000 --- a/apps/roster/priv/macbert/Model/Room.swift +++ /dev/null @@ -1,11 +0,0 @@ - -class Room { - var room: String? - var description: String? - var settings: [AnyObject]? - var members: [Member]? - var admins: [Member]? - var type: AnyObject? - var tos: String? - var status: AnyObject? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/Roster.swift b/apps/roster/priv/macbert/Model/Roster.swift deleted file mode 100644 index f2f90f8e3..000000000 --- a/apps/roster/priv/macbert/Model/Roster.swift +++ /dev/null @@ -1,16 +0,0 @@ - -class Roster { - var id: Int64? - var names: String? - var surnames: String? - var email: String? - var nick: String? - var userlist: [Contact]? - var roomlist: [Room]? - var favorite: [Star]? - var tags: [Tag]? - var phone: String? - var avatar: String? - var update: Int64? - var status: AnyObject? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/Search.swift b/apps/roster/priv/macbert/Model/Search.swift deleted file mode 100644 index f980049c6..000000000 --- a/apps/roster/priv/macbert/Model/Search.swift +++ /dev/null @@ -1,9 +0,0 @@ - -class Search { - var id: Int64? - var phone: [AnyObject]? - var names: String? - var surnames: String? - var query: String? - var status: AnyObject? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/Star.swift b/apps/roster/priv/macbert/Model/Star.swift deleted file mode 100644 index d4dde5394..000000000 --- a/apps/roster/priv/macbert/Model/Star.swift +++ /dev/null @@ -1,7 +0,0 @@ - -class Star { - var roster_id: String? - var message: Message? - var tag: String? - var status: AnyObject? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/Tag.swift b/apps/roster/priv/macbert/Model/Tag.swift deleted file mode 100644 index 207ca2095..000000000 --- a/apps/roster/priv/macbert/Model/Tag.swift +++ /dev/null @@ -1,7 +0,0 @@ - -class Tag { - var roster_id: String? - var name: String? - var color: String? - var status: AnyObject? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/Typing.swift b/apps/roster/priv/macbert/Model/Typing.swift deleted file mode 100644 index f37b18267..000000000 --- a/apps/roster/priv/macbert/Model/Typing.swift +++ /dev/null @@ -1,5 +0,0 @@ - -class Typing { - var phone_id: String? - var comments: AnyObject? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/chain.swift b/apps/roster/priv/macbert/Model/chain.swift deleted file mode 100644 index 14aea4f57..000000000 --- a/apps/roster/priv/macbert/Model/chain.swift +++ /dev/null @@ -1,7 +0,0 @@ - -class chain { - var id: Int64? - var top: Int64? - var rear: Int64? - var count: Int64? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/container.swift b/apps/roster/priv/macbert/Model/container.swift deleted file mode 100644 index 1ef7e8601..000000000 --- a/apps/roster/priv/macbert/Model/container.swift +++ /dev/null @@ -1,7 +0,0 @@ - -class container { - var id: Int64? - var top: Int64? - var rear: Int64? - var count: Int64? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/cur.swift b/apps/roster/priv/macbert/Model/cur.swift deleted file mode 100644 index 0ada6dd4d..000000000 --- a/apps/roster/priv/macbert/Model/cur.swift +++ /dev/null @@ -1,10 +0,0 @@ - -class cur { - var id: AnyObject? - var top: Int64? - var bot: Int64? - var dir: AnyObject? - var reader: [AnyObject]? - var writer: [AnyObject]? - var args: [AnyObject]? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/error.swift b/apps/roster/priv/macbert/Model/error.swift deleted file mode 100644 index 5ba03c36e..000000000 --- a/apps/roster/priv/macbert/Model/error.swift +++ /dev/null @@ -1,4 +0,0 @@ - -class error { - var code: AnyObject? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/error2.swift b/apps/roster/priv/macbert/Model/error2.swift deleted file mode 100644 index 12818a9ed..000000000 --- a/apps/roster/priv/macbert/Model/error2.swift +++ /dev/null @@ -1,5 +0,0 @@ - -class error2 { - var code: StringAtom? - var src: AnyObject? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/io.swift b/apps/roster/priv/macbert/Model/io.swift deleted file mode 100644 index 942786a26..000000000 --- a/apps/roster/priv/macbert/Model/io.swift +++ /dev/null @@ -1,5 +0,0 @@ - -class io { - var code: AnyObject? - var data: AnyObject? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/iter.swift b/apps/roster/priv/macbert/Model/iter.swift deleted file mode 100644 index 0965496e5..000000000 --- a/apps/roster/priv/macbert/Model/iter.swift +++ /dev/null @@ -1,7 +0,0 @@ - -class iter { - var id: Int64? - var feed: AnyObject? - var next: Int64? - var prev: Int64? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/iterator.swift b/apps/roster/priv/macbert/Model/iterator.swift deleted file mode 100644 index 81dfcdfdd..000000000 --- a/apps/roster/priv/macbert/Model/iterator.swift +++ /dev/null @@ -1,9 +0,0 @@ - -class iterator { - var id: Int64? - var container: StringAtom? - var feed_id: AnyObject? - var prev: Int64? - var next: Int64? - var feeds: [AnyObject]? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/log.swift b/apps/roster/priv/macbert/Model/log.swift deleted file mode 100644 index 5edb7154a..000000000 --- a/apps/roster/priv/macbert/Model/log.swift +++ /dev/null @@ -1,7 +0,0 @@ - -class log { - var id: Int64? - var top: Int64? - var rear: Int64? - var count: Int64? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/muc.swift b/apps/roster/priv/macbert/Model/muc.swift deleted file mode 100644 index 231649474..000000000 --- a/apps/roster/priv/macbert/Model/muc.swift +++ /dev/null @@ -1,4 +0,0 @@ - -class muc { - var name: String? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/ok.swift b/apps/roster/priv/macbert/Model/ok.swift deleted file mode 100644 index a9b3464bd..000000000 --- a/apps/roster/priv/macbert/Model/ok.swift +++ /dev/null @@ -1,4 +0,0 @@ - -class ok { - var code: AnyObject? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/ok2.swift b/apps/roster/priv/macbert/Model/ok2.swift deleted file mode 100644 index d7f0a42e1..000000000 --- a/apps/roster/priv/macbert/Model/ok2.swift +++ /dev/null @@ -1,5 +0,0 @@ - -class ok2 { - var code: AnyObject? - var src: AnyObject? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/operation.swift b/apps/roster/priv/macbert/Model/operation.swift deleted file mode 100644 index 5525550ed..000000000 --- a/apps/roster/priv/macbert/Model/operation.swift +++ /dev/null @@ -1,9 +0,0 @@ - -class operation { - var id: Int64? - var container: StringAtom? - var feed_id: AnyObject? - var prev: Int64? - var next: Int64? - var feeds: [AnyObject]? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/p2p.swift b/apps/roster/priv/macbert/Model/p2p.swift deleted file mode 100644 index 326162f9e..000000000 --- a/apps/roster/priv/macbert/Model/p2p.swift +++ /dev/null @@ -1,5 +0,0 @@ - -class p2p { - var from: String? - var to: String? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Model/push.swift b/apps/roster/priv/macbert/Model/push.swift deleted file mode 100644 index 2c5cab6b9..000000000 --- a/apps/roster/priv/macbert/Model/push.swift +++ /dev/null @@ -1,9 +0,0 @@ - -class push { - var model: String? - var type: String? - var title: String? - var alert: String? - var badge: Int64? - var sound: String? -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Source/Bert.swift b/apps/roster/priv/macbert/Source/Bert.swift deleted file mode 100644 index f83117752..000000000 --- a/apps/roster/priv/macbert/Source/Bert.swift +++ /dev/null @@ -1,693 +0,0 @@ -// -// AppDelegate.swift -// Nynja -// -// Created by Anton Makarov on 15.05.17. -// Copyright © 2017 TecSynt Solutions. All rights reserved. -// - -import Foundation - -enum BertError: Error { - case NotValidBertObject - case NotValidErlangTerm - case UnexpectedErlangType - case IntegerValueToLarge - case AtomLengthToLarge -} - -enum BertType: UInt8 { - case Version = 131 - case SmallAtom = 115 - case Atom = 100 - case Binary = 109 - case SmallInteger = 97 - case Integer = 98 - case SmallBig = 110 - // case LargetBig = 111 - // case Float = 99 - case NewFloat = 70 - case String = 107 - // case Port = 102 - // case Pid = 103 - case SmallTuple = 104 - case LargeTuple = 105 - case List = 108 - // case Reference = 101 - // case NewReference = 114 - case Nil = 106 -} - -class BertObject{ - var type: UInt8 = 0 - - var description : String { - get { - return "BertObject" - } - } -} - -class BertAtom: BertObject { - var value = "" - - init (fromString string: String) { - value = string - } - - override var description : String { - get { - if value == "" { - return "[]" - } - return value - } - } -} - -class BertBool: BertObject { - var value: Bool - - init (fromBool b: Bool) { - value = b - } - override var description : String { - get { - if value.description == "" { - return "[]" - } - return value.description - } - } -} - -class BertUndefined: BertAtom { - init () { - super.init(fromString: "undefined") - } - - override var description : String { - get { - if value.description == "" { - return "[]" - } - return value.description - } - } -} - -class BertBinary: BertObject { - var value: NSData - - init (fromNSData d: NSData) { - value = d - } - - override var description : String { - get { - let d = String(data: value as Data, encoding: String.Encoding.utf8) - return d ?? "__Can't GET data__" - } - } -} - -class BertNumber: BertObject { - var value: Int64 - - init (fromUInt8 i: UInt8) { - value = Int64(i) - } - - init (fromInt32 i: Int32) { - value = Int64(i) - } - - init (fromInt64 i: Int64) { - value = i - } - - override var description : String { - get { - return value.description - } - } -} - -class BertFloat: BertObject { - var value: Double - - init (fromDouble d: Double) { - value = d - } - override var description : String { - get { - return value.description - } - } -} - -class BertNil: BertObject { - - override var description : String { - get { - return "NIL" - } - } -} - -class BertString: BertObject { - var value: String - - init (fromString s: String) { - value = s - } - - override var description : String { - get { - return value - } - } -} - -class BertTuple: BertObject { - var elements: [BertObject] - - override var description : String { - get { - var res = "{" - for i in 0.. NSData { - let length = try getEncodeSize(object: object) - var offset: Int = 0 - var data = [UInt8](repeating: 0, count: length + 1) - - data[offset] = BertType.Version.rawValue - offset += 1 - try encodeInner(object: object, data: &data, offset: &offset) - - return NSData(bytes: data, length: length + 1) - } - - class func getObjectClassName(object: BertObject) -> String { - let className = NSStringFromClass(object_getClass(object)!) - let classNameArr = className.components(separatedBy: ".") - - return classNameArr.last! - } - - class func getEncodeSize (object: BertObject) throws -> Int { - switch getObjectClassName(object: object) { - case "BertBool": - let bool = (object as! BertBool) - return 1 + 2 + (bool.value ? 4 : 5) - case "BertUndefined": - return 1 + 2 + 9 - case "BertAtom": - let atom = (object as! BertAtom) - return 1 + 2 + atom.value.characters.count - case "BertBinary": - let binary = (object as! BertBinary) - return 1 + 4 + binary.value.length - case "BertNil": - return 1 - case "BertNumber": - let number = (object as! BertNumber) - if number.value >= 0 && number.value <= 255 { - return 1 + 1 - } - if number.value >= -2147483648 && number.value <= 2147483647 { - return 1 + 4 - } - return 1 + 1 + 8 - case "BertFloat": - return 1 + 8 - case "BertString": - // TODO: implement encoding for length > 0xFF - let string = (object as! BertString) - return 1 + 2 + string.value.characters.count - case "BertTuple": - let tuple = (object as! BertTuple) - var n = 0 - for element in tuple.elements { - n += try getEncodeSize(object: element) - } - return 1 + (tuple.elements.count <= 255 ? 1 : 4) + n - case "BertList": - let list = (object as! BertList) - var n = 0 - for element in list.elements { - n += try getEncodeSize(object: element) - } - return 1 + 4 + 1 + n - default: - throw BertError.UnexpectedErlangType - } - } - - class func encodeInner(object: BertObject, data: inout [UInt8], offset: inout Int) throws { - switch getObjectClassName(object: object) { - case "BertAtom": encodeAtom(atom: object as! BertAtom, data: &data, offset: &offset) - case "BertBool": encodeBool(bool: object as! BertBool, data: &data, offset: &offset) - case "BertUndefined": encodeAtom(atom: object as! BertUndefined, data: &data, offset: &offset) - case "BertBinary": encodeBinary(binary: object as! BertBinary, data: &data, offset: &offset) - case "BertNumber": encodeNumber(number: object as! BertNumber, data: &data, offset: &offset) - case "BertFloat": encodeFloat(float: object as! BertFloat, data: &data, offset: &offset) - case "BertString": encodeString(string: object as! BertString, data: &data, offset: &offset) - case "BertTuple": try encodeTuple(tuple: object as! BertTuple, data: &data, offset: &offset) - case "BertList": try encodeList(list: object as! BertList, data: &data, offset: &offset) - case "BertNil": encodeNil(data: &data, offset: &offset) - default: - throw BertError.UnexpectedErlangType - } - } - - class func encodeAtom(atom: BertAtom, data: inout [UInt8], offset: inout Int) { - let length = UInt16(atom.value.characters.count) - data[offset] = BertType.Atom.rawValue - offset += 1 - writeUInt16(i: length, data: &data, offset: &offset) - - memcpy(&data[offset], (atom.value as NSString).utf8String, Int(length)) - offset += Int(length) - } - - class func encodeBool(bool: BertBool, data: inout [UInt8], offset: inout Int) { - let atom = BertAtom(fromString: (bool.value ? "true" : "false")) - encodeAtom(atom: atom, data: &data, offset: &offset) - } - - class func encodeNil(data: inout [UInt8], offset: inout Int) { - data[offset] = BertType.Nil.rawValue - offset += 1 - // writeUInt16(i: 2, data: &data, offset: &offset) - - //memcpy(&data[offset], (atom.value as NSString).utf8String, 1) - //offset += 1 - } - - class func encodeBinary(binary: BertBinary, data: inout [UInt8], offset: inout Int) { - data[offset] = BertType.Binary.rawValue - offset += 1 - let length = UInt32(binary.value.length) - - writeUInt32(i: length, data: &data, offset: &offset) - - memcpy(&data[offset], binary.value.bytes, Int(length)) - offset += Int(length) - } - - class func encodeNumber(number: BertNumber, data: inout [UInt8], offset: inout Int) { - if number.value >= 0 && number.value <= 255 { - data[offset] = BertType.SmallInteger.rawValue - offset += 1 - data[offset] = UInt8(number.value) - offset += 1 - } else if number.value >= -2147483648 && number.value <= 2147483647 { - data[offset] = BertType.Integer.rawValue - offset += 1 - writeUInt32(i: UInt32(number.value), data: &data, offset: &offset) - } else { - data[offset] = BertType.SmallBig.rawValue - offset += 1 - var i: UInt64 = UInt64(number.value < 0 ? -number.value : number.value) - var n = 0 - var pos = offset + 2 //arity, sign - - while (i > 0) { - data[pos] = UInt8(i % 256) - pos += 1 - i = UInt64(floor(Double(i / 256))) - n += 1 - } - data[offset] = UInt8(n) - offset += 1 - data[offset] = UInt8(Int(number.value < 0 ? 1:0)) - offset += n - } - } - - class func encodeFloat(float: BertFloat, data: inout [UInt8], offset: inout Int) { - data[offset] = BertType.NewFloat.rawValue - offset += 1 - let bytes = withUnsafePointer(to: &float.value) { - $0.withMemoryRebound(to: UInt8.self, capacity: 1, { - Array(UnsafeBufferPointer(start: $0, count: MemoryLayout.size)) - }) - } - var i = UnsafePointer(bytes).withMemoryRebound(to: UInt64.self, capacity: 1) { - $0.pointee - }.bigEndian - - memcpy(&data[offset],&i,MemoryLayout.size) - - offset += 8 - } - - class func encodeString(string: BertString, data: inout [UInt8], offset: inout Int) { - data[offset] = BertType.String.rawValue - offset += 1 - writeUInt16(i: UInt16(string.value.characters.count), data: &data, offset: &offset) - - memcpy(&data[offset], (string.value as NSString).utf8String, string.value.characters.count) - offset += string.value.characters.count - } - - class func encodeTuple(tuple: BertTuple, data: inout [UInt8], offset: inout Int) throws { - if tuple.elements.count <= 255 { - data[offset] = BertType.SmallTuple.rawValue - offset += 1 - data[offset] = UInt8(tuple.elements.count) - offset += 1 - } else { - data[offset] = BertType.LargeTuple.rawValue - offset += 1 - writeUInt32(i: UInt32(tuple.elements.count), data: &data, offset: &offset) - } - - for element in tuple.elements { - try encodeInner(object: element, data: &data, offset: &offset) - } - } - - class func encodeList(list: BertList, data: inout [UInt8], offset: inout Int) throws { - data[offset] = BertType.List.rawValue - offset += 1 - writeUInt32(i: UInt32(list.elements.count), data: &data, offset: &offset) - - for element in list.elements { - try encodeInner(object: element, data: &data, offset: &offset) - } - data[offset] = BertType.Nil.rawValue - offset += 1 - } - - class func writeUInt16(i: UInt16, data: inout [UInt8], offset: inout Int) { - data[offset] = UInt8((i & 0xFF00) >> 8) - offset += 1 - data[offset] = UInt8(i & 0xFF) - offset += 1 - } - - class func writeUInt32(i: UInt32, data: inout [UInt8], offset: inout Int) { - data[offset] = UInt8((i & 0xFF000000) >> 24) - offset += 1 - data[offset] = UInt8((i & 0xFF0000) >> 16) - offset += 1 - data[offset] = UInt8((i & 0xFF00) >> 8) - offset += 1 - data[offset] = UInt8(i & 0xFF) - offset += 1 - } - - class func decode (data: NSData) throws -> BertObject { - if data.length == 0 { - return BertUndefined() - } - - var offset = 0 - var buffer = [UInt8](repeating: 0, count: 1) - data.getBytes(&buffer, range: NSMakeRange(offset, 1)) - offset += 1 - let header = buffer[0] - - if header != BertType.Version.rawValue { - throw BertError.NotValidErlangTerm - } - - var printBuffer = [UInt8](repeating: 0, count: data.length) - data.getBytes(&printBuffer, length: data.length) - - return try decodeInner(data: data, offset: &offset) - } - - class func decodeInner (data: NSData, offset: inout Int) throws -> BertObject { - var buffer = [UInt8](repeating: 0, count: 1) - - data.getBytes(&buffer, range: NSMakeRange(offset, 1)) - let type = buffer[0] - - switch type { - case BertType.Atom.rawValue: return try decodeAtom(data: data, offset: &offset) - case BertType.SmallAtom.rawValue: return try decodeAtom(data: data, offset: &offset) - case BertType.Binary.rawValue: return decodeBinary(data: data, offset: &offset) - case BertType.SmallInteger.rawValue: return try decodeNumber(data: data, offset: &offset) - case BertType.Integer.rawValue: return try decodeNumber(data: data, offset: &offset) - case BertType.SmallBig.rawValue: return try decodeNumber(data: data, offset: &offset) - case BertType.NewFloat.rawValue: return decodeDouble(data: data, offset: &offset) - case BertType.String.rawValue: return decodeString(data: data, offset: &offset) - case BertType.SmallTuple.rawValue: return try decodeTuple(data: data, offset: &offset) - case BertType.LargeTuple.rawValue: return try decodeTuple(data: data, offset: &offset) - case BertType.List.rawValue: return try decodeList(data: data, offset: &offset) - case BertType.Nil.rawValue: return decodeNil(data: data, offset: &offset) - default: - throw BertError.UnexpectedErlangType - } - } - - class func decodeAtom(data: NSData, offset: inout Int) throws -> BertObject { - var buffer = [UInt8](repeating: 0, count: 2) - - data.getBytes(&buffer, range: NSMakeRange(offset, 1)) - offset += 1 - let type = buffer[0] - var n: Int - - switch type { - case BertType.Atom.rawValue: - data.getBytes(&buffer, range: NSMakeRange(offset, 2)) - offset += 2 - let u16 = UnsafePointer(buffer).withMemoryRebound(to: UInt16.self, capacity: 1) { - $0.pointee - } - n = Int(u16.bigEndian) - case BertType.SmallAtom.rawValue: - data.getBytes(&buffer, range: NSMakeRange(offset, 1)) - offset += 1 - n = Int(buffer[0]) - default: - throw BertError.UnexpectedErlangType - } - - var buffer1 = [UInt8](repeating: 0, count: n) - data.getBytes(&buffer1, range: NSMakeRange(offset, n)) - offset += n - - let value = NSString(bytes: buffer1, length: n, encoding: String.Encoding.utf8.rawValue)! as String - - switch value { - case "true": return BertBool(fromBool: true) - case "false": return BertBool(fromBool: false) - case "undefined": return BertUndefined() - default: return BertAtom(fromString: value) - } - } - - class func decodeBinary(data: NSData, offset: inout Int) -> BertObject { - offset += 1 - - var buffer = [UInt8](repeating: 0, count: 4) - - data.getBytes(&buffer, range: NSMakeRange(offset, 4)) - offset += 4 - let u16 = UnsafePointer(buffer).withMemoryRebound(to: UInt32.self, capacity: 1) { - $0.pointee - } - let length = Int(u16.bigEndian) - var dataBuffer = [UInt8](repeating: 0, count: length) - data.getBytes(&dataBuffer, range: NSMakeRange(offset, length)) - offset += length - - return BertBinary(fromNSData: NSData(bytes: dataBuffer, length: length)) - } - - class func decodeNumber(data: NSData, offset: inout Int) throws -> BertObject { - var buffer = [UInt8](repeating: 0, count: 10) - - data.getBytes(&buffer, range: NSMakeRange(offset, 1)) - offset += 1 - let type = buffer[0] - - switch type { - case BertType.SmallInteger.rawValue: - data.getBytes(&buffer, range: NSMakeRange(offset, 1)) - offset += 1 - let value = buffer[0] - return BertNumber(fromUInt8: value) - case BertType.Integer.rawValue: - data.getBytes(&buffer, range: NSMakeRange(offset, 4)) - offset += 4 - let u16 = UnsafePointer(buffer).withMemoryRebound(to: UInt32.self, capacity: 1) { - $0.pointee - } - let value = Int32(u16.bigEndian) - return BertNumber(fromInt32: value) - case BertType.SmallBig.rawValue: - data.getBytes(&buffer, range: NSMakeRange(offset, 1)) - offset += 1 - let arity = buffer[0] - if (arity > 7) { - throw BertError.IntegerValueToLarge - } - - data.getBytes(&buffer, range: NSMakeRange(offset, 1)) - offset += 1 - let sign = buffer[0] - - var value: Int64 = 0 - var n: Int64 = 1 - for i in 0...arity-1 { - data.getBytes(&buffer, range:NSMakeRange(offset, 1)) - offset += 1 - let v = Int64(buffer[0]) - value += v * n - if i+1 != arity { - n *= 256 - } - } - - if sign > 0 { - value = -value - } - return BertNumber(fromInt64: Int64(value)) - default: - throw BertError.UnexpectedErlangType - } - } - - class func decodeDouble(data: NSData, offset: inout Int) -> BertObject { - offset += 1 - var buffer = [UInt8](repeating: 0, count: 8) - data.getBytes(&buffer, range: NSMakeRange(offset, 8)) - offset += 8 - var i = Int64(UnsafePointer(buffer).withMemoryRebound(to: UInt64.self, capacity: 1) { - $0.pointee - }.bigEndian) - var d: Double = 0 - memcpy(&d, &i, MemoryLayout.size) - return BertFloat(fromDouble: d) - } - - class func decodeString(data: NSData, offset: inout Int) -> BertObject { - offset += 1 - - var buffer = [UInt8](repeating: 0, count: 2) - data.getBytes(&buffer, range: NSMakeRange(offset, 2)) - offset += 2 - let length = Int(UnsafePointer(buffer).withMemoryRebound(to: UInt16.self, capacity: 1) { - $0.pointee - }.bigEndian) - - var stringBuffer = [UInt8](repeating: 0, count: length) - - data.getBytes(&stringBuffer, range: NSMakeRange(offset, length)) - offset += length - - return BertString(fromString: String(bytes: stringBuffer, encoding: String.Encoding.utf8)!) - } - - class func decodeTuple(data: NSData, offset: inout Int) throws -> BertObject { - var buffer = [UInt8](repeating: 0, count: 4) - var n: Int - - data.getBytes(&buffer, range: NSMakeRange(offset, 1)) - offset += 1 - let type = buffer[0] - - switch type { - case BertType.SmallTuple.rawValue: - data.getBytes(&buffer, range: NSMakeRange(offset, 1)) - offset += 1 - n = Int(buffer[0]) - case BertType.LargeTuple.rawValue: - data.getBytes(&buffer, range: NSMakeRange(offset, 4)) - offset += 4 - n = Int(UnsafePointer(buffer).withMemoryRebound(to: UInt32.self, capacity: 1) { - $0.pointee - }.bigEndian) - default: - throw BertError.UnexpectedErlangType - } - - var elements = [BertObject]() - if n > 0 { - for _ in 0...n-1 { - elements.append(try decodeInner(data: data, offset: &offset)) - } - } - - return BertTuple(fromElements: elements) - } - - class func decodeList(data: NSData, offset: inout Int) throws -> BertObject { - offset+=1 - - var buffer = [UInt8](repeating: 0, count: 4) - - data.getBytes(&buffer, range: NSMakeRange(offset, 4)) - offset += 4 - let n = Int(UnsafePointer(buffer).withMemoryRebound(to: UInt32.self, capacity: 1) { - $0.pointee - }.bigEndian) - var elements = [BertObject]() - if n > 0 { - for _ in 0...n-1 { - elements.append(try decodeInner(data: data, offset: &offset)) - } - } - - if data.length > offset { - data.getBytes(&buffer, range: NSMakeRange(offset, 1)) - if (buffer[0] == BertType.Nil.rawValue) { - offset += 1 - } - } - - return BertList(fromElements: elements) - } - - class func decodeNil(data: NSData, offset: inout Int) -> BertObject { - offset += 1 - return BertNil() - } -} diff --git a/apps/roster/priv/macbert/Source/Decoder.swift b/apps/roster/priv/macbert/Source/Decoder.swift deleted file mode 100644 index ccdbad18a..000000000 --- a/apps/roster/priv/macbert/Source/Decoder.swift +++ /dev/null @@ -1,367 +0,0 @@ -func parseObject(name: String, body:[Model], tuple: BertTuple) -> AnyObject? -{ - switch name { - case "writer": - if body.count != 5 { return nil } - let a_writer = writer() - a_writer.id = body[0].parse(bert: tuple.elements[1]) as? AnyObject - a_writer.count = body[1].parse(bert: tuple.elements[2]) as? Int64 - a_writer.cache = body[2].parse(bert: tuple.elements[3]) as? [AnyObject] - a_writer.args = body[3].parse(bert: tuple.elements[4]) as? AnyObject - a_writer.first = body[4].parse(bert: tuple.elements[5]) as? [AnyObject] - return a_writer - case "reader": - if body.count != 6 { return nil } - let a_reader = reader() - a_reader.id = body[0].parse(bert: tuple.elements[1]) as? AnyObject - a_reader.pos = body[1].parse(bert: tuple.elements[2]) as? Int64 - a_reader.cache = body[2].parse(bert: tuple.elements[3]) as? Int64 - a_reader.args = body[3].parse(bert: tuple.elements[4]) as? AnyObject - a_reader.feed = body[4].parse(bert: tuple.elements[5]) as? AnyObject - a_reader.dir = body[5].parse(bert: tuple.elements[6]) as? AnyObject - return a_reader - case "cur": - if body.count != 11 { return nil } - let a_cur = cur() - a_cur.id = body[0].parse(bert: tuple.elements[1]) as? AnyObject - a_cur.top = body[1].parse(bert: tuple.elements[2]) as? Int64 - a_cur.bot = body[2].parse(bert: tuple.elements[3]) as? Int64 - a_cur.dir = body[3].parse(bert: tuple.elements[4]) as? AnyObject - a_cur.reader = body[4].parse(bert: tuple.elements[5]) as? [AnyObject] - a_cur.writer = body[5].parse(bert: tuple.elements[6]) as? [AnyObject] - a_cur.args = body[8].parse(bert: tuple.elements[9]) as? [AnyObject] - return a_cur - case "iter": - if body.count != 4 { return nil } - let a_iter = iter() - a_iter.id = body[0].parse(bert: tuple.elements[1]) as? Int64 - a_iter.feed = body[1].parse(bert: tuple.elements[2]) as? AnyObject - a_iter.next = body[2].parse(bert: tuple.elements[3]) as? Int64 - a_iter.prev = body[3].parse(bert: tuple.elements[4]) as? Int64 - return a_iter - case "container": - if body.count != 4 { return nil } - let a_container = container() - a_container.id = body[0].parse(bert: tuple.elements[1]) as? Int64 - a_container.top = body[1].parse(bert: tuple.elements[2]) as? Int64 - a_container.rear = body[2].parse(bert: tuple.elements[3]) as? Int64 - a_container.count = body[3].parse(bert: tuple.elements[4]) as? Int64 - return a_container - case "iterator": - if body.count != 6 { return nil } - let a_iterator = iterator() - a_iterator.id = body[0].parse(bert: tuple.elements[1]) as? Int64 - a_iterator.container = body[1].parse(bert: tuple.elements[2]) as? StringAtom - a_iterator.feed_id = body[2].parse(bert: tuple.elements[3]) as? AnyObject - a_iterator.prev = body[3].parse(bert: tuple.elements[4]) as? Int64 - a_iterator.next = body[4].parse(bert: tuple.elements[5]) as? Int64 - a_iterator.feeds = body[5].parse(bert: tuple.elements[6]) as? [AnyObject] - return a_iterator - case "log": - if body.count != 6 { return nil } - let a_log = log() - a_log.id = body[0].parse(bert: tuple.elements[1]) as? Int64 - a_log.top = body[1].parse(bert: tuple.elements[2]) as? Int64 - a_log.rear = body[2].parse(bert: tuple.elements[3]) as? Int64 - a_log.count = body[3].parse(bert: tuple.elements[4]) as? Int64 - return a_log - case "operation": - if body.count != 9 { return nil } - let a_operation = operation() - a_operation.id = body[0].parse(bert: tuple.elements[1]) as? Int64 - a_operation.container = body[1].parse(bert: tuple.elements[2]) as? StringAtom - a_operation.feed_id = body[2].parse(bert: tuple.elements[3]) as? AnyObject - a_operation.prev = body[3].parse(bert: tuple.elements[4]) as? Int64 - a_operation.next = body[4].parse(bert: tuple.elements[5]) as? Int64 - a_operation.feeds = body[5].parse(bert: tuple.elements[6]) as? [AnyObject] - return a_operation - case "error": - if body.count != 1 { return nil } - let a_error = error() - a_error.code = body[0].parse(bert: tuple.elements[1]) as? AnyObject - return a_error - case "ok": - if body.count != 1 { return nil } - let a_ok = ok() - a_ok.code = body[0].parse(bert: tuple.elements[1]) as? AnyObject - return a_ok - case "error2": - if body.count != 2 { return nil } - let a_error2 = error2() - a_error2.code = body[0].parse(bert: tuple.elements[1]) as? StringAtom - a_error2.src = body[1].parse(bert: tuple.elements[2]) as? AnyObject - return a_error2 - case "ok2": - if body.count != 2 { return nil } - let a_ok2 = ok2() - a_ok2.code = body[0].parse(bert: tuple.elements[1]) as? AnyObject - a_ok2.src = body[1].parse(bert: tuple.elements[2]) as? AnyObject - return a_ok2 - case "io": - if body.count != 2 { return nil } - let a_io = io() - a_io.code = body[0].parse(bert: tuple.elements[1]) as? AnyObject - a_io.data = body[1].parse(bert: tuple.elements[2]) as? AnyObject - return a_io - case "chain": - if body.count != 6 { return nil } - let a_chain = chain() - a_chain.id = body[0].parse(bert: tuple.elements[1]) as? Int64 - a_chain.top = body[1].parse(bert: tuple.elements[2]) as? Int64 - a_chain.rear = body[2].parse(bert: tuple.elements[3]) as? Int64 - a_chain.count = body[3].parse(bert: tuple.elements[4]) as? Int64 - return a_chain - case "push": - if body.count != 6 { return nil } - let a_push = push() - a_push.model = body[0].parse(bert: tuple.elements[1]) as? String - a_push.type = body[1].parse(bert: tuple.elements[2]) as? String - a_push.title = body[2].parse(bert: tuple.elements[3]) as? String - a_push.alert = body[3].parse(bert: tuple.elements[4]) as? String - a_push.badge = body[4].parse(bert: tuple.elements[5]) as? Int64 - a_push.sound = body[5].parse(bert: tuple.elements[6]) as? String - return a_push - case "Search": - if body.count != 6 { return nil } - let a_Search = Search() - a_Search.id = body[0].parse(bert: tuple.elements[1]) as? Int64 - a_Search.phone = body[1].parse(bert: tuple.elements[2]) as? [AnyObject] - a_Search.names = body[2].parse(bert: tuple.elements[3]) as? String - a_Search.surnames = body[3].parse(bert: tuple.elements[4]) as? String - a_Search.query = body[4].parse(bert: tuple.elements[5]) as? String - a_Search.status = body[5].parse(bert: tuple.elements[6]) as? AnyObject - return a_Search - case "p2p": - if body.count != 2 { return nil } - let a_p2p = p2p() - a_p2p.from = body[0].parse(bert: tuple.elements[1]) as? String - a_p2p.to = body[1].parse(bert: tuple.elements[2]) as? String - return a_p2p - case "muc": - if body.count != 1 { return nil } - let a_muc = muc() - a_muc.name = body[0].parse(bert: tuple.elements[1]) as? String - return a_muc - case "CDR": - if body.count != 10 { return nil } - let a_CDR = CDR() - a_CDR.id = body[0].parse(bert: tuple.elements[1]) as? Int64 - a_CDR.feed = body[1].parse(bert: tuple.elements[2]) as? AnyObject - a_CDR.next = body[2].parse(bert: tuple.elements[3]) as? Int64 - a_CDR.prev = body[3].parse(bert: tuple.elements[4]) as? Int64 - a_CDR.from = body[4].parse(bert: tuple.elements[5]) as? String - a_CDR.to = body[5].parse(bert: tuple.elements[6]) as? String - a_CDR.start = body[6].parse(bert: tuple.elements[7]) as? Int64 - a_CDR.stop = body[7].parse(bert: tuple.elements[8]) as? Int64 - a_CDR.bill = body[8].parse(bert: tuple.elements[9]) as? Int64 - a_CDR.tariff = body[9].parse(bert: tuple.elements[10]) as? String - return a_CDR - case "Member": - if body.count != 16 { return nil } - let a_Member = Member() - a_Member.id = body[0].parse(bert: tuple.elements[1]) as? Int64 - a_Member.container = body[1].parse(bert: tuple.elements[2]) as? AnyObject - a_Member.feed_id = body[2].parse(bert: tuple.elements[3]) as? AnyObject - a_Member.prev = body[3].parse(bert: tuple.elements[4]) as? Int64 - a_Member.next = body[4].parse(bert: tuple.elements[5]) as? Int64 - a_Member.phone_id = body[5].parse(bert: tuple.elements[6]) as? String - a_Member.avatar = body[6].parse(bert: tuple.elements[7]) as? String - a_Member.names = body[7].parse(bert: tuple.elements[8]) as? String - a_Member.surnames = body[8].parse(bert: tuple.elements[9]) as? String - a_Member.nick = body[9].parse(bert: tuple.elements[10]) as? String - a_Member.email = body[10].parse(bert: tuple.elements[11]) as? String - a_Member.person_id = body[11].parse(bert: tuple.elements[12]) as? String - a_Member.unread = body[12].parse(bert: tuple.elements[13]) as? Int64 - a_Member.update = body[13].parse(bert: tuple.elements[14]) as? Int64 - a_Member.presence = body[14].parse(bert: tuple.elements[15]) as? AnyObject - a_Member.status = body[15].parse(bert: tuple.elements[16]) as? AnyObject - return a_Member - case "Room": - if body.count != 8 { return nil } - let a_Room = Room() - a_Room.room = body[0].parse(bert: tuple.elements[1]) as? String - a_Room.description = body[1].parse(bert: tuple.elements[2]) as? String - a_Room.settings = body[2].parse(bert: tuple.elements[3]) as? [AnyObject] - a_Room.members = body[3].parse(bert: tuple.elements[4]) as? [Member] - a_Room.admins = body[4].parse(bert: tuple.elements[5]) as? [Member] - a_Room.type = body[5].parse(bert: tuple.elements[6]) as? AnyObject - a_Room.tos = body[6].parse(bert: tuple.elements[7]) as? String - a_Room.status = body[7].parse(bert: tuple.elements[8]) as? AnyObject - return a_Room - case "Cursor": - if body.count != 3 { return nil } - let a_Cursor = Cursor() - a_Cursor.feed = body[0].parse(bert: tuple.elements[1]) as? [AnyObject] - a_Cursor.aux = body[1].parse(bert: tuple.elements[2]) as? Int64 - a_Cursor.position = body[2].parse(bert: tuple.elements[3]) as? Int64 - return a_Cursor - case "Person": - if body.count != 14 { return nil } - let a_Person = Person() - a_Person.id = body[0].parse(bert: tuple.elements[1]) as? String - a_Person.phonelist = body[1].parse(bert: tuple.elements[2]) as? [AnyObject] - a_Person.alias = body[2].parse(bert: tuple.elements[3]) as? [AnyObject] - a_Person.localize = body[3].parse(bert: tuple.elements[4]) as? [AnyObject] - a_Person.NotificationSettings = body[4].parse(bert: tuple.elements[5]) as? [AnyObject] - a_Person.SoundSettings = body[5].parse(bert: tuple.elements[6]) as? [AnyObject] - a_Person.ThemeID = body[6].parse(bert: tuple.elements[7]) as? String - a_Person.voxImplantID = body[7].parse(bert: tuple.elements[8]) as? String - a_Person.voxImplantLogin = body[8].parse(bert: tuple.elements[9]) as? String - a_Person.voxImplantPassword = body[9].parse(bert: tuple.elements[10]) as? String - a_Person.BlockUsers = body[10].parse(bert: tuple.elements[11]) as? [AnyObject] - a_Person.balance = body[11].parse(bert: tuple.elements[12]) as? Int64 - a_Person.isParticipants = body[12].parse(bert: tuple.elements[13]) as? [String] - a_Person.status = body[13].parse(bert: tuple.elements[14]) as? StringAtom - return a_Person - case "Desc": - if body.count != 5 { return nil } - let a_Desc = Desc() - a_Desc.mime = body[0].parse(bert: tuple.elements[1]) as? String - a_Desc.payload = body[1].parse(bert: tuple.elements[2]) as? String - a_Desc.size = body[2].parse(bert: tuple.elements[3]) as? Int64 - a_Desc.filename = body[3].parse(bert: tuple.elements[4]) as? String - a_Desc.info = body[4].parse(bert: tuple.elements[5]) as? String - return a_Desc - case "Message": - if body.count != 13 { return nil } - let a_Message = Message() - a_Message.id = body[0].parse(bert: tuple.elements[1]) as? Int64 - a_Message.container = body[1].parse(bert: tuple.elements[2]) as? AnyObject - a_Message.feed_id = body[2].parse(bert: tuple.elements[3]) as? AnyObject - a_Message.prev = body[3].parse(bert: tuple.elements[4]) as? Int64 - a_Message.next = body[4].parse(bert: tuple.elements[5]) as? Int64 - a_Message.msg_id = body[5].parse(bert: tuple.elements[6]) as? String - a_Message.from = body[6].parse(bert: tuple.elements[7]) as? String - a_Message.to = body[7].parse(bert: tuple.elements[8]) as? String - a_Message.created = body[8].parse(bert: tuple.elements[9]) as? AnyObject - a_Message.files = body[9].parse(bert: tuple.elements[10]) as? [Desc] - a_Message.type = body[10].parse(bert: tuple.elements[11]) as? AnyObject - a_Message.edit_msg = body[11].parse(bert: tuple.elements[12]) as? Int64 - a_Message.status = body[12].parse(bert: tuple.elements[13]) as? AnyObject - return a_Message - case "Star": - if body.count != 4 { return nil } - let a_Star = Star() - a_Star.roster_id = body[0].parse(bert: tuple.elements[1]) as? String - a_Star.message = body[1].parse(bert: tuple.elements[2]) as? Message - a_Star.tag = body[2].parse(bert: tuple.elements[3]) as? String - a_Star.status = body[3].parse(bert: tuple.elements[4]) as? AnyObject - return a_Star - case "Tag": - if body.count != 4 { return nil } - let a_Tag = Tag() - a_Tag.roster_id = body[0].parse(bert: tuple.elements[1]) as? String - a_Tag.name = body[1].parse(bert: tuple.elements[2]) as? String - a_Tag.color = body[2].parse(bert: tuple.elements[3]) as? String - a_Tag.status = body[3].parse(bert: tuple.elements[4]) as? AnyObject - return a_Tag - case "History": - if body.count != 5 { return nil } - let a_History = History() - a_History.roster_id = body[0].parse(bert: tuple.elements[1]) as? String - a_History.contact_id = body[1].parse(bert: tuple.elements[2]) as? String - a_History.cursor = body[2].parse(bert: tuple.elements[3]) as? AnyObject - a_History.data = body[3].parse(bert: tuple.elements[4]) as? [Message] - a_History.status = body[4].parse(bert: tuple.elements[5]) as? AnyObject - return a_History - case "Typing": - if body.count != 2 { return nil } - let a_Typing = Typing() - a_Typing.phone_id = body[0].parse(bert: tuple.elements[1]) as? String - a_Typing.comments = body[1].parse(bert: tuple.elements[2]) as? AnyObject - return a_Typing - case "Contact": - if body.count != 12 { return nil } - let a_Contact = Contact() - a_Contact.phone_id = body[0].parse(bert: tuple.elements[1]) as? String - a_Contact.avatar = body[1].parse(bert: tuple.elements[2]) as? String - a_Contact.names = body[2].parse(bert: tuple.elements[3]) as? String - a_Contact.surnames = body[3].parse(bert: tuple.elements[4]) as? String - a_Contact.nick = body[4].parse(bert: tuple.elements[5]) as? String - a_Contact.email = body[5].parse(bert: tuple.elements[6]) as? String - a_Contact.person_id = body[6].parse(bert: tuple.elements[7]) as? String - a_Contact.unread = body[7].parse(bert: tuple.elements[8]) as? Int64 - a_Contact.last_msg = body[8].parse(bert: tuple.elements[9]) as? Message - a_Contact.update = body[9].parse(bert: tuple.elements[10]) as? Int64 - a_Contact.presence = body[10].parse(bert: tuple.elements[11]) as? StringAtom - a_Contact.status = body[11].parse(bert: tuple.elements[12]) as? AnyObject - return a_Contact - case "Auth": - if body.count != 13 { return nil } - let a_Auth = Auth() - a_Auth.token = body[0].parse(bert: tuple.elements[1]) as? String - a_Auth.dev_key = body[1].parse(bert: tuple.elements[2]) as? String - a_Auth.user_id = body[2].parse(bert: tuple.elements[3]) as? String - a_Auth.phone = body[3].parse(bert: tuple.elements[4]) as? String - a_Auth.client_id = body[4].parse(bert: tuple.elements[5]) as? String - a_Auth.type = body[5].parse(bert: tuple.elements[6]) as? StringAtom - a_Auth.sms_code = body[6].parse(bert: tuple.elements[7]) as? String - a_Auth.attempts = body[7].parse(bert: tuple.elements[8]) as? Int64 - a_Auth.services = body[8].parse(bert: tuple.elements[9]) as? [String] - a_Auth.push = body[9].parse(bert: tuple.elements[10]) as? String - a_Auth.os = body[10].parse(bert: tuple.elements[11]) as? AnyObject - a_Auth.created = body[11].parse(bert: tuple.elements[12]) as? AnyObject - a_Auth.last_online = body[12].parse(bert: tuple.elements[13]) as? AnyObject - return a_Auth - case "Service": - if body.count != 4 { return nil } - let a_Service = Service() - a_Service.id = body[0].parse(bert: tuple.elements[1]) as? String - a_Service.type = body[1].parse(bert: tuple.elements[2]) as? AnyObject - a_Service.external = body[2].parse(bert: tuple.elements[3]) as? AnyObject - a_Service.status = body[3].parse(bert: tuple.elements[4]) as? AnyObject - return a_Service - case "Roster": - if body.count != 13 { return nil } - let a_Roster = Roster() - a_Roster.id = body[0].parse(bert: tuple.elements[1]) as? Int64 - a_Roster.names = body[1].parse(bert: tuple.elements[2]) as? String - a_Roster.surnames = body[2].parse(bert: tuple.elements[3]) as? String - a_Roster.email = body[3].parse(bert: tuple.elements[4]) as? String - a_Roster.nick = body[4].parse(bert: tuple.elements[5]) as? String - a_Roster.userlist = body[5].parse(bert: tuple.elements[6]) as? [Contact] - a_Roster.roomlist = body[6].parse(bert: tuple.elements[7]) as? [Room] - a_Roster.favorite = body[7].parse(bert: tuple.elements[8]) as? [Star] - a_Roster.tags = body[8].parse(bert: tuple.elements[9]) as? [Tag] - a_Roster.phone = body[9].parse(bert: tuple.elements[10]) as? String - a_Roster.avatar = body[10].parse(bert: tuple.elements[11]) as? String - a_Roster.update = body[11].parse(bert: tuple.elements[12]) as? Int64 - a_Roster.status = body[12].parse(bert: tuple.elements[13]) as? AnyObject - return a_Roster - case "Feature": - if body.count != 4 { return nil } - let a_Feature = Feature() - a_Feature.id = body[0].parse(bert: tuple.elements[1]) as? String - a_Feature.key = body[1].parse(bert: tuple.elements[2]) as? String - a_Feature.value = body[2].parse(bert: tuple.elements[3]) as? String - a_Feature.group = body[3].parse(bert: tuple.elements[4]) as? String - return a_Feature - case "Profile": - if body.count != 7 { return nil } - let a_Profile = Profile() - a_Profile.phone = body[0].parse(bert: tuple.elements[1]) as? String - a_Profile.services = body[1].parse(bert: tuple.elements[2]) as? [Service] - a_Profile.rosters = body[2].parse(bert: tuple.elements[3]) as? [AnyObject] - a_Profile.settings = body[3].parse(bert: tuple.elements[4]) as? [Feature] - a_Profile.update = body[4].parse(bert: tuple.elements[5]) as? Int64 - a_Profile.presence = body[5].parse(bert: tuple.elements[6]) as? StringAtom - a_Profile.status = body[6].parse(bert: tuple.elements[7]) as? StringAtom - return a_Profile - case "Loc": - if body.count != 3 { return nil } - let a_Loc = Loc() - a_Loc.x = body[0].parse(bert: tuple.elements[1]) as? String - a_Loc.y = body[1].parse(bert: tuple.elements[2]) as? String - a_Loc.z = body[2].parse(bert: tuple.elements[3]) as? String - return a_Loc - case "Friend": - if body.count != 4 { return nil } - let a_Friend = Friend() - a_Friend.id = body[0].parse(bert: tuple.elements[1]) as? String - a_Friend.roster_id = body[1].parse(bert: tuple.elements[2]) as? Int64 - a_Friend.friend_id = body[2].parse(bert: tuple.elements[3]) as? String - a_Friend.status = body[3].parse(bert: tuple.elements[4]) as? AnyObject - return a_Friend - default: return nil - } -} \ No newline at end of file diff --git a/apps/roster/priv/macbert/Source/Encoder.swift b/apps/roster/priv/macbert/Source/Encoder.swift deleted file mode 100644 index ab1e97b3b..000000000 --- a/apps/roster/priv/macbert/Source/Encoder.swift +++ /dev/null @@ -1,382 +0,0 @@ -// -// Serializer.swift -// NynjaParser -// -// Created by Anton Makarov on 18.07.2017. -// Copyright © 2017 TecSynt Solutions. All rights reserved. -// - -import Foundation - -func serialize(bert: BertObject?) -> [UInt8]? { - if bert != nil { - do { - let bytes = try Bert.encode(object: bert!) - var result = [UInt8](repeating: 0, count: bytes.length) - bytes.getBytes(&result, length: bytes.length) - return result - } catch { - return nil - } - } - return nil -} - -func stringToBertBinary(input: String?) -> BertObject { - if let data = input?.data(using: String.Encoding.utf8) { - let bert = BertBinary(fromNSData: data as NSData) - return bert - } - return BertNil() -} - -func stringToBertAtom(input: StringAtom?) -> BertObject { - if let str = input?.string { - let bert = BertAtom(fromString: str) - return bert - } - return BertNil() -} - -func listFromObjects(input: [T]?) -> BertObject { - if input == nil { - return BertNil() - } else { - if input!.count == 0 { - return BertNil() - } else { - var result = [BertObject]() - for i in input! { - result.append(serialize(object: i as AnyObject)) - } - return BertList(fromElements: result) - } - } -} - -func numberFromInt64(input: Int64?) -> BertObject { - if let id = input { - return BertNumber(fromInt64: Int64(id)) - } else { - return BertNil() - } -} - - -func serialize(object: AnyObject) -> BertTuple { - var items = [BertObject]() - if let instanse = object as? Approve { - items.append(BertAtom(fromString: "Approve")) - items.append(stringToBertBinary(input: instanse.id)) - items.append(stringToBertBinary(input: instanse.user)) - items.append(stringToBertBinary(input: instanse.room)) - } - if let instanse = object as? ok2 { - items.append(BertAtom(fromString: "ok2")) - if let s = instanse.src { - items.append(BertAtom(fromString: s)) - } else { - items.append(BertNil()) - } - items.append(stringToBertAtom(input: instanse.code)) - } - if let instanse = object as? error2 { - items.append(BertAtom(fromString: "error2")) - if let s = instanse.src { - items.append(BertAtom(fromString: s)) - } else { - items.append(BertNil()) - } - items.append(stringToBertAtom(input: instanse.code)) - } - if let instanse = object as? Auth { - items.append(BertAtom(fromString: "Auth")) - items.append(stringToBertBinary(input: instanse.token)) - items.append(stringToBertBinary(input: instanse.dev_key)) - items.append(stringToBertBinary(input: instanse.user_id)) - items.append(stringToBertBinary(input: instanse.phone)) - items.append(stringToBertBinary(input: instanse.client_id)) - items.append(stringToBertAtom(input: instanse.type)) - items.append(stringToBertBinary(input: instanse.sms_code)) - if let atempts = instanse.attempts { - items.append(BertNumber(fromInt64: Int64(atempts))) - } else { - items.append(BertNil()) - } - if let service = instanse.services { - var result = [BertAtom]() - for i in service { - let atom = BertAtom(fromString: i) - result.append(atom) - } - items.append(BertList(fromElements: result)) - } else { - items.append(BertNil()) - } - } - if let instanse = object as? Confirm { - items.append(BertAtom(fromString: "Confirm")) - items.append(stringToBertBinary(input: instanse.id)) - if let rosterId = instanse.roster_id { - items.append(BertNumber(fromInt64: Int64(rosterId))) - } else { - items.append(BertNil()) - } - items.append(stringToBertBinary(input: instanse.friend_id)) - if let atom = instanse.status as? StringAtom { - items.append(stringToBertAtom(input: atom)) - } else { - items.append(BertNil()) - } - } - if let instanse = object as? Contact { - items.append(BertAtom(fromString: "Contact")) - items.append(stringToBertBinary(input: instanse.phone_id)) - items.append(stringToBertBinary(input: instanse.avatar)) - items.append(stringToBertBinary(input: instanse.names)) - items.append(stringToBertBinary(input: instanse.surnames)) - items.append(stringToBertBinary(input: instanse.person_id)) - if let atom = instanse.status as? StringAtom { - items.append(stringToBertAtom(input: atom)) - } else { - items.append(BertNil()) - } - - } - if let instanse = object as? error { - items.append(BertAtom(fromString: "error")) - if let string = instanse.code as? String { - items.append(stringToBertBinary(input: string)) - } else if let string = instanse.code as? StringAtom { - items.append(stringToBertAtom(input: string)) - } else { - items.append(BertNil()) - } - } - if let instanse = object as? Friend { - items.append(BertAtom(fromString: "Friend")) - items.append(stringToBertBinary(input: instanse.id)) - if let rosterId = instanse.roster_id { - items.append(BertNumber(fromInt64: Int64(rosterId))) - } else { - items.append(BertNil()) - } - items.append(stringToBertBinary(input: instanse.friend_id)) - if let atom = instanse.status as? StringAtom { - items.append(stringToBertAtom(input: atom)) - } else { - items.append(BertNil()) - } - - } - if let instanse = object as? History { - items.append(BertAtom(fromString: "History")) - items.append(stringToBertBinary(input: instanse.roster_id)) - items.append(BertNil()) - if let msgs = instanse.data { - if msgs.count == 0 { - items.append(BertNil()) - } else { - var result = [BertTuple]() - for i in msgs { - result.append(serialize(object: i)) - } - items.append(BertList(fromElements: result)) - } - } else { - items.append(BertNil()) - } - if let atom = instanse.status as? StringAtom { - items.append(stringToBertAtom(input: atom)) - } else { - items.append(BertNil()) - } - - } - if let instanse = object as? io { - items.append(BertAtom(fromString: "io")) - if let o = instanse.code as? ok { - items.append(serialize(object: o)) - } else if let err = instanse.code as? error { - items.append(serialize(object: err)) - } else if let o2 = instanse.code as? ok2 { - items.append(serialize(object: o2)) - } else if let err2 = instanse.code as? error2 { - items.append(serialize(object: err2)) - } else { - items.append(BertNil()) - } - if let o = instanse.data as? String { - items.append(stringToBertBinary(input: o)) - /* //TODO: Model(value:Tuple(name:"",body:[ - Model(value:Atom()), - Model(value:Chain(types:[ - Model(value:Binary()), - Model(value:Number())]))]))]))]))} */ - } else { - items.append(BertNil()) - } - } - if let instanse = object as? Join { - items.append(BertAtom(fromString: "Join")) - items.append(stringToBertBinary(input: instanse.id)) - items.append(stringToBertBinary(input: instanse.user)) - items.append(stringToBertBinary(input: instanse.room)) - } - if let instanse = object as? Leave { - items.append(BertAtom(fromString: "Leave")) - items.append(stringToBertBinary(input: instanse.id)) - items.append(stringToBertBinary(input: instanse.user)) - items.append(stringToBertBinary(input: instanse.room)) - } - if let instanse = object as? Message { - //TODO: - items.append(BertAtom(fromString: "Message")) - items.append(numberFromInt64(input: instanse.id)) - items.append(stringToBertAtom(input: instanse.container)) - items.append(BertNil()) - items.append(numberFromInt64(input: instanse.prev)) - items.append(numberFromInt64(input: instanse.next)) - items.append(BertNil()) - items.append(stringToBertBinary(input: instanse.msg_id)) - items.append(stringToBertBinary(input: instanse.from)) - items.append(stringToBertBinary(input: instanse.to)) - items.append(BertNil()) - items.append(BertNil()) - items.append(BertNil()) - items.append(BertNil()) - if let atom = instanse.status as? StringAtom { - items.append(stringToBertAtom(input: atom)) - } else { - items.append(BertNil()) - } - - } - if let instanse = object as? ok { - items.append(BertAtom(fromString: "ok")) - if let string = instanse.code as? String { - items.append(stringToBertBinary(input: string)) - } else if let string = instanse.code as? StringAtom { - items.append(stringToBertAtom(input: string)) - } else { - items.append(BertNil()) - } - } - if let instanse = object as? Person { - //TODO: - items.append(BertAtom(fromString: "Person")) - items.append(stringToBertBinary(input: instanse.id)) - items.append(stringToBertBinary(input: instanse.names)) - items.append(stringToBertBinary(input: instanse.surnames)) - items.append(stringToBertBinary(input: instanse.username)) - items.append(BertNil()) - items.append(BertNil()) - items.append(stringToBertBinary(input: instanse.avatar)) - items.append(BertNil()) - items.append(BertNil()) - items.append(BertNil()) - items.append(stringToBertBinary(input: instanse.ThemeID)) - items.append(stringToBertBinary(input: instanse.voxImplantID)) - items.append(BertNil()) - items.append(numberFromInt64(input: instanse.balance)) - if let isParticipants = instanse.isParticipants { - if isParticipants.count == 0 { - items.append(BertNil()) - } else { - var result = [BertObject]() - for i in isParticipants { - if let j = stringToBertBinary(input: i) as? BertBinary { - result.append(j) - } - } - items.append(BertList(fromElements: result)) - } - } else { - items.append(BertNil()) - } - items.append(stringToBertAtom(input: instanse.status)) - } - if let instanse = object as? Profile { - items.append(BertAtom(fromString: "Profile")) - items.append(stringToBertBinary(input: instanse.phone)) - items.append(stringToBertBinary(input: instanse.data)) - items.append(stringToBertBinary(input: instanse.person_id)) - if let accounts = instanse.accounts as? [Roster] { - if accounts.count == 0 { - items.append(BertNil()) - } else { - var result = [BertTuple]() - for i in accounts { - result.append(serialize(object: i)) - } - items.append(BertList(fromElements: result)) - } - } else if let accounts = instanse.accounts as? [Int64] { - if accounts.count == 0 { - items.append(BertNil()) - } else { - var result = [BertNumber]() - for i in accounts { - if let n = numberFromInt64(input: i) as? BertNumber { - result.append(n) - } - } - items.append(BertList(fromElements: result)) - } - } else { - items.append(BertNil()) - } - items.append(stringToBertAtom(input: instanse.status)) - } - if let instanse = object as? Revoke { - items.append(BertAtom(fromString: "Revoke")) - items.append(stringToBertBinary(input: instanse.id)) - items.append(stringToBertBinary(input: instanse.user)) - items.append(stringToBertAtom(input: instanse.status)) - } - if let instanse = object as? Room { - items.append(BertAtom(fromString: "Room")) - items.append(stringToBertBinary(input: instanse.desc)) - items.append(listFromObjects(input: instanse.acl)) - items.append(listFromObjects(input: instanse.settings)) - } - if let instanse = object as? Roster { - items.append(BertAtom(fromString: "Roster")) - items.append(numberFromInt64(input: instanse.id)) - items.append(stringToBertBinary(input: instanse.names)) - items.append(stringToBertBinary(input: instanse.surnames)) - items.append(numberFromInt64(input: instanse.size)) - if let userlist = instanse.userlist { - if userlist.count == 0 { - items.append(BertNil()) - } else { - var result = [BertTuple]() - for i in userlist { - result.append(serialize(object: i)) - } - items.append(BertList(fromElements: result)) - } - } else { - items.append(BertNil()) - } - if let roomlist = instanse.roomlist { - if roomlist.count == 0 { - items.append(BertNil()) - } else { - var result = [BertTuple]() - for i in roomlist { - result.append(serialize(object: i)) - } - items.append(BertList(fromElements: result)) - } - } else { - items.append(BertNil()) - } - items.append(BertNil()) //TODO - - } - if let instanse = object as? Typing { - - } - return BertTuple(fromElements: items) -} diff --git a/apps/roster/priv/macbert/Source/StringAtom.swift b/apps/roster/priv/macbert/Source/StringAtom.swift deleted file mode 100644 index 916adf2e5..000000000 --- a/apps/roster/priv/macbert/Source/StringAtom.swift +++ /dev/null @@ -1,16 +0,0 @@ -// -// StringAtom.swift -// macbert -// -// Created by Anton Makarov on 19.07.2017. -// Copyright © 2017 TecSynt Solutions. All rights reserved. -// - -import Foundation - -class StringAtom { - var string: String? = nil - init(string: String) { - self.string = string - } -} diff --git a/apps/roster/priv/macbert/Source/TypeSpec.swift b/apps/roster/priv/macbert/Source/TypeSpec.swift deleted file mode 100644 index 1c9fc6a90..000000000 --- a/apps/roster/priv/macbert/Source/TypeSpec.swift +++ /dev/null @@ -1,376 +0,0 @@ -// -// Model.swift -// Nynja -// -// Created by Anton Makarov on 11.07.2017. -// Copyright © 2017 TecSynt Solutions. All rights reserved. -// - -import Foundation -protocol Parsable { func parse(bert: BertObject) -> Any? } - -enum SelectType { - case chain - case tuple - case binary - case atom - case number - case list - case boolean -} - -class Model: Parsable { - var chain: Chain? - var tuple: Tuple? - var binary: Binary? - var number: Number? - var atom: Atom? - var list: List? - var boolean: Boolean? - var select: SelectType! - - init(value: Chain) { self.select = .chain; self.chain = value; } - init(value: Tuple) { self.select = .tuple; self.tuple = value; } - init(value: Atom) { self.select = .atom; self.atom = value; } - init(value: Binary) { self.select = .binary; self.binary = value; } - init(value: Number) { self.select = .number; self.number = value; } - init(value: List) { self.select = .list; self.list = value; } - init(value: Boolean){ self.select = .boolean;self.boolean = value;} - - var description : String { - get { - switch select! { - case .atom: - return atom!.description - case .binary: - return binary!.description - case .chain: - return chain!.description - case .number: - return number!.description - case .tuple: - return tuple!.description - case .list: - return list!.description - case .boolean: - return boolean!.description - } - } - } - func parse(bert: BertObject) -> Any? { - switch select! { - case .atom: - return atom!.parse(bert:bert) - case .binary: - return binary!.parse(bert:bert) - case .chain: - return chain!.parse(bert:bert) - case .number: - return number!.parse(bert:bert) - case .tuple: - return tuple!.parse(bert:bert) - case .list: - return list!.parse(bert: bert) - case .boolean: - return boolean!.parse(bert:bert) - } - } -} - -class Boolean: Parsable { - - func parse(bert: BertObject) -> Any? { - if let bool = bert as? BertBool { - return bool.value - } - return nil - } - - var description : String { - get { - return "Bool()" - } - } -} - - -func parse(bert: BertObject) -> Any? -{ - if let object = bert as? BertAtom { - return object.value - } - if let object = bert as? BertTuple { - var result = [Any]() - for i in object.elements { - if let any = parse(bert: i) { - result.append(any) - } - } - return result - } - if let _ = bert as? BertNil { - return [Any]() - } - if let object = bert as? BertBool { - return object.value as AnyObject - } - if let object = bert as? BertList { - var result = [Any]() - for i in object.elements { - if let any = parse(bert: i) { - result.append(any) - } - } - return result - } - if let object = bert as? BertString { - return object.value - } - if let object = bert as? BertBinary { - return object.value - } - if let object = bert as? BertNumber { - return object.value - } - if let object = bert as? BertFloat { - return object.value - } - return nil -} - - -class Tuple: Parsable { - var name: String? - var body: [Model]? - init(name: String? = nil , body: [Model]? = nil) { self.name = name; self.body = body;} - - func parse(bert: BertObject) -> Any? { - if let tuple = bert as? BertTuple { - if body == nil { - var result = [Any]() - for i in 0.. Any? { - if let const = constant { - if let string = bert as? BertString { - if string.value == const { - return const - } - } - } else { - if let list = bert as? BertList { - if let result = self.addToList(list: list) { - return result - } - } - } - return nil - } - - func addToList(list: BertList) -> [Any]? { - var result = [Any]() - if let mod = model { - for i in list.elements { - if let value = mod.parse(bert: i) { - result.append(value) - } else { - return nil - } - } - } else { - var result = [Any]() - for i in 0.. Any? { - if let atom = bert as? BertAtom { - if let const = constant { - if atom.value == const { - return StringAtom(string:atom.value) - } - } else { - return StringAtom(string:atom.value) - } - } - return nil - } - - var description : String { - get { - return constant ?? "Atom()" - } - } -} - - -class Binary: Parsable { - var constant: String? - init() { constant = nil } - init(constant: String) { self.constant = constant } - func parse(bert: BertObject) -> Any? { - if let bin = bert as? BertBinary { - if let const = constant { - let dataString = String(data: bin.value as Data, encoding: String.Encoding.utf8) - if dataString == const { - return String(data: bin.value as Data, encoding: String.Encoding.utf8) - } - } else { - - return String(data: bin.value as Data, encoding: String.Encoding.utf8) - } - } - return nil - } - var description : String { - get { - return constant ?? "Binary()" - } - } -} - -class Number: Parsable { - var constant: String? - init() { constant = nil } - init(constant: String) { self.constant = constant } - func parse(bert: BertObject) -> Any? { - if let num = bert as? BertNumber { - if let const = constant { - if const == "\(num.value)" { - return Int64(num.value) - } - } else { - return Int64(num.value) - } - } - return nil - } - var description : String { - get { - return constant ?? "Number()" - } - } -} - - -class Chain: Parsable { - var types: [Model]! - init(types: [Model]) { self.types = types } - - func parse(bert: BertObject) -> Any? { - for model in types { - if let obj = model.parse(bert: bert) { - return obj - } - } - return nil - } - - - var description : String { - get { - var text = "" - for i in 0.. Model { - return Model(value:Tuple(name:"Auth",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:List(constant:nil, model:Model(value:Atom()))), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom(constant:"ios")), - Model(value:Atom(constant:"android")), - Model(value:Atom(constant:"web"))])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number()), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number()), - Model(value:Binary())]))]))} diff --git a/apps/roster/priv/macbert/Spec/CDR_Spec.swift b/apps/roster/priv/macbert/Spec/CDR_Spec.swift deleted file mode 100644 index 28709ba76..000000000 --- a/apps/roster/priv/macbert/Spec/CDR_Spec.swift +++ /dev/null @@ -1,30 +0,0 @@ -func get_CDR() -> Model { - return Model(value:Tuple(name:"CDR",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[Model(value:Tuple()),Model(value:Atom()),Model(value:Binary()),Model(value:Number()),Model(value:List(constant:""))])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())]))]))} diff --git a/apps/roster/priv/macbert/Spec/Contact_Spec.swift b/apps/roster/priv/macbert/Spec/Contact_Spec.swift deleted file mode 100644 index b84de2266..000000000 --- a/apps/roster/priv/macbert/Spec/Contact_Spec.swift +++ /dev/null @@ -1,44 +0,0 @@ -func get_Contact() -> Model { - return Model(value:Tuple(name:"Contact",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - get_Message()])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom(constant:"request")), - Model(value:Atom(constant:"authorization")), - Model(value:Atom(constant:"friend")), - Model(value:Atom(constant:"last_msg")), - Model(value:Atom(constant:"ban")), - Model(value:Atom(constant:"banned")), - Model(value:Atom())]))]))} diff --git a/apps/roster/priv/macbert/Spec/Cursor_Spec.swift b/apps/roster/priv/macbert/Spec/Cursor_Spec.swift deleted file mode 100644 index aeba2bc9f..000000000 --- a/apps/roster/priv/macbert/Spec/Cursor_Spec.swift +++ /dev/null @@ -1,8 +0,0 @@ -func get_Cursor() -> Model { - return Model(value:Tuple(name:"Cursor",body:[ - Model(value:Tuple(name:nil,body:[ - Model(value:Atom()), - Model(value:Binary()), - Model(value:Binary())])), - Model(value:Number()), - Model(value:Number())]))} diff --git a/apps/roster/priv/macbert/Spec/Desc_Spec.swift b/apps/roster/priv/macbert/Spec/Desc_Spec.swift deleted file mode 100644 index 4a523ab9a..000000000 --- a/apps/roster/priv/macbert/Spec/Desc_Spec.swift +++ /dev/null @@ -1,15 +0,0 @@ -func get_Desc() -> Model { - return Model(value:Tuple(name:"Desc",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Number()), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())]))]))} diff --git a/apps/roster/priv/macbert/Spec/Email_Spec.swift b/apps/roster/priv/macbert/Spec/Email_Spec.swift deleted file mode 100644 index d2673030f..000000000 --- a/apps/roster/priv/macbert/Spec/Email_Spec.swift +++ /dev/null @@ -1,9 +0,0 @@ -func get_Email() -> Model { - return Model(value:Tuple(name:"Email",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom(constant:"verified")), - Model(value:Atom(constant:"added"))]))]))} diff --git a/apps/roster/priv/macbert/Spec/Friend_Spec.swift b/apps/roster/priv/macbert/Spec/Friend_Spec.swift deleted file mode 100644 index 2cb1708e9..000000000 --- a/apps/roster/priv/macbert/Spec/Friend_Spec.swift +++ /dev/null @@ -1,24 +0,0 @@ -func get_Friend() -> Model { - return Model(value:Tuple(name:"Friend",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom(constant:"contact")), - Model(value:Atom(constant:"simple")), - Model(value:Atom(constant:"list")), - Model(value:Atom(constant:"common_groups")), - Model(value:Atom(constant:"ban")), - Model(value:Atom(constant:"unban")), - Model(value:Atom(constant:"mute")), - Model(value:Atom(constant:"unmute")), - Model(value:Atom(constant:"request")), - Model(value:Atom(constant:"confirm")), - Model(value:Atom(constant:"revoke"))]))]))} diff --git a/apps/roster/priv/macbert/Spec/History_Spec.swift b/apps/roster/priv/macbert/Spec/History_Spec.swift deleted file mode 100644 index d6dfcd766..000000000 --- a/apps/roster/priv/macbert/Spec/History_Spec.swift +++ /dev/null @@ -1,20 +0,0 @@ -func get_History() -> Model { - return Model(value:Tuple(name:"History",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number()), - Model(value:Binary())])), - Model(value:List(constant:nil,model:get_Message())), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom()), - Model(value:Atom(constant:"updated")), - Model(value:Atom(constant:"get")), - Model(value:Atom(constant:"last_loaded")), - Model(value:Atom(constant:"last_msg"))]))]))} diff --git a/apps/roster/priv/macbert/Spec/Loc_Spec.swift b/apps/roster/priv/macbert/Spec/Loc_Spec.swift deleted file mode 100644 index 561dadfc1..000000000 --- a/apps/roster/priv/macbert/Spec/Loc_Spec.swift +++ /dev/null @@ -1,11 +0,0 @@ -func get_Loc() -> Model { - return Model(value:Tuple(name:"Loc",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())]))]))} diff --git a/apps/roster/priv/macbert/Spec/Member_Spec.swift b/apps/roster/priv/macbert/Spec/Member_Spec.swift deleted file mode 100644 index 71d8eb970..000000000 --- a/apps/roster/priv/macbert/Spec/Member_Spec.swift +++ /dev/null @@ -1,53 +0,0 @@ -func get_Member() -> Model { - return Model(value:Tuple(name:"Member",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:Atom(constant:"chain")), - Model(value:Atom(constant:"cur"))])), - Model(value:Chain(types:[ - get_muc(), - get_p2p()])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom(constant:"online")), - Model(value:Atom(constant:"offline"))])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom(constant:"admin")), - Model(value:Atom(constant:"member")), - Model(value:Atom(constant:"patch"))]))]))} diff --git a/apps/roster/priv/macbert/Spec/Message_Spec.swift b/apps/roster/priv/macbert/Spec/Message_Spec.swift deleted file mode 100644 index 973415103..000000000 --- a/apps/roster/priv/macbert/Spec/Message_Spec.swift +++ /dev/null @@ -1,55 +0,0 @@ -func get_Message() -> Model { - return Model(value:Tuple(name:"Message",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:Atom(constant:"chain")), - Model(value:Atom(constant:"cur"))])), - Model(value:Chain(types:[ - get_muc(), - get_p2p()])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number()), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:List(constant:nil,model:get_Desc()))])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom(constant:"reply")), - Model(value:Atom(constant:"forward")), - Model(value:Atom(constant:"sched")), - Model(value:Atom(constant:"online")), - Model(value:Atom(constant:"offline")), - Model(value:Atom(constant:"join")), - Model(value:Atom(constant:"leave"))])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom()), - Model(value:Atom(constant:"client")), - Model(value:Atom(constant:"async")), - Model(value:Atom(constant:"sent")), - Model(value:Atom(constant:"internal")), - Model(value:Atom(constant:"last_read")), - Model(value:Atom(constant:"edit")), - Model(value:Atom(constant:"muc"))]))]))} diff --git a/apps/roster/priv/macbert/Spec/Person_Spec.swift b/apps/roster/priv/macbert/Spec/Person_Spec.swift deleted file mode 100644 index 741d82f69..000000000 --- a/apps/roster/priv/macbert/Spec/Person_Spec.swift +++ /dev/null @@ -1,20 +0,0 @@ -func get_Person() -> Model { - return Model(value:Tuple(name:"Person",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:List(constant:nil, model:Model(value:Binary()))), - Model(value:List(constant:nil)), - Model(value:List(constant:nil)), - Model(value:List(constant:nil)), - Model(value:List(constant:nil)), - Model(value:Binary()), - Model(value:Binary()), - Model(value:Binary()), - Model(value:Binary()), - Model(value:List(constant:nil, model:Model(value:Binary()))), - Model(value:Number()), - Model(value:List(constant:nil, model:Model(value:Atom()))), - Model(value:Chain(types:[ - Model(value:Atom()), - Model(value:List(constant:""))]))]))} diff --git a/apps/roster/priv/macbert/Spec/Profile_Spec.swift b/apps/roster/priv/macbert/Spec/Profile_Spec.swift deleted file mode 100644 index 2103d74d3..000000000 --- a/apps/roster/priv/macbert/Spec/Profile_Spec.swift +++ /dev/null @@ -1,19 +0,0 @@ -func get_Profile() -> Model { - return Model(value:Tuple(name:"Profile",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:List(constant:nil,model:get_Service())), - Model(value:List(constant:nil, model:Model(value:Chain(types:[ - get_Roster(), - Model(value:Number())])))), - Model(value:List(constant:nil,model:get_Feature())), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom())]))]))} diff --git a/apps/roster/priv/macbert/Spec/Room_Spec.swift b/apps/roster/priv/macbert/Spec/Room_Spec.swift deleted file mode 100644 index 7b5b92669..000000000 --- a/apps/roster/priv/macbert/Spec/Room_Spec.swift +++ /dev/null @@ -1,35 +0,0 @@ -func get_Room() -> Model { - return Model(value:Tuple(name:"Room",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:List(constant:nil)), - Model(value:List(constant:nil,model:get_Member())), - Model(value:List(constant:nil,model:get_Member())), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom(constant:"group")), - Model(value:Atom(constant:"channel"))])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom(constant:"create")), - Model(value:Atom(constant:"join")), - Model(value:Atom(constant:"leave")), - Model(value:Atom(constant:"ban")), - Model(value:Atom(constant:"uban")), - Model(value:Atom(constant:"add_admins")), - Model(value:Atom(constant:"rem_admins")), - Model(value:Atom(constant:"add_members")), - Model(value:Atom(constant:"remove_members")), - Model(value:Atom(constant:"patch")), - Model(value:Atom(constant:"get")), - Model(value:Atom(constant:"delete")), - Model(value:Atom(constant:"settings")), - Model(value:Atom(constant:"voice")), - Model(value:Atom(constant:"video"))]))]))} diff --git a/apps/roster/priv/macbert/Spec/Roster_Spec.swift b/apps/roster/priv/macbert/Spec/Roster_Spec.swift deleted file mode 100644 index 72066e974..000000000 --- a/apps/roster/priv/macbert/Spec/Roster_Spec.swift +++ /dev/null @@ -1,43 +0,0 @@ -func get_Roster() -> Model { - return Model(value:Tuple(name:"Roster",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:List(constant:nil,model:get_Contact())), - Model(value:List(constant:nil,model:get_Room())), - Model(value:List(constant:nil,model:get_Star())), - Model(value:List(constant:nil,model:get_Tag())), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom(constant:"get")), - Model(value:Atom(constant:"set")), - Model(value:Atom(constant:"create")), - Model(value:Atom(constant:"del")), - Model(value:Atom(constant:"remove")), - Model(value:Atom(constant:"add")), - Model(value:Atom(constant:"update")), - Model(value:Atom(constant:"list")), - Model(value:Atom(constant:"patch")), - Model(value:Atom(constant:"last_msg")), - Model(value:Atom())]))]))} diff --git a/apps/roster/priv/macbert/Spec/Search_Spec.swift b/apps/roster/priv/macbert/Spec/Search_Spec.swift deleted file mode 100644 index db4461a4a..000000000 --- a/apps/roster/priv/macbert/Spec/Search_Spec.swift +++ /dev/null @@ -1,21 +0,0 @@ -func get_Search() -> Model { - return Model(value:Tuple(name:"Search",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:List(constant:nil, model:Model(value:Binary())))])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom(constant:"contact")), - Model(value:Atom())]))]))} diff --git a/apps/roster/priv/macbert/Spec/Star_Spec.swift b/apps/roster/priv/macbert/Spec/Star_Spec.swift deleted file mode 100644 index c21c000e8..000000000 --- a/apps/roster/priv/macbert/Spec/Star_Spec.swift +++ /dev/null @@ -1,13 +0,0 @@ -func get_Star() -> Model { - return Model(value:Tuple(name:"Star",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - get_Message(), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom(constant:"add")), - Model(value:Atom(constant:"remove"))]))]))} diff --git a/apps/roster/priv/macbert/Spec/Tag_Spec.swift b/apps/roster/priv/macbert/Spec/Tag_Spec.swift deleted file mode 100644 index 4f9ae9504..000000000 --- a/apps/roster/priv/macbert/Spec/Tag_Spec.swift +++ /dev/null @@ -1,12 +0,0 @@ -func get_Tag() -> Model { - return Model(value:Tuple(name:"Tag",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Binary()), - Model(value:Binary()), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom(constant:"create")), - Model(value:Atom(constant:"remove")), - Model(value:Atom(constant:"edit"))]))]))} diff --git a/apps/roster/priv/macbert/Spec/Typing_Spec.swift b/apps/roster/priv/macbert/Spec/Typing_Spec.swift deleted file mode 100644 index 41ceda8a5..000000000 --- a/apps/roster/priv/macbert/Spec/Typing_Spec.swift +++ /dev/null @@ -1,4 +0,0 @@ -func get_Typing() -> Model { - return Model(value:Tuple(name:"Typing",body:[ - Model(value:Binary()), - Model(value:Chain(types:[Model(value:Tuple()),Model(value:Atom()),Model(value:Binary()),Model(value:Number()),Model(value:List(constant:""))]))]))} diff --git a/apps/roster/priv/macbert/Spec/chain_Spec.swift b/apps/roster/priv/macbert/Spec/chain_Spec.swift deleted file mode 100644 index f492b041c..000000000 --- a/apps/roster/priv/macbert/Spec/chain_Spec.swift +++ /dev/null @@ -1,12 +0,0 @@ -func get_chain() -> Model { - return Model(value:Tuple(name:"chain",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Number())]))} diff --git a/apps/roster/priv/macbert/Spec/container_Spec.swift b/apps/roster/priv/macbert/Spec/container_Spec.swift deleted file mode 100644 index ea52d6cf2..000000000 --- a/apps/roster/priv/macbert/Spec/container_Spec.swift +++ /dev/null @@ -1,12 +0,0 @@ -func get_container() -> Model { - return Model(value:Tuple(name:"container",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Number())]))} diff --git a/apps/roster/priv/macbert/Spec/cur_Spec.swift b/apps/roster/priv/macbert/Spec/cur_Spec.swift deleted file mode 100644 index 1594fc906..000000000 --- a/apps/roster/priv/macbert/Spec/cur_Spec.swift +++ /dev/null @@ -1,21 +0,0 @@ -func get_cur() -> Model { - return Model(value:Tuple(name:"cur",body:[ - Model(value:Chain(types:[Model(value:Tuple()),Model(value:Atom()),Model(value:Binary()),Model(value:Number()),Model(value:List(constant:""))])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:Number(constant:"0")), - Model(value:Number(constant:"1"))])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Tuple())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Tuple())])), - Model(value:List(constant:nil, model:Model(value:Chain(types:[ - Model(value:Tuple()), - Model(value:Number())]))))]))} diff --git a/apps/roster/priv/macbert/Spec/error2_Spec.swift b/apps/roster/priv/macbert/Spec/error2_Spec.swift deleted file mode 100644 index 1e8be3701..000000000 --- a/apps/roster/priv/macbert/Spec/error2_Spec.swift +++ /dev/null @@ -1,9 +0,0 @@ -func get_error2() -> Model { - return Model(value:Tuple(name:"error2",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary()), - Model(value:Number())]))]))} diff --git a/apps/roster/priv/macbert/Spec/error_Spec.swift b/apps/roster/priv/macbert/Spec/error_Spec.swift deleted file mode 100644 index 404013c8e..000000000 --- a/apps/roster/priv/macbert/Spec/error_Spec.swift +++ /dev/null @@ -1,6 +0,0 @@ -func get_error() -> Model { - return Model(value:Tuple(name:"error",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom()), - Model(value:Binary())]))]))} diff --git a/apps/roster/priv/macbert/Spec/io_Spec.swift b/apps/roster/priv/macbert/Spec/io_Spec.swift deleted file mode 100644 index 21ea46e67..000000000 --- a/apps/roster/priv/macbert/Spec/io_Spec.swift +++ /dev/null @@ -1,16 +0,0 @@ -func get_io() -> Model { - return Model(value:Tuple(name:"io",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - get_ok(), - get_error(), - get_ok2(), - get_error2()])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary()), - Model(value:Tuple(name:nil,body:[ - Model(value:Atom()), - Model(value:Chain(types:[ - Model(value:Binary()), - Model(value:Number())]))]))]))]))} diff --git a/apps/roster/priv/macbert/Spec/iter_Spec.swift b/apps/roster/priv/macbert/Spec/iter_Spec.swift deleted file mode 100644 index 74e035545..000000000 --- a/apps/roster/priv/macbert/Spec/iter_Spec.swift +++ /dev/null @@ -1,12 +0,0 @@ -func get_iter() -> Model { - return Model(value:Tuple(name:"iter",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[Model(value:Tuple()),Model(value:Atom()),Model(value:Binary()),Model(value:Number()),Model(value:List(constant:""))])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())]))]))} diff --git a/apps/roster/priv/macbert/Spec/iterator_Spec.swift b/apps/roster/priv/macbert/Spec/iterator_Spec.swift deleted file mode 100644 index e902370ae..000000000 --- a/apps/roster/priv/macbert/Spec/iterator_Spec.swift +++ /dev/null @@ -1,14 +0,0 @@ -func get_iterator() -> Model { - return Model(value:Tuple(name:"iterator",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Atom()), - Model(value:Chain(types:[Model(value:Tuple()),Model(value:Atom()),Model(value:Binary()),Model(value:Number()),Model(value:List(constant:""))])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:List(constant:nil))]))} diff --git a/apps/roster/priv/macbert/Spec/log_Spec.swift b/apps/roster/priv/macbert/Spec/log_Spec.swift deleted file mode 100644 index dd14f37db..000000000 --- a/apps/roster/priv/macbert/Spec/log_Spec.swift +++ /dev/null @@ -1,12 +0,0 @@ -func get_log() -> Model { - return Model(value:Tuple(name:"log",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Number())]))} diff --git a/apps/roster/priv/macbert/Spec/muc_Spec.swift b/apps/roster/priv/macbert/Spec/muc_Spec.swift deleted file mode 100644 index 731436a34..000000000 --- a/apps/roster/priv/macbert/Spec/muc_Spec.swift +++ /dev/null @@ -1,5 +0,0 @@ -func get_muc() -> Model { - return Model(value:Tuple(name:"muc",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())]))]))} diff --git a/apps/roster/priv/macbert/Spec/ok2_Spec.swift b/apps/roster/priv/macbert/Spec/ok2_Spec.swift deleted file mode 100644 index 512bd9d6e..000000000 --- a/apps/roster/priv/macbert/Spec/ok2_Spec.swift +++ /dev/null @@ -1,9 +0,0 @@ -func get_ok2() -> Model { - return Model(value:Tuple(name:"ok2",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Chain(types:[Model(value:Tuple()),Model(value:Atom()),Model(value:Binary()),Model(value:Number()),Model(value:List(constant:""))]))])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary()), - Model(value:Number())]))]))} diff --git a/apps/roster/priv/macbert/Spec/ok_Spec.swift b/apps/roster/priv/macbert/Spec/ok_Spec.swift deleted file mode 100644 index 56cff4e92..000000000 --- a/apps/roster/priv/macbert/Spec/ok_Spec.swift +++ /dev/null @@ -1,6 +0,0 @@ -func get_ok() -> Model { - return Model(value:Tuple(name:"ok",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Atom()), - Model(value:Binary())]))]))} diff --git a/apps/roster/priv/macbert/Spec/operation_Spec.swift b/apps/roster/priv/macbert/Spec/operation_Spec.swift deleted file mode 100644 index d799e38c5..000000000 --- a/apps/roster/priv/macbert/Spec/operation_Spec.swift +++ /dev/null @@ -1,14 +0,0 @@ -func get_operation() -> Model { - return Model(value:Tuple(name:"operation",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Atom()), - Model(value:Chain(types:[Model(value:Tuple()),Model(value:Atom()),Model(value:Binary()),Model(value:Number()),Model(value:List(constant:""))])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:List(constant:nil))]))} diff --git a/apps/roster/priv/macbert/Spec/p2p_Spec.swift b/apps/roster/priv/macbert/Spec/p2p_Spec.swift deleted file mode 100644 index 90aad2eeb..000000000 --- a/apps/roster/priv/macbert/Spec/p2p_Spec.swift +++ /dev/null @@ -1,8 +0,0 @@ -func get_p2p() -> Model { - return Model(value:Tuple(name:"p2p",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())]))]))} diff --git a/apps/roster/priv/macbert/Spec/push_Spec.swift b/apps/roster/priv/macbert/Spec/push_Spec.swift deleted file mode 100644 index 912ada72a..000000000 --- a/apps/roster/priv/macbert/Spec/push_Spec.swift +++ /dev/null @@ -1,20 +0,0 @@ -func get_push() -> Model { - return Model(value:Tuple(name:"push",body:[ - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Number())])), - Model(value:Chain(types:[ - Model(value:List(constant:"")), - Model(value:Binary())]))]))} diff --git a/apps/roster/priv/macbert/main.swift b/apps/roster/priv/macbert/main.swift deleted file mode 100644 index 9dc998a13..000000000 --- a/apps/roster/priv/macbert/main.swift +++ /dev/null @@ -1,43 +0,0 @@ - -import Foundation - -/* func test3() { - let bin: [UInt8] = [131,104,11,100,0,6,82,111,115,116,101,114,97,63,109,0,0, - 0,5,65,110,116,111,110,109,0,0,0,1,77,97,1,108,0,0,0,1, - 104,7,100,0,7,67,111,110,116,97,99,116,109,0,0,0,15,51, - 56,48,57,57,52,51,56,50,55,57,56,95,54,51,106,106,106, - 106,106,106,106,100,0,4,116,114,117,101,109,0,0,0,12,51, - 56,48,57,57,52,51,56,50,55,57,56,109,0,0,0,25,104,116, - 116,112,58,47,47,97,118,97,116,97,114,46,99,111,109,47, - 97,118,97,46,112,110,103,100,0,5,112,97,116,99,104] - let data = NSData(bytes: bin, length: bin.count) - do { - let bert = try Bert.decode(data: data) - if let roster = get_Roster().parse(bert: bert) as? Roster { - print("parsed") - } - } catch { - print("I Can't parse Bin to Bert") - } - -} */ - - -//test3() - - -func testProfile() { - let bin: [UInt8] = [131, 104, 7, 100, 0, 7, 80, 114, 111, 102, 105, 108, 101, 109, 0, 0, 0, 12, 51, 56, 48, 54, 51, 50, 56, 56, 57, 56, 57, 48, 106, 109, 0, 0, 0, 14, 51, 56, 48, 54, 51, 50, 56, 56, 57, 56, 57, 48, 95, 52, 108, 0, 0, 0, 1, 104, 12, 100, 0, 6, 82, 111, 115, 116, 101, 114, 97, 4, 106, 106, 97, 1, 108, 0, 0, 0, 1, 104, 10, 100, 0, 7, 67, 111, 110, 116, 97, 99, 116, 109, 0, 0, 0, 14, 51, 56, 48, 54, 51, 50, 56, 56, 57, 56, 57, 48, 95, 52, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 100, 0, 4, 116, 114, 117, 101, 109, 0, 0, 0, 12, 51, 56, 48, 54, 51, 50, 56, 56, 57, 56, 57, 48, 106, 106, 106, 106, 106, 100, 0, 3, 103, 101, 116] - let data = NSData(bytes: bin, length: bin.count) - do { - let bert = try Bert.decode(data: data) - if let profile = get_Profile().parse(bert: bert) { - print("parsed") - } - } catch { - print("I Can't parse Bin to Bert") - } -} - -testProfile() - diff --git a/apps/roster/rebar.config b/apps/roster/rebar.config index f76d768af..a3a320496 100644 --- a/apps/roster/rebar.config +++ b/apps/roster/rebar.config @@ -1,3 +1,4 @@ {deps_dir, ["../../deps"]}. {lib_dirs, ["../../apps"]}. -{deps, []}. \ No newline at end of file +{deps, []}. +{erl_opts, [debug_info]}. \ No newline at end of file diff --git a/apps/roster/src/Freind Protocol.html b/apps/roster/src/Freind Protocol.html new file mode 100644 index 000000000..566549bdf --- /dev/null +++ b/apps/roster/src/Freind Protocol.html @@ -0,0 +1,10 @@ + + + + + Title + + + + + \ No newline at end of file diff --git a/apps/roster/src/Protocol b/apps/roster/src/Protocol new file mode 100644 index 000000000..1b4a4ed53 --- /dev/null +++ b/apps/roster/src/Protocol @@ -0,0 +1,22 @@ +При востановлении сессии всегда запрашивать изменения с даты последнего входа +основных сущностей (Roster и т.д.). + + + +ПРОТОКОЛ ФРЕНДОВАНИЯ + + +1. А посылает {Friend,[],ARosterId, BPhoneId, simple} о реквесте дружбы для Б. + +2. В ростер B записывается контакт {Сontact, APhoneId, ..., request} со статусом confirm +(тут нужно уточнить- это должна быть пометка требующая определенного действия ) с пометкой ("не подтвержден" +А также во все online-сессии Б посылается тот же тупл. + +3. В ростер А записывается контакт {Сontact, BPhoneId, ..., not_confirm} с пометкой not_confirmed. +А также во все online-сессии A посылается аналогичный тупл. + +4. Какая-то сессия Б отправляет {Confirm, BRosterId, APhoneId, friend}. Все он-лайн сессии А и Б получают +{Сontact, APhoneId, ..., friend} и {Сontact, BPhoneId, ..., friend} соотвественно с пометкой friend. + + +Предлагается также набор системных ответов к которым привязаны основные действия на \ No newline at end of file diff --git a/apps/roster/src/protocol/roster_friend.erl b/apps/roster/src/protocol/roster_friend.erl index bd2b2e4b4..cfc0bb629 100644 --- a/apps/roster/src/protocol/roster_friend.erl +++ b/apps/roster/src/protocol/roster_friend.erl @@ -1,6 +1,7 @@ -module(roster_friend). -include("roster.hrl"). -include_lib("n2o/include/n2o.hrl"). +-include_lib("kvs/include/kvs.hrl"). -compile(export_all). check_adding(Result) -> {io,Result,<<>>}. @@ -51,6 +52,8 @@ info(#'Friend'{roster_id=Me, friend_id=Friend, status=confirm}=Confirm, Req, roster:send_ses(C, To, Mec), roster:send_ses(C, From, Friendc), n2o_async:pid(system, ?MODULE) ! {push, Me, Friend, <<"friend">>}, + case kvs_stream:load(Feed1={p2p, Lo, Hi}) of {error,not_found} -> kvs_stream:save(#cur{id=Feed1}); _ -> ok end, + case kvs_stream:load(Feed2={p2p, Hi, Lo}) of {error,not_found} -> kvs_stream:save(#cur{id=Feed2}); _ -> ok end, {reply, {bert, {io,Local,Remote}}, Req, State}; false -> {reply, {bert, {io,{error,not_authorized},<<>>}}, Req, State} end; diff --git a/apps/roster/src/protocol/roster_message.erl b/apps/roster/src/protocol/roster_message.erl index 703f513ea..e3951a127 100644 --- a/apps/roster/src/protocol/roster_message.erl +++ b/apps/roster/src/protocol/roster_message.erl @@ -1,26 +1,41 @@ -module(roster_message). -include("roster.hrl"). -include_lib("n2o/include/n2o.hrl"). +-include_lib("kvs/include/kvs.hrl"). -compile(export_all). start() -> n2o_async:start(#handler{module=?MODULE,class=system,group=roster,name=?MODULE,state=[]}). -info(#'History'{roster_id=Roster, contact_id = Contact, cursor = Cursor, status = get}=Data, Req, - #cx{params = ClientId} = State) when is_integer(Cursor) -> +%%info(#'History'{roster_id=Roster, contact_id = Contact, cursor = Cursor, status = get}=Data, Req, +%% #cx{params = ClientId} = State) when is_integer(Cursor) -> +%% n2o:info(?MODULE, "~p:~p:History/get:~p",[Roster,ClientId,Contact]), +%% {Messages, Cursor2} = +%% case kvs:get(chain,roster:feed_key(p2p, Roster, Contact)) of +%% {ok, #chain{count = Count, top = Top} = Feed} when Cursor < Top-> +%% {lists:reverse(kvs:fold( +%% fun (#'Message'{id = Id} = A,Acc) when Id > Cursor ->[A|Acc]; +%% (_, Acc) -> Acc end, [], 'Message', +%% element(#container.top, Feed),Count,#iterator.prev)), Top}; +%% {ok, #chain{count = Count, top = Top} = Feed}-> {[], Top}; +%% {error, _} -> {[], Cursor} +%% end, +%% {reply, {bert, Data#'History'{data=Messages, cursor = Cursor2}}, Req, State}; + + +info(#'History'{roster_id=Roster, contact_id = Contact, cursor = Cursor, size=N, status = get}=Data, Req, + #cx{params = ClientId} = State) when is_integer(Cursor) -> n2o:info(?MODULE, "~p:~p:History/get:~p",[Roster,ClientId,Contact]), {Messages, Cursor2} = - case kvs:get(chain,roster:feed_key(p2p, Roster, Contact)) of - {ok, #chain{count = Count, top = Top} = Feed} when Cursor < Top-> - {lists:reverse(kvs:fold( - fun (#'Message'{id = Id} = A,Acc) when Id > Cursor ->[A|Acc]; - (_, Acc) -> Acc end, [], 'Message', - element(#container.top, Feed),Count,#iterator.prev)), Top}; - {ok, #chain{count = Count, top = Top} = Feed}-> {[], Top}; - {error, _} -> {[], Cursor} - end, + case kvs:get(cur,{p2p, Roster, Contact}) of + {ok, #cur{left = L, top = Top}=Cur} when Cursor < Top -> + {(kvs_stream:take(Cur#cur{dir=0, args=N}))#cur.args, Top}; + {ok,#cur{ top = Top}} -> {[], Top}; + {error, _} -> {[], Cursor} + end, {reply, {bert, Data#'History'{data=Messages, cursor = Cursor2}}, Req, State}; -info(#'Cursor'{feed={Type, PartyA, PartyB}=F,aux=PartyInt,position=Pos}=Cursor,Req, + +info(#'Cursor'{feed={Type, PartyA, PartyB}=F,aux=PartyInt, position=Pos}=Cursor,Req, #cx{client_pid = C, params = ClientId, session= Token} =State) -> Feed = roster:feed_key(Type,PartyA,PartyB), n2o:info(?MODULE, "~p:~p:Cursor/:~p:~p",[PartyA,PartyB,Pos,PartyInt]), @@ -30,7 +45,7 @@ info(#'Cursor'{feed={Type, PartyA, PartyB}=F,aux=PartyInt,position=Pos}=Cursor,R {Me,Phone} = case PartyInt of 1 -> {PartyB,From}; 2 -> {PartyA,To} end, - case kvs:get(chain,Feed) of + case kvs_stream:get(chain,Feed) of {ok,Chain} -> NewPos = case PartyInt of 1 -> case Chain#chain.unread of {A,B} -> {Pos, B}; _ -> {Pos, []} end; @@ -64,32 +79,36 @@ info(#'Message'{from=From,to=To,status=client, created=Created, files=[#'Desc'{p #cx{params = ClientId, client_pid = C, session= Token} = State) -> % create message - - Message = Msg#'Message'{id = kvs:next_id('Message',1), - feed_id = roster:feed_key(p2p,From, To), + Feed=roster:feed_key(p2p,From, To), + FeedF={p2p,From, To}, FeedT={p2p,To, From}, + Message = Msg#'Message'{id = kvs:next_id('Message',1), container=cur, + feed_id = Feed, created= case Created of [] -> roster:now_msec(); _ -> Created end }, % save to db - {ok, AddedMsg} = kvs:add(Message), + % {ok, AddedMsg} = + #cur{top=F}=kvs_stream:save(kvs_stream:top(kvs_stream:add((kvs_stream:load(FeedF))#cur{dir=0, args=Message}))), + #cur{top=I}=kvs_stream:save(kvs_stream:add((kvs_stream:load(FeedT))#cur{dir=0, args=Message})), % move cursor - {p2p, One,Two} = roster:feed_key(p2p,From, To), - Feed = {p2p, One,Two}, - case kvs:get(chain,Feed) of - {ok,Chain} -> - Pos = Message#'Message'.id, - NewPos = case From of - One -> case Chain#chain.unread of {A,B} -> {Pos, B}; _ -> {Pos, []} end; - Two -> case Chain#chain.unread of {A,B} -> {A, Pos}; _ -> {[], Pos} end end, - kvs:put(Chain#chain{unread=NewPos}); - _ -> skip end, + {p2p, One,Two} = Feed, +% Feed = {p2p, One,Two}, +%% case kvs_stream:load(Feed) of +%% #cur{left=L, right=R}=Cur -> +%% % Pos = Message#'Message'.id, +%%%% NewPos = case From of +%%%% One -> case Cur#cur.reader of {A,B} -> {Pos, B}; _ -> {Pos, []} end; +%%%% Two -> case Cur#cur.reader of {A,B} -> {A, Pos}; _ -> {[], Pos} end end, +%% kvs_stream:save(Cur#cur{left=L+1, right=R-1}); +%% % kvs:put(Chain#chain{unread=NewPos}); +%% _ -> skip end, % publish Topic = iolist_to_binary(["p2p/",One,"/",Two]), - NewMessage = AddedMsg#'Message'{status=sent}, + NewMessage = Message#'Message'{ status=sent}, emqttc:publish(C, Topic, term_to_binary(NewMessage), [{qos, 2}]), n2o:info(?MODULE, "~p:~p:Message/client:~p",[From,To,Payload]), diff --git a/apps/roster/src/protocol/roster_presence.erl b/apps/roster/src/protocol/roster_presence.erl index a54cee45a..8b360ce25 100644 --- a/apps/roster/src/protocol/roster_presence.erl +++ b/apps/roster/src/protocol/roster_presence.erl @@ -74,6 +74,7 @@ on_disconnect(#'Auth'{token = Token, type = Type, phone = Phone, client_id = <<" when Type == verified;Type == reg -> n2o:info(?MODULE, "~p:~p:DISCONNECT",[Phone, ClientId]), n2o:unsubscribe_cli(ClientId, [{roster:action_topic(ClientId), 2}]), ok; + on_disconnect(#'Auth'{token= Token, phone = Phone, user_id = UserId, client_id = ClientId} = Session)-> n2o:info(?MODULE, "~p:~p:DISCONNECT",[Phone, ClientId]), List = case roster:list_rosters(Phone, id_rosters) of diff --git a/apps/roster/src/roster_proto.erl b/apps/roster/src/roster_proto.erl index ffb2872b7..39f15d91b 100644 --- a/apps/roster/src/roster_proto.erl +++ b/apps/roster/src/roster_proto.erl @@ -1,10 +1,8 @@ - -module(roster_proto). -include("roster.hrl"). -include_lib("n2o/include/n2o.hrl"). --compile({parse_transform, bert_java}). --compile({parse_transform, bert_javascript}). --compile({parse_transform, bert_swift}). +%-compile({parse_transform, macbert_javascript}). % generate JavaScript +%-compile({parse_transform, macbert_swift}). % generate Swift classes model for iOS -export([info/3]). info(#'Typing'{} = Typing, Req, State) -> roster_message :info(Typing, Req, State); @@ -18,10 +16,6 @@ info(#'Roster'{} = Roster, Req, State) -> roster_roster :info(Roster, Req, S info(#'Friend'{} = Friend, Req, State) -> roster_friend :info(Friend, Req, State); info(#'Search'{} = Search, Req, State) -> roster_search :info(Search, Req, State); info(#'Room'{} = Room, Req, State) -> roster_room :info(Room, Req, State); -info(#'Member'{} = Member, Req, State) -> roster_room :info(Member, Req, State); -info(#'Star'{} = Star, Req, State) -> roster_fav :info(Star, Req, State); -info(#'Tag'{} = Tag, Req, State) -> roster_fav :info(Tag, Req, State); -info(#'Loc'{} = Loc, Req, State) -> roster_loc :info(Loc, Req, State); info(#'Auth'{} = Auth, Req, State) -> roster_auth :info(Auth, Req, State); info(Message,Req,State) -> diff --git a/apps/roster/src/roster_test.erl b/apps/roster/src/roster_test.erl index 8e1999f3e..2f1bf8f0d 100644 --- a/apps/roster/src/roster_test.erl +++ b/apps/roster/src/roster_test.erl @@ -43,7 +43,8 @@ roster_case(Term,State) -> #'Profile'{phone=_Phone} = P -> State#state{last_res = P}; #'Contact'{phone_id=_Pid} = Con -> State#state{last_res = Con}; #'Message'{} = Con -> State#state{last_res = Con}; - #'History'{} = History -> State#state{last_res = History}; + #'History'{} = History -> n2o:info(?MODULE, "History/get:~p",[History]), + State#state{last_res = History}; Res -> State#state{last_res = Res} end. @@ -135,9 +136,9 @@ test_friend_multi() -> stop_client(AClientId). test_roster() -> - Phones= [_PhoneA,PhoneB] = [<<"7337">>,<<"3773">>], + Phones= [_PhoneA,PhoneB] = [<<"77">>,<<"33">>], [{From, AClientId}, {To, BClientId}] = [begin - roster:purge_user(Phone), + %roster:purge_user(Phone), {ClientId, Token} = reg_fake_user(Phone), start_client(ClientId , Token), receive_test(ClientId, #'Auth'{}, 0), @@ -147,14 +148,16 @@ test_roster() -> send_sync(AClientId,#'Roster'{id=FromRId, status=get}), send(AClientId,#'Friend'{roster_id=From, friend_id=To, status= request}), send_sync(BClientId,#'Friend'{roster_id=To, friend_id=From, status= confirm}), + timer:sleep(1000), stop_vnodes(), n2o_async:send(system, AClientId, AMsg = #'Message'{from = From, to = To, files = [#'Desc'{payload = <<"TestA!">>}], status = client}), n2o_async:send(system, BClientId, #'Message'{from = To, to = From, files = [#'Desc'{payload = <<"TestB!">>}], status = client}), start_vnodes(), receive_test(AClientId, AMsg, 1), receive_drop(), {p2p, One,Two} = roster:feed_key(p2p,From, To), - #'Contact'{} = send_sync(AClientId,#'Cursor'{feed={p2p, One, Two},aux=1,position=3}), - #'History'{} = send_sync(BClientId, #'History'{roster_id = To, contact_id = From, cursor = 2, status = get}), + % #'Contact'{} = send_sync(AClientId,#'Cursor'{feed={p2p, One, Two},aux=1,position=3}), + %#'History'{} = + send_sync(BClientId, #'History'{roster_id = To, contact_id = From, cursor = 10, size=3, status = get}), #'Profile'{} = send_sync( BClientId, #'Profile'{phone = PhoneB, status=get}), send(BClientId,#'Friend'{roster_id=To, friend_id=From, status= ban}), stop_client(AClientId), stop_client(BClientId). diff --git a/apps/roster/src/test b/apps/roster/src/test new file mode 100644 index 000000000..a512c1daa --- /dev/null +++ b/apps/roster/src/test @@ -0,0 +1,511 @@ +-module(roster_test). +-compile(export_all). +-include("roster.hrl"). +%% API +-behaviour(gen_server). + +-define(SERVER, ?MODULE). + +%% ------------------------------------------------------------------ +%% API Function Exports +%% ------------------------------------------------------------------ + +-export([start_link/0, stop/0]). + +%% ------------------------------------------------------------------ +%% gen_server Function Exports +%% ------------------------------------------------------------------ + +-export([init/1, handle_call/3, handle_cast/2, handle_info/2, + terminate/2, code_change/3]). + +-record(state, {mqttc = [], client_id = <<"">>, module = [], username = [], from = [], token = [], disconnect=true}). + +-define(TEST_ID, 1). +%% ------------------------------------------------------------------ +%% API Function Definitions +%% ------------------------------------------------------------------ + +%% client issues {client,1,1,,message} to events/4/index/anon/emqttd_198234215548221/Token. +web_chat(Id,Msg)-> + VNode=n2o:rand_vnode(), + Tok = get_token(), + Token=case Tok of + <<>> -> {ok,T} = publish_init(), T; + T-> T + end, + Topic = iolist_to_binary([<<"events/">>, integer_to_list(VNode, 10), + <<"/%m/anon/%c/">>, Token]), + web_chat_c({client,Id,Topic,Msg}). +web_chat_c({client,_Id,Topic,_Msg}=Issue)-> + Payload = term_to_binary(Issue), + Opts = [{qos, 2}], + publish(client,Topic, Payload, Opts), + received(). + +get_client_id() -> + {_, NPid, _} = emqttd_guid:new(), + iolist_to_binary(["emqttd_", integer_to_list(NPid)]). + +received() -> + receive + {ok, {binary, {vnode_max, _}}} -> + <<>>; + {ok, {binary, M}} -> + case binary_to_term(M) of + {io,_,_} = Res -> + ?LOG("io received ~p~n", [Res]), + Res; + {vnode_max, _} = Res -> + ?LOG("received ~p~n", [Res]), + Res + end; + Res -> {error, Res} + after + 3000 -> + {error, timeout} + end. + +start() -> + start([{from, self()}, {password, <<"password">>}]). +start(Args) -> + {ok, Pid} = supervisor:start_child(test_sup, {?TEST_ID,{roster_test,start_link,[Args]}, + permanent,2000,worker,[roster_test]}), + {ok, {Pid,received()}}. + +set_token(Token) -> +%% T = +%% case Token of +%% [] -> n2o_session:authenticate([],[]); +%% _ ->Token +%% end, + gen_server:call(?SERVER,{'Token', Token}). +get_token() -> + gen_server:call(?SERVER, 'Token'). + +send_sync(Payload, Token) -> + send_sync(Payload, Token, <<"/%m/anon/%c/">>). +send_sync(Payload, Token, TopicPattern) -> + send_sync(Payload, Token, TopicPattern, n2o:rand_vnode()). +send_sync(Payload, Token, TopicPattern, VNode) -> + send_sync(Payload, Token, TopicPattern, VNode, [{qos, 2}]). +send_sync(Payload, Token, TopicPattern, VNode, Opts) -> + Topic = iolist_to_binary([<<"events/">>, integer_to_list(VNode, 10), + TopicPattern, Token]), + publish(Topic, Payload, Opts), + case received() of + {io, Reply, {'Token', T}} = Res -> + set_token(T), + ?LOG("Client received ~p~n", [Res]); +%% {ok, Reply, T}; + {io, Reply, {error, {_, T}}} = Res -> + set_token(T), + ?LOG("Client received ~p~n", [Res]); +%% {ok, Reply, T}; + Res -> + ?LOG("Client ~p is pub ~n", [Res]) + end. + +publish_init(VNode, Token) -> + send_sync(<<"/%m/anon/%c/">>, VNode, Token, term_to_binary({init, Token}), [{qos, 2}]). +publish_init() -> + Token = get_token(), + send_sync(term_to_binary({init, Token}), Token). + +auth(Phone) -> + Token = + case [T || A = #'Auth'{token = T} <- kvs:index('Auth', phone, Phone)] of + [T|_] -> set_token(T), T; + [] -> set_token([]),[] + end, + send_sync(term_to_binary(#'Auth'{phone=Phone, token=Token}), Token). + +delete_user(Phone) -> + roster:del_user(Phone), + set_token([]). + + +verify(SmsCode) -> + verify(SmsCode, {'Token', get_token()}). +verify(SmsCode, {'Token', Token}) -> + send_sync(term_to_binary({{verify, SmsCode}, {'Token', Token}}), Token). + +start_link() -> + start_link([]). +start_link(Args) -> + gen_server:start_link({local, ?SERVER}, ?MODULE, Args, []). + +subscribe(Topic) -> + subscribe(Topic, 0). +subscribe(Topic, Qos) -> + gen_server:call(?SERVER, {subscribe, Topic, Qos}). + +publish(Topic, Payload) -> + publish(Topic, Payload, [{qos, 0}]). +publish(Topic, Payload, Opts) -> + %?LOG("Try ~p is pub ~n", [Payload]), + gen_server:call(?SERVER, {publish, Topic, Payload, Opts}). +publish(client, Topic, Payload, Opts) -> + gen_server:call(?SERVER, {client, Topic, Payload, Opts}). + +stop() -> + gen_server:call(?SERVER, stop). + +stop_test() -> + supervisor:terminate_child(test_sup, ?TEST_ID), + supervisor:delete_child(test_sup, ?TEST_ID). + +% Test mqtt.send({Topic,{Payload,Context}}) +get_something(_Topic,Req) -> + {'Token',Tok} = n2o_session:authenticate([],[]), + Token=case Tok of + <<>> -> {ok,T} = publish_init(), T; + T-> T + end, + Top = {"events/7/", <<"roster">>}, + get_something(n2o:rand_vnode(),Top, Token, Req). +get_something(VNode,Top,Token, Req)-> + {_,M}=Top, + IT = iolist_to_binary([<<"events/">>, integer_to_list(VNode, 10), + <<"/%m/anon/%c/">>, Token]), + %Topic=IT, + %_Topic=emqttd_topic:feed_var(<<"%m">>, M, IT), + D = case Req of + {Payload,{'Token', _}}-> term_to_binary(Req); + {Payload,[{'Token',_}]}-> term_to_binary(Req); + {Payload, _Context} -> term_to_binary({Payload, {'Token',Token}}); + {command, Payload, C} -> term_to_binary({Payload, C }); + Req -> term_to_binary(Req) + %Payload = term_to_binary({'Roster', Token, Data}), + end, + Opts = [{qos, 2}], + publish(IT, D, Opts), + case received_data() of + {Data, {'Token', TT}} -> + %set_token(T), + {ok,TT}, + ?LOG("Ok ~p is pub ~n", [Data]), {io, Data, {'Token', TT}}; + Res -> + ?LOG("Client ~p is pub ~n", [Res])%, + end. + +received_data() -> + receive + {ok, {binary, <<>>}} -> + <<>>; + {ok, {binary, M}} -> + ?LOG("!!!!!!!!!!!!!!!!!!!!!!!!~p~n", [binary_to_term(M)]), + binary_to_term(M); + Res -> {error, Res} + after + 3000 -> + {error, timeout} + end. + +%% ------------------------------------------------------------------ +%% gen_server Function Definitions +%% ------------------------------------------------------------------ + +init(Args) -> + Opts = [{host, "localhost"},{username, <<"api">>},{client_id, <<"">>},{reconnect, 3}, + {logger, {console, info}}]++Args, + {ok, C} = emqttc:start_link(Opts), + ?LOG("Client ~p is connected~n", [<<"">>]), + Username = proplists:get_value(username, Opts), + {ok, #state{mqttc = C, username = proplists:get_value(username, Opts), + from = proplists:get_value(from, Opts), + module = Username}}. + +handle_call(stop, _From, State) -> + {stop, normal, ok, State}; + +handle_call({subscribe, Topic, Qos}, _From, #state{mqttc = C} = State) -> + emqttc:subscribe(C, Topic, Qos), + ?LOG("Subscribed from ~p: ~p~n", [_From, Topic]), + {reply, ok, State}; + +handle_call({unsubscribe, Topic}, _From, #state{mqttc = C} = State) -> + emqttc:unsubscribe(C, Topic), + ?LOG("Message from ~p: ~p~n", [_From, Topic]), + {reply, ok, State}; + +handle_call({publish, T, Payload, Opts} = Request, {Pid, _} = From, #state{mqttc = C, module = M, client_id = ClientId} = State) -> +%% ?LOG("Handle call publish request ~p~n", [{Request, C, ClientId, Opts}]), + Topic = emqttd_topic:feed_var(<<"%m">>, M, emqttd_topic:feed_var(<<"%c">>, ClientId, T)), + ?LOG("Handle call publish request on Topic ~p~n", [{Topic, C, ClientId, Opts}]), + Res = emqttc:publish(C, Topic, Payload, Opts), + {reply, Res, State#state{from = Pid}}; +handle_call({client, T, Payload, Opts} = _Request, {Pid, _} = _From, #state{mqttc = C, module = M, client_id = ClientId} = State) -> +%% ?LOG("Handle call publish request ~p~n", [{Request, C, ClientId, Opts}]), + {client,Id,T,Msg}=binary_to_term(Payload), + Topic = emqttd_topic:feed_var(<<"%m">>, M, emqttd_topic:feed_var(<<"%c">>, ClientId, T)), + ?LOG("Handle call publish request on Topic ~p~n", [{Topic, C, ClientId, Opts}]), + BMsg=term_to_binary({client,Id,Topic,Msg}), + Res = emqttc:publish(C, Topic, BMsg, Opts), + {reply, Res, State#state{from = Pid}}; +handle_call({'Token', Token}, _From, State) -> + ?LOG("Handle call Token received: ~n~p~n", [Token]), + {reply, ok, State#state{token = Token}}; +handle_call('Token', _From, #state{token = Token} = State) -> + ?LOG("Handle get Token: ~n~p~n", [Token]), + {reply, Token, State}; + +handle_call(_Request, _From, State) -> + {reply, ok, State}. + +handle_cast(_Msg, State) -> + {noreply, State}. + +%% Receive Messages + +handle_info({publish, Topic, Payload}, #state{client_id = <<"">>, module = M} = State) -> + ?LOG("~p~n", [emqttd_topic:words(Topic)]), + [<<"actions">>, M, ClientId] = emqttd_topic:words(Topic), +%% ?LOG("Message from ~s:~n ~s~n", [Topic, wf_render:render(Payload)]), + handle_info({publish, Topic, Payload}, State#state{client_id = ClientId}); +%% {noreply, State#state{client_id = ClientId}}; + +handle_info({publish, Topic, Payload}, #state{from = undefined} = State) -> + ?LOG("Message from ~s:~n ~s~n", [Topic, wf_render:render(Payload)]), + {noreply, State}; +handle_info({publish, Topic, Payload}, #state{from = From} = State) -> + ?LOG("Message from ~s:~n ~s~n", [Topic, wf_render:render(Payload)]), + From ! {ok, {binary, Payload}}, + {noreply, State}; + +%% Client connected + +%%handle_info({mqttc, C, connected}, State = #state{mqttc = C, client_id = <<"">>}) -> +%% ?LOG("Client ~p is connected~n", [C]), +%% {noreply, State#state{client_id = get_client_id()}}; + +handle_info({mqttc, C, connected}, State = #state{mqttc = C}) -> + ?LOG("Client ~p is connected~n", [C]), + {noreply, State}; + +%% Client disconnected +handle_info({mqttc, C, disconnected}, State = #state{mqttc = C}) -> + ?LOG("Client ~p is disconnected~n", [C]), + + {noreply, State}; + +handle_info(_Info, State) -> + {noreply, State}. + +terminate(_Reason, #state{mqttc = C}) -> + emqttc:disconnect(C), + ok. + +code_change(_OldVsn, State, _Extra) -> + {ok, State}. + +%%%%%%%%%%%%%%%%%% +%% API for testing + +subscribe2(C, Topics, FeedVars) -> + [emqttc:subscribe(C, n2o:feed_topic(TopicPattern, Vars++FeedVars), Qos) || {TopicPattern, Vars, Qos} <- Topics]. +publish2(C, Topics, FeedVars) -> + [emqttc:publish(C, n2o:feed_topic(TopicPattern, Vars++FeedVars), term_to_binary(Term), Opts) || {Term, {TopicPattern, Vars, Opts}} <- Topics]. + +gen_test(ReceiveFun, #state{} = State) -> + gen_test(ReceiveFun, {publish, [{<<"events/%v/%m/anon/%c/%t">>, [], 2}]}, State). +gen_test(ReceiveFun, {publish, Topics}, #state{} = State) -> + gen_test(ReceiveFun, {publish, Topics}, {subscribe, []}, State); +gen_test(ReceiveFun, {p2p, From, To}, #state{} = State) -> + [RosFromId|_] = roster:get_rosters({phone, From}), + [RosToId|_] = roster:get_rosters({phone, To}), + gen_test(ReceiveFun, + {publish, [{<<"p2p/%r/%r2">>, [{<<"%r">>, RosFromId}, {<<"%r2">>, RosToId}], qos2}]} + , {subscribe, [{<<"p2p/+/%r">>, [{<<"%r">>, RosFromId}], 2}]} + , #state{}). +gen_test(ReceiveFun, {publish, TopicsP}, {subscribe, TopicsS}, #state{mqttc = Cli, disconnect = Disconnect} = State) -> + fun ({Terms, Token, VNode, Args})-> + ClientId = get_client_id(), + Args2 = [ + {host, "localhost"}, +%% {host, "ns.synrc.com"}, + {username, <<"api">>}, + {reconnect, 3},{logger, {console, info}}, {client_id, ClientId}]++Args, + + Module = proplists:get_value(username, Args2, <<"api">>), + C = case Cli of + [] -> {ok, C2} = emqttc:start_link(Args2), C2; + _ -> Cli + end, + FeedVars = [{<<"%v">>, list_to_binary(integer_to_list(VNode, 10))}, + {<<"%m">>, Module}, + {<<"%c">>, ClientId}, + {<<"%t">>, Token}], + subscribe2(C, TopicsS, FeedVars), + publish2(C, lists:zip(Terms, TopicsP), FeedVars), + Res = receive_client(ReceiveFun, State), + {case Disconnect of + true -> emqttc:disconnect(C), State#state{mqttc = []}; + _ -> State#state{mqttc = C, token = Token, client_id = ClientId} + end, Res} + end. + +receive_client(ReceiveFun, #state{} = State) -> + receive + {publish, Topic, <<>>} -> + ?LOG("Message Received 1 from ~s", [Topic]), + receive_client(ReceiveFun, State); + {publish, Topic, Payload} -> + case binary_to_term(Payload) of + {vnode_max, _} -> + receive_client(ReceiveFun, State); + Term -> + ReceiveFun(Topic, Term, State) + end; + Res -> + ?LOG("Message Received: ~p~n", [Res]), + receive_client(ReceiveFun, State) + after + 3000 -> + ?LOG("Error: receive timeout!", []), + {error, timeout} + end. + +get_token(Phone) -> + case kvs:index('Auth', phone, Phone) of + [] -> <<>>; + [#'Auth'{token = Token}|_] -> Token + end. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% auth test + +positive_auth(Phone) -> + positive_auth(Phone, token, n2o:rand_vnode()). +positive_auth(#'Auth'{phone=Phone, token = Token}, VNode) -> + positive_auth(#'Auth'{phone=Phone, token = Token}, VNode, []). +positive_auth(Phone, token, VNode)-> + positive_auth(#'Auth'{phone=Phone, token = get_token(Phone)}, VNode, [], #state{}). +positive_auth(#'Auth'{token = Token} = Auth, VNode, Args, #state{} = State) -> + (gen_test(fun receive_auth/3, State))({[Auth], Token, VNode, Args}). + +receive_auth(Topic, Term, #state{} = State) -> + case Term of + ?IO_SUCCESS_AUTH(sms_sending_in_progress = Success, _)-> + ?LOG("Message Received from ~s: ~p~n", [Topic, Term]), + receive_client(fun receive_auth/3, State); + ?IO({ok, _} = Success, {'Token', _Token}) -> + ?LOG("Message Received from ~s: ~p~n", [Topic, Term]), + Success; + ?IO_ERR_AUTH({error, not_verified}=Err)-> + ?LOG("Message Received from ~s: ~p~n", [Topic, Term]), + Err; + ?IO_ERR_AUTH({error, {Err, _}}) = Res-> + ?LOG("Error Received from ~s: ~p~n", [Topic, Term]), + {error, Err}; + ?IO_ERR_AUTH({error, _} = Err) = Res-> + ?LOG("Error Message Received from ~s: ~p~n", [Topic, Term]), + {error, Err}; + Res -> + ?LOG("Unknown Message Received from ~s: ~p~n", [Topic, Term]), + Res + end. + +positive_verify(Phone, CmsCode) -> + Token = get_token(Phone), + (gen_test(fun receive_auth/3, #state{}))({[{{verify, CmsCode}, {'Token', Token}}], Token, n2o:rand_vnode(), []}). + +positive_resend(Phone) -> + positive_resend(Phone, token, n2o:rand_vnode()). +positive_resend(Phone, token, VNode)-> + positive_resend(Phone, get_token(Phone), VNode, [], #state{}). +positive_resend(_Phone, Token, VNode, Args, #state{} = State) -> + (gen_test(fun receive_auth/3, State))({[{resend_sms, {'Token', Token}}], Token, VNode, Args}). + +positive_p2p(From, To) -> + positive_p2p(From, To, <<"Hello!">>). +positive_p2p(From, To, Msg) -> + positive_p2p(From, To, Msg, n2o:rand_vnode()). +positive_p2p(From, To, Msg, VNode) -> + Token = get_token(From), + (gen_test(fun receive_p2p/2, {p2p, From, To}))({[#'Message'{payload = Msg}], Token, VNode, []}). + +receive_p2p(Topic, Msg) -> + case Msg of + #'Message'{}-> ?LOG("Message Received from ~s: ~p~n", [Topic, Msg]); + _ -> ?LOG("Unexpected Message Received from ~s: ~p~n", [Topic, Msg]) + end, Msg. + +auth_case(Phone) -> + VerifyFun = + fun(Phone) -> + Token = get_token(Phone), + case roster:get_session(Token) of + {ok, #'Auth'{sms_code = SmsCode}} -> + positive_verify(Phone, SmsCode); + {error, not_found} -> + ?LOG("session not found for ~p : ~p~n", [Phone, Token]), + {error, not_found} + end + end, + InvalidVerifyFun = + fun(Phone) -> + Token = get_token(Phone), + case roster:get_session(Token) of + {ok, #'Auth'{sms_code = _SmsCode}} -> + positive_verify(Phone, <<"0000">>); + {error, not_found} -> + ?LOG("session not found for ~p : ~p~n", [Phone, Token]), + {error, not_found} + end + end, + + [{fun positive_auth/1, {ok, sms_sent_successfully}, lists:flatten(io_lib:format("positive_auth(~s)~n", [Phone]))}, + {fun positive_auth/1, {error, not_verified}, lists:flatten(io_lib:format("positive_auth(~s)~n", [Phone]))}, + {InvalidVerifyFun, {error, invalid_sms_code}, lists:flatten(io_lib:format("positive_verify(~s)~n", [Phone]))}, + {InvalidVerifyFun, {error, invalid_sms_code}, lists:flatten(io_lib:format("positive_verify(~s)~n", [Phone]))}, + {InvalidVerifyFun, {error, invalid_sms_code}, lists:flatten(io_lib:format("positive_verify(~s)~n", [Phone]))}, + {InvalidVerifyFun, {error, attempts_expired}, lists:flatten(io_lib:format("positive_verify(~s)~n", [Phone]))}, + {fun positive_resend/1, {ok, sms_sent_successfully}, lists:flatten(io_lib:format("positive_resend(~s)~n", [Phone]))}, + {VerifyFun, {ok, verified}, lists:flatten(io_lib:format("positive_verify(~s)~n", [Phone]))}, + {InvalidVerifyFun, {ok, session_verified}, lists:flatten(io_lib:format("positive_verify(~s)~n", [Phone]))}, + {fun positive_auth/1, {ok, login}, lists:flatten(io_lib:format("positive_auth(~s)~n", [Phone]))}]. + +auth_case_test(Phone) -> + roster:del_user(Phone), + TestRes = + lists:foldl( + fun ({Fun, Res, Desc}, Acc) -> + case Fun(Phone) of + {_C, Res} -> + ?LOG("~s:\t result ~p", [Desc, Res]), + Acc++[{ok, Res, Desc}]; + {_C, ErrRes} -> + ?LOG("error for ~s\t result ~p", [Desc, ErrRes]), + Acc++[{error, ErrRes, Desc}] + end + end, [], auth_case(Phone)), + ?LOG("Test results: ~p", [TestRes]), + [{Success, Res} || {Success, Res, _} <- TestRes]. + +%% end auth test + +create_user(Phone) -> + roster_proto:auth(#'Auth'{phone= Phone}, #auth_state{send_sms = fun reg_without_sms/2}), + ?LOG(" User adde: ~s", [Phone]). + + +reg_without_sms(#'Auth'{token = Tok, phone=Phone} = Auth, _State) -> + SmsCode = [], %gen_sms_code(), + A=Auth#'Auth'{sms_code = SmsCode, attempts = ?MAX_ATTEMPTS}, ?IO_SUCCESS_AUTH(sms_send, {'Token', Tok}), + io:format("Auth: ~p", [Auth]), + roster:add_user(Phone), + [#'Contact'{id=UserId}]=roster:get_contact({phone, Phone}), + kvs:put(A#'Auth'{user_id=UserId}), + {A}. + +get_sessions(Phone)-> + {Payload,Context} = case kvs:index('Auth', phone, Phone) of + [#'Auth'{token=Token, user_id=UserId}] -> + case kvs:get('Profile', UserId) of + {ok, P=#'Profile'{data =_PD,accounts =Roster}} -> + D=kvs:get('Person',Roster), + {P,{'Token',Token}}; + O->{O,UserId} + end; + E -> {"",E} + end. \ No newline at end of file diff --git a/et qq b/et qq new file mode 100644 index 000000000..86a66fbdd --- /dev/null +++ b/et qq @@ -0,0 +1,7865 @@ +commit 49823c8d48b52d0587a0f8d3154968f41510eb42 +Author: qomputer +Date: Wed Aug 30 17:53:29 2017 +0300 + + Fix Local and Remote in Friend2 + +commit 9cd2b677af4ef1bcb32e72e2f34affc0be0fdbcb +Author: qomputer +Date: Wed Aug 30 17:27:25 2017 +0300 + + Fix Frend2 + +commit f85ae3d599982155fb4b182b073458f08e64a67d +Author: Namdak Tonpa +Date: Wed Aug 30 17:25:19 2017 +0300 + + fix reg behaviour + +commit d2042e8800cca3e83f492f6d781fe69d575eefd4 +Author: Namdak Tonpa +Date: Wed Aug 30 17:24:09 2017 +0300 + + fix reg behaviour + +commit 4fd3ceba4300e56354d22e5982338978872ba8a3 +Author: Namdak Tonpa +Date: Wed Aug 30 17:07:43 2017 +0300 + + trailing spaces + +commit d5ec5a824d423934e051949d38976f5c56407575 +Author: Namdak Tonpa +Date: Wed Aug 30 17:06:00 2017 +0300 + + cleanup + +commit fbbab775945627ebf07d3f54039b2f742424808f +Author: Namdak Tonpa +Date: Wed Aug 30 16:46:25 2017 +0300 + + cursor, 9 + +commit b56e4986a47d9001e91b393b8cfaf0f75f0af647 +Merge: 79bf55d 9825598 +Author: Namdak Tonpa +Date: Wed Aug 30 16:42:06 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 79bf55d937c979ec19f9272777e94b886241f19e +Author: Namdak Tonpa +Date: Wed Aug 30 16:41:52 2017 +0300 + + cursor, 8 + +commit 98255980953c8015ff0f90227844e60527ad3f1a +Author: cryoflamer +Date: Wed Aug 30 16:31:38 2017 +0300 + + tune roster_auth + +commit d9217477eee1feff8063a3edd6454d571fab2398 +Author: cryoflamer +Date: Wed Aug 30 16:31:03 2017 +0300 + + added test_reg and test_reg_jwt to suite fun + +commit 4775d5e4fade0d42a8851a3380acb54a46752d78 +Author: Namdak Tonpa +Date: Wed Aug 30 16:29:50 2017 +0300 + + cursor, 7 + +commit a4ecf09e7ef6e777fddecc032a12aa1929580f30 +Merge: 4ad5f65 888050f +Author: Namdak Tonpa +Date: Wed Aug 30 16:26:41 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 4ad5f6537282be33c5d116bfa60d86799e3094fe +Author: Namdak Tonpa +Date: Wed Aug 30 16:26:30 2017 +0300 + + cursor, 6 + +commit 888050fe2a245c8721452400e458d95acb18e3c5 +Author: cryoflamer +Date: Wed Aug 30 16:24:05 2017 +0300 + + fix "double session" bug for jwt + +commit 48002912ace67ef922c9f8f89afa3312571f181f +Author: cryoflamer +Date: Wed Aug 30 16:23:31 2017 +0300 + + added test_reg_jwt fun + +commit 007bf4c1ddd76a8f3f180be7df9359cd146082c3 +Author: Namdak Tonpa +Date: Wed Aug 30 16:16:53 2017 +0300 + + cursor, 5 + +commit 51043efaaf8f3261806d1677fd49bd72d4317427 +Author: Namdak Tonpa +Date: Wed Aug 30 16:12:09 2017 +0300 + + cursor, 4 + +commit 39e161cfaf35601e49ac365609ef76d477556900 +Author: Namdak Tonpa +Date: Wed Aug 30 16:09:03 2017 +0300 + + cursor, take 3 + +commit 1e26693bc2cb38950e573e6bea2b695b208a6fdb +Author: Namdak Tonpa +Date: Wed Aug 30 16:03:38 2017 +0300 + + cursor, take 2 + +commit c6a95d04a9cded44ac5ecd396b018aa81844d070 +Author: Namdak Tonpa +Date: Wed Aug 30 15:59:25 2017 +0300 + + cursor + +commit 3334ccc23957e002b6a83fa0259cbc16da1471c7 +Merge: cee00fc 4d0a27b +Author: 5HT +Date: Wed Aug 30 12:22:42 2017 +0000 + + fix push + +commit 4d0a27b8f6d6a602064970a0e18acc3feaa97cc6 +Merge: 3941c77 80f91a6 +Author: Namdak Tonpa +Date: Wed Aug 30 15:21:41 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 3941c772a83797d15dc7447bd18a10b45320ab06 +Author: Namdak Tonpa +Date: Wed Aug 30 15:21:34 2017 +0300 + + push + +commit cee00fc6da4718b37a3ae9292f360b3d3aca8f6a +Merge: 5b0fe02 80f91a6 +Author: 5HT +Date: Wed Aug 30 12:05:52 2017 +0000 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 80f91a6a1c17c8e329ab1ce6dabef8c3281cab80 +Author: cryoflamer +Date: Wed Aug 30 14:38:19 2017 +0300 + + fixed "double reg" bug + +commit 3f47880e5dc9808cfb2218050a1c00a4e74e663d +Author: cryoflamer +Date: Wed Aug 30 14:06:49 2017 +0300 + + added test_reg for double reg bug. + +commit 7b63ac1b39ab412ef1c533e08d688252d2f81c35 +Author: Namdak Tonpa +Date: Wed Aug 30 13:54:24 2017 +0300 + + friend2 + +commit 3eb15e3a0bc6c3d9c69d9e63f17509beeeb8b2cb +Author: Namdak Tonpa +Date: Wed Aug 30 13:16:49 2017 +0300 + + pretty logs + +commit d9c5865a559b7a73100270352b1fa0ec6ec599ad +Author: Namdak Tonpa +Date: Wed Aug 30 12:53:09 2017 +0300 + + n2:info + +commit 68f3f15fb645c0f63ccae05c3219ca34db828986 +Merge: 117555a 28db1a9 +Author: Namdak Tonpa +Date: Wed Aug 30 12:41:12 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 117555aac57f9ac2bd30d3194ea6c4803cfd19f2 +Author: Namdak Tonpa +Date: Wed Aug 30 12:38:54 2017 +0300 + + contact + +commit 28db1a94a40d1482569b5ad3eb08a33f9563608b +Merge: fa91b33 18d49ec +Author: ne-luboff +Date: Wed Aug 30 12:36:44 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into push_notifications + +commit fa91b334f0ca082d2e15e168c7bd654edf9f6ad4 +Author: ne-luboff +Date: Wed Aug 30 12:36:25 2017 +0300 + + Update test android token + +commit 18d49ecba3aedee36bef8f47a1d7445f2229d771 +Author: qomputer +Date: Wed Aug 30 12:35:30 2017 +0300 + + Fix Cursor + +commit 2feb8b7090abc4dfcfefa0300165cb33c63f2574 +Author: ne-luboff +Date: Wed Aug 30 12:27:06 2017 +0300 + + Second try of ios push implementation + +commit 5b0fe02a0021390ce74781fe3429d21385c8a35a +Merge: cea7615 862d36e +Author: 5HT +Date: Wed Aug 30 09:11:39 2017 +0000 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 862d36e18e16b43c56923d1471a120a8097013f3 +Author: cryoflamer +Date: Wed Aug 30 12:11:16 2017 +0300 + + fixed roster_auth:store + +commit 08196fd9d024d0c98a920a96981bde1442e598b0 +Author: ne-luboff +Date: Wed Aug 30 11:10:42 2017 +0300 + + Add APNs certificates + +commit ba714b78ca74f254754e6467cdd86cb209ba5945 +Author: ne-luboff +Date: Wed Aug 30 11:09:31 2017 +0300 + + Add note about push tokens + +commit 6c4617470fc9b591ec941ce8aed186e445541f26 +Merge: 3424fa6 7f21eb8 +Author: ne-luboff +Date: Wed Aug 30 11:06:06 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into push_notifications + +commit 3424fa63a0efd11d78c3b9d1c860d4e2665f200e +Author: ne-luboff +Date: Wed Aug 30 11:05:53 2017 +0300 + + First try of ios push notification implementation + +commit 7f21eb8be5e5f1954587b72fd4ccc1e1168196f0 +Author: Namdak Tonpa +Date: Wed Aug 30 05:53:35 2017 +0300 + + new protocol + +commit 20c6ecb06ce40f538c19249add72f6583a63e71f +Author: Namdak Tonpa +Date: Wed Aug 30 05:49:08 2017 +0300 + + right place to log + +commit 7a9c4b83a7047cda22486ac5a3a7be3f4946ce51 +Author: Namdak Tonpa +Date: Wed Aug 30 05:40:01 2017 +0300 + + friend2 + +commit d8a087b13315eca579b7f7f370e5dd175f14eba8 +Author: Namdak Tonpa +Date: Wed Aug 30 04:34:13 2017 +0300 + + catch + +commit cea7615c3a369a55eff43ed108eb650cc159b774 +Merge: d414a6c 7fdf1d0 +Author: 5HT +Date: Wed Aug 30 00:50:09 2017 +0000 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 7fdf1d0ec1da0b294c9645f4655054f6418b60ab +Author: Namdak Tonpa +Date: Wed Aug 30 03:49:41 2017 +0300 + + cleanup + +commit 871b773808f26ce5260c471759ee4415c73f086c +Author: Namdak Tonpa +Date: Wed Aug 30 02:42:06 2017 +0300 + + kvs:delete has arity of two + +commit d414a6c7fdfc3f99f23cb1f7d8af127f3fc56da1 +Merge: 49b6cd7 7d6f155 +Author: 5HT +Date: Tue Aug 29 16:32:35 2017 +0000 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 7d6f155d7afd5813f2a34abf9c37b2dfbfc5bb47 +Author: cryoflamer +Date: Tue Aug 29 19:32:07 2017 +0300 + + fix auth + +commit 49b6cd7a7933c2494eff3321258fedfbaf787a8d +Merge: 7485324 0a3f647 +Author: 5HT +Date: Tue Aug 29 16:27:50 2017 +0000 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 0a3f647290ad3c1ad198923b1ad5e7cb9f921ef2 +Author: qomputer +Date: Tue Aug 29 19:27:17 2017 +0300 + + Fix for excess subscriptions + +commit 748532435ffdd468b8304253f97d7a2f15d9af63 +Merge: dc0da2d 575a984 +Author: 5HT +Date: Tue Aug 29 16:19:40 2017 +0000 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 575a98420804f48f1154c0df2e0599d480952b8a +Author: cryoflamer +Date: Tue Aug 29 19:18:56 2017 +0300 + + added roster_auth:store + +commit e741264396271a40b60e72edd6bc2b4f7a9bdfbc +Author: qomputer +Date: Tue Aug 29 18:53:22 2017 +0300 + + Fix subscriptions + +commit dc0da2d0d2ed9f17fb8736f29dcb91fb3b0bcd70 +Merge: f4bfedd e78852c +Author: 5HT +Date: Tue Aug 29 15:38:07 2017 +0000 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit e78852c52c69d8797c6397034f3f76a7be5f4c1f +Author: cryoflamer +Date: Tue Aug 29 18:37:22 2017 +0300 + + fix auth + +commit 21185a45d6874bacd2fd5ab5a7179f3112788831 +Merge: bfb67c2 037a49e +Author: ne-luboff +Date: Tue Aug 29 17:36:21 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into push_notifications + +commit bfb67c2010663f036614cd8076c05458611627a8 +Author: ne-luboff +Date: Tue Aug 29 17:36:11 2017 +0300 + + Set high priority to FCM + +commit 81f2b943239f9c9358f4028a6da9ac12618f0277 +Author: ne-luboff +Date: Tue Aug 29 17:21:15 2017 +0300 + + Update android device id for push messages + +commit f4bfeddfc728bcc89af6b83cfcf11051072b7083 +Merge: 7ba72f5 037a49e +Author: 5HT +Date: Tue Aug 29 14:21:11 2017 +0000 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 037a49ecf6d6261f63b9e82672c9ccf796421f24 +Author: Namdak Tonpa +Date: Tue Aug 29 17:21:07 2017 +0300 + + prettify logs + +commit ecd1cd5ad9128be96decd06ce1f8a2ef4762c54a +Merge: e02c5e2 0af1513 +Author: ne-luboff +Date: Tue Aug 29 17:15:51 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into push_notifications + +commit e02c5e2f6e4c1546ac65c948a990de218b1a011f +Author: ne-luboff +Date: Tue Aug 29 17:15:45 2017 +0300 + + Start Firebase Cloud Messaging implementation + +commit 7ba72f57f886abf307d9e17f724cc6e362620c86 +Merge: 69380b7 0af1513 +Author: 5HT +Date: Tue Aug 29 14:11:47 2017 +0000 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 0af15132fc425d09a4a74ee8e23adb67f7d9d43c +Author: cryoflamer +Date: Tue Aug 29 17:00:34 2017 +0300 + + fixed misc_test_roster + +commit b52d0782e52a38dc92b49179d56588b289a3aaeb +Author: cryoflamer +Date: Tue Aug 29 16:53:58 2017 +0300 + + delete old fake phone + +commit 20dec1a3ea858ead12bf3902127e1ebb05219dc2 +Author: qomputer +Date: Tue Aug 29 16:23:19 2017 +0300 + + Update subscriptions for Frendship + +commit 69380b7b46e9be2f578ae56e1908a9b3a67436ed +Author: 5HT +Date: Tue Aug 29 12:31:45 2017 +0000 + + fix crash + +commit 327013585c9c6797e70082a2d308a469e2450b92 +Author: cryoflamer +Date: Tue Aug 29 15:18:07 2017 +0300 + + replaced n2o:authenticate with roster:gen_token + +commit 7ab4617f929912c69e70198ee96af09ce9c89318 +Author: Namdak Tonpa +Date: Tue Aug 29 15:12:13 2017 +0300 + + fix login + +commit c1bc02d9331447af5a93b7af3a6c5e67b367297f +Author: Namdak Tonpa +Date: Tue Aug 29 15:08:31 2017 +0300 + + fix login + +commit 459cb989d9da6e8ad58378ae5a97c086581434a9 +Merge: f156b19 3a9edd4 +Author: 5HT +Date: Tue Aug 29 11:44:16 2017 +0000 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit f156b195949dc1cab4e800e611a55bb1055ff4f1 +Author: 5HT +Date: Tue Aug 29 11:44:12 2017 +0000 + + fix crash + +commit 3a9edd4e25442d663a6c44cbe66c3c493e076c9b +Author: Namdak Tonpa +Date: Tue Aug 29 14:26:08 2017 +0300 + + new model + +commit 6e61b125ab6e828dbe6b46eab4c25dc380b1b362 +Author: Namdak Tonpa +Date: Tue Aug 29 14:20:13 2017 +0300 + + don't send token when it's not changed, push API + +commit 9f42bed7910953227f55123298d77af3a0cc89a6 +Author: Namdak Tonpa +Date: Tue Aug 29 13:37:39 2017 +0300 + + cleanup workers before run test + +commit ae986d09fb39913159d09313772d5c1632bc2149 +Author: Namdak Tonpa +Date: Tue Aug 29 12:37:47 2017 +0300 + + return nothing from Cursor + +commit d613679633d390c5881102f7b149a4709b46dae3 +Author: Namdak Tonpa +Date: Tue Aug 29 12:35:36 2017 +0300 + + cleanup log + +commit 1395594a5ad67d4c7b327a1158bd0b5bee5cbcf9 +Author: Namdak Tonpa +Date: Tue Aug 29 12:25:34 2017 +0300 + + according to requirement we shouldn't put friend req notification in chat feed + +commit bb57b215f8be505a98558434deabeed3a000dc0f +Author: Namdak Tonpa +Date: Tue Aug 29 05:27:44 2017 +0300 + + enable logging for external connectors + +commit e16aa8d79724d34396626cdde7adca92ff8f7080 +Author: Namdak Tonpa +Date: Tue Aug 29 05:14:03 2017 +0300 + + n2o logger + +commit 2f8106eb121345a14753512563ba72e28b18bdf8 +Author: Namdak Tonpa +Date: Tue Aug 29 04:31:02 2017 +0300 + + new logging module + +commit 455b8ab43775e3cb90af6235e368a5fefdb71d39 +Author: Namdak Tonpa +Date: Tue Aug 29 04:30:28 2017 +0300 + + remove bullshit tests + +commit 218d81127db7d1b7c2975866dfe801363b9d73cb +Author: Namdak Tonpa +Date: Tue Aug 29 04:25:55 2017 +0300 + + typo + +commit c904fdbb2a7442ffa69201865bdfc53aaba3c1d8 +Author: Namdak Tonpa +Date: Tue Aug 29 04:24:54 2017 +0300 + + brand new tests + +commit ca97079640fcae9153f79fd1800d0585c5c24eda +Author: Namdak Tonpa +Date: Tue Aug 29 02:24:46 2017 +0300 + + new log framework + +commit a174456943a489f43cdb0c650631630f5faf8ec9 +Author: Namdak Tonpa +Date: Tue Aug 29 02:11:38 2017 +0300 + + macros for logging are prohibited + +commit c0559a17dd9024b6075d655828ca55504006336b +Author: Namdak Tonpa +Date: Tue Aug 29 02:10:21 2017 +0300 + + cleanup + +commit 796284acedab30447dedef27dfe3def38a80eab8 +Author: Namdak Tonpa +Date: Tue Aug 29 02:06:05 2017 +0300 + + fix tests + +commit 2b2ac5edd95b08fd5d5f2f8dd8d5c06fa9f6f525 +Author: Namdak Tonpa +Date: Tue Aug 29 01:24:17 2017 +0300 + + trying to fix tests + +commit bb99305500f35cc1dfda8dcaadbf5b0bb0a3e080 +Author: Namdak Tonpa +Date: Tue Aug 29 01:18:09 2017 +0300 + + remove bullshit code, LINEAR TESTScloc .cloc . + +commit 4654f29972915f73efbb2067244ec3a60f1a93a7 +Author: Namdak Tonpa +Date: Tue Aug 29 00:48:25 2017 +0300 + + auth2 test + +commit 0ea7b772f8ca2d53c98e108f5c0faab53db4848d +Author: Namdak Tonpa +Date: Tue Aug 29 00:24:55 2017 +0300 + + no license + +commit c96d9771d2cf3d5efc046b7277080fde889cc481 +Author: Namdak Tonpa +Date: Tue Aug 29 00:23:02 2017 +0300 + + grand removal + +commit 68f415ffaf01904caba0d6317f6bab7d1e5b3f81 +Author: Namdak Tonpa +Date: Tue Aug 29 00:19:21 2017 +0300 + + fix build + +commit 752d92381d9e0ac0fef0c898b349c391ad2d1e3a +Author: Namdak Tonpa +Date: Tue Aug 29 00:18:39 2017 +0300 + + test should be linear as simple + +commit 62092db44a17ba98f3b68a3e1127d02b83327a95 +Author: qomputer +Date: Tue Aug 29 00:11:39 2017 +0300 + + Fix test_roster() + +commit 803129a526d7582f36d94e3338f16817e3242997 +Author: Namdak Tonpa +Date: Sat Aug 26 05:28:46 2017 +0300 + + Update roster_presence.erl + +commit e934fbe2d3abee433c61b6a570552eff62761b70 +Author: Namdak Tonpa +Date: Sat Aug 26 05:00:49 2017 +0300 + + trying to keep auth2 below 10K + +commit 4640e88f49ff7024b7dfa55eaf82ac0f1a7122de +Author: Namdak Tonpa +Date: Fri Aug 25 19:37:38 2017 +0300 + + oops + +commit 4ab8ce5ec2b44b3e594b08d49b225bc24d033e47 +Author: Namdak Tonpa +Date: Fri Aug 25 19:36:48 2017 +0300 + + client_id is no longer needed + +commit 62d06bb02baebfaaa5186a0380927b9049837826 +Author: Namdak Tonpa +Date: Thu Aug 24 18:41:49 2017 +0300 + + failed cases should be caught + +commit 62acc844b212881ae7cd23ac47e15b7a77eda834 +Author: Namdak Tonpa +Date: Thu Aug 24 18:21:55 2017 +0300 + + starting review P2P friending and subscriptions + +commit 69e18dd7e6f24b81ad6bc97ae0a50511025af0b1 +Author: 5HT +Date: Thu Aug 24 13:57:12 2017 +0000 + + please read Erlang doc how to use try catch statement + +commit 2783c66c8694da676370c858eefe7503018ec37c +Author: cryoflamer +Date: Wed Aug 23 13:25:07 2017 +0300 + + added roster:gen_sid + +commit 439d2d90ec3c66f4825f3454eaccb874370c2e32 +Author: cryoflamer +Date: Tue Aug 22 18:38:59 2017 +0300 + + updated roster:gen_token + +commit 70f0c98eee1deff5d7741e631bda3a1acac7b926 +Author: cryoflamer +Date: Mon Aug 21 19:31:18 2017 +0300 + + added new gen_token + +commit daf81bc619d0b63e5851c5dd3de61516c1dc3ad2 +Author: qomputer +Date: Wed Aug 23 14:07:11 2017 +0300 + + Add status=last_msg on cursor request + +commit 52a36a559542b26f3fff2b18bb6ae1ee83265f38 +Author: ne-luboff +Date: Wed Aug 23 12:52:27 2017 +0300 + + Small Refactoring auth2 login + +commit c1b028b528b093613442ae05addd037696387f01 +Author: ne-luboff +Date: Wed Aug 23 12:23:55 2017 +0300 + + Update response for AUTH undefined + +commit e937f7b2ff74dd18dd559da95761e8ce0e3e6057 +Author: Anton Makarov +Date: Tue Aug 22 21:05:23 2017 +0300 + + Fixed Bug + +commit c70a253e86caced7d5c5d935dac9c2fcae068253 +Merge: 448bcf0 33379a0 +Author: Namdak Tonpa +Date: Tue Aug 22 19:40:59 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 448bcf050e5e917c6379f770b781fbae8c14a98d +Author: Namdak Tonpa +Date: Tue Aug 22 19:40:48 2017 +0300 + + Tuple [] -> Tuple nil + +commit 33379a0c30931cf15987ddedbf21b4a9bd2a3f49 +Author: qomputer +Date: Tue Aug 22 18:41:56 2017 +0300 + + Update purge_user + +commit 76c9abb812cc5521fbecd589fc0cdf748a943fe1 +Author: ne-luboff +Date: Tue Aug 22 18:11:53 2017 +0300 + + Small refactoring + +commit be313d8b2a36c237f0b7235267c561fcc8eae911 +Author: ne-luboff +Date: Tue Aug 22 18:06:33 2017 +0300 + + Add case for resend sms with expired attempts + +commit c869f60c9532ab94c2c14782af4acea85b71eb0c +Author: Namdak Tonpa +Date: Tue Aug 22 17:00:55 2017 +0300 + + disable pars_trans + +commit 07a285b1aedb135dc56bf8659b3fc5d36c71c070 +Author: Namdak Tonpa +Date: Tue Aug 22 17:00:39 2017 +0300 + + fix build + +commit 55845c2196ea5d7d3c6d63b1a2e5e485d70c5a02 +Merge: ff7cfb6 ddba85a +Author: Namdak Tonpa +Date: Tue Aug 22 16:48:36 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit ddba85ad64a0676d55efe33f41de1654bff3c3f1 +Author: Anton Makarov +Date: Tue Aug 22 16:48:04 2017 +0300 + + Disable Encoder + +commit ff7cfb6bcebb7cdff1bc67d874822d6fb4e6005b +Author: Namdak Tonpa +Date: Tue Aug 22 16:46:00 2017 +0300 + + p2p + +commit 7f7475f255f7c07851291f93142eb69c3ec2ffe2 +Author: ne-luboff +Date: Tue Aug 22 16:22:47 2017 +0300 + + Add important note + +commit 32dc43bc9ca5678e3bfd34c0eefb81313f1a2e71 +Merge: 82f9f81 11a712f +Author: ne-luboff +Date: Tue Aug 22 16:19:34 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into auth2 + +commit 82f9f8179d93d2df188f27e28ac2cc33f62365f1 +Author: ne-luboff +Date: Tue Aug 22 16:19:22 2017 +0300 + + Update login logic (add dev_key, user_id and phone values to better user authentication) + +commit 11a712f60b3852e1783a61e80b61630beb993b93 +Author: Namdak Tonpa +Date: Tue Aug 22 15:55:32 2017 +0300 + + Desc updated + +commit 1807f6f127e3dd91b61770195f026ad7d5515613 +Author: ne-luboff +Date: Tue Aug 22 15:52:19 2017 +0300 + + Add extra check for verify by JWT (not empty jwt) + +commit 4ea2d689f6ebb4fe8c1d31c28acaace627ae8a94 +Author: ne-luboff +Date: Tue Aug 22 15:51:09 2017 +0300 + + Delete excess code + +commit 4409142a82b40466e70ff7d9b234656b929e0e84 +Author: ne-luboff +Date: Tue Aug 22 15:43:10 2017 +0300 + + Add extra check for verify by sms (not empty sms) + +commit e8548f287dc348fb27cd409eb8b59962ce9a72a7 +Author: ne-luboff +Date: Tue Aug 22 14:30:34 2017 +0300 + + Change login cases order + +commit d72927d8e00250c56b76d68ba8f25c7aa98c1478 +Author: ne-luboff +Date: Tue Aug 22 12:28:43 2017 +0300 + + Delete TODO comments from auth-2 + +commit 99a0f818558d3a313049b8151819c28f32a9ba34 +Author: qomputer +Date: Mon Aug 21 18:31:49 2017 +0300 + + Fix sending of cursor + +commit 4a062aa752bd5c7d44ff109cc4fb4152cd1de0b1 +Author: qomputer +Date: Mon Aug 21 16:47:28 2017 +0300 + + Add sending of cursor to conterparty + +commit baf07cb39b7b8bf8e0800c66e6cea64dd5ba9dc7 +Author: qomputer +Date: Mon Aug 21 15:34:29 2017 +0300 + + Fix contact after cursor receiving + +commit 7649e6ab2998bc8c3e00b21240784fb22843c83e +Author: qomputer +Date: Mon Aug 21 14:57:14 2017 +0300 + + Fix unread in contact + +commit be76a660073fdf2d3eb187387533c878e19984a8 +Author: qomputer +Date: Mon Aug 21 14:41:20 2017 +0300 + + Add sending of contact with new unread + +commit a1876555de281e8f11977a66679bc5f2d63d192f +Author: qomputer +Date: Sat Aug 19 19:48:44 2017 +0300 + + Fix contact sending for offline + +commit b9dc7c2f2c9bb415538f77cf28e718003da04024 +Author: qomputer +Date: Sat Aug 19 19:18:01 2017 +0300 + + Fix subscribe on api/phone + +commit 95064d5bac67c64cd7812fe1f823d69ae90cae68 +Author: qomputer +Date: Sat Aug 19 17:34:07 2017 +0300 + + Fix sending messages on connect + +commit 94eea64f66b12d0f396dd0617051c6d7344414d2 +Author: qomputer +Date: Sat Aug 19 16:38:48 2017 +0300 + + Update Desc and fix auth2 + +commit 4db7a5be8ee5bcb37f8f47216d192fe6e606a852 +Author: qomputer +Date: Fri Aug 18 19:28:08 2017 +0300 + + Fix for undefined chain.unread + +commit 46fb4fbdb732d7eeae1d930c16ec0ca71fd15523 +Author: Namdak Tonpa +Date: Fri Aug 18 16:29:55 2017 +0300 + + double cursor (per counterparty) + +commit e30dd71b796d75156a0e09608aac3850cca850c2 +Author: qomputer +Date: Fri Aug 18 14:22:57 2017 +0300 + + Update Auth and roster_test + +commit 79f1413fb4e4b4cbf737d90d6f951f337b22e522 +Author: ne-luboff +Date: Thu Aug 17 17:50:35 2017 +0300 + + Set error on not verified session on login + +commit d69b0feb3a1032730b3ca492b5a8ef9858174592 +Author: ne-luboff +Date: Thu Aug 17 14:20:04 2017 +0300 + + Add Profile creation logic in roster_auth2 file (instead of request to another module). + +commit 6de403f00ff59d4727f46d22ce98c4caab02c604 +Author: ne-luboff +Date: Thu Aug 17 14:12:13 2017 +0300 + + Rename telesign_auto_verify_get_status() function to check_jwt() + +commit 07ad43a683ceffe2fe73f28476c00b5dfb69267b +Author: ne-luboff +Date: Thu Aug 17 13:55:40 2017 +0300 + + Change error to invalid_jwt_code in verify by JWT. + Delete debug requests to vnode + +commit 36e71c2b8ce220997feef1d4f8deda82bd372495 +Author: qomputer +Date: Wed Aug 16 18:27:22 2017 +0300 + + Update on_connect amd on_disconnect + +commit 8533db6b95a0b28b7b14fe414b70949034ae05a8 +Author: Namdak Tonpa +Date: Wed Aug 16 16:34:04 2017 +0300 + + Correct. emqttd_cm usage is abandoned in roster app + +commit 89efb1918eff5c212c81cf0c997f61a7831fc4e4 +Author: Namdak Tonpa +Date: Wed Aug 16 16:33:40 2017 +0300 + + Correct. emqttd_cm usage is abandoned in roster app + +commit 4d8f626b123e5541081e11ace0145bd00e727208 +Author: ne-luboff +Date: Wed Aug 16 15:16:16 2017 +0300 + + Add verify JWT + +commit a8939312a9511a1baa8233b2470d359b0a7cd6d4 +Author: ne-luboff +Date: Wed Aug 16 15:09:32 2017 +0300 + + Start JWT verify implementation + +commit a00d49baa585aaf62f027eaaa91841c7d8510005 +Author: ne-luboff +Date: Wed Aug 16 13:41:15 2017 +0300 + + Add authomatically Person and Profile sending on login + +commit b3fda3cbec641d116c6df60952f4a124d7ce2fe5 +Merge: 2b5821d 5d87e36 +Author: ne-luboff +Date: Wed Aug 16 13:23:00 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into auth2 + +commit 2b5821db863a804d4dc8ea3f2eb74299082a7282 +Author: ne-luboff +Date: Wed Aug 16 13:22:55 2017 +0300 + + Start implementation of subscription logic on login + +commit 5d87e36b9a1146ec8cc82c94f9f89e3b0a7e6c8b +Author: Namdak Tonpa +Date: Tue Aug 15 23:04:02 2017 +0300 + + ok2/error2 models + +commit 0139531de989851f764d35fb28d9436c92deead6 +Merge: 3ea5511 f688993 +Author: Namdak Tonpa +Date: Tue Aug 15 22:56:31 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 3ea5511bafbd8a422ea523f0aca3a2ce906ef989 +Author: Namdak Tonpa +Date: Tue Aug 15 22:56:18 2017 +0300 + + model + +commit f6889931906be03cd4b431fa4ad99e1ae6ab851c +Author: qomputer +Date: Tue Aug 15 22:25:34 2017 +0300 + + Fix status + +commit 7ed50ebc356c3fc44c333087ad7e129cbc585f53 +Author: Namdak Tonpa +Date: Tue Aug 15 22:15:29 2017 +0300 + + cursor returns ok2 + +commit d2de9e73108dad58ba0884398bfcbe826e005ee4 +Author: Namdak Tonpa +Date: Tue Aug 15 22:12:09 2017 +0300 + + fix build + +commit cffdb932313b0ed2fff1aede52ff0861e27f0d25 +Merge: 04c57be f490463 +Author: Namdak Tonpa +Date: Tue Aug 15 22:11:54 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 04c57be2db65819bcb4fcef135024f8ff1fd5e8e +Author: Namdak Tonpa +Date: Tue Aug 15 22:11:44 2017 +0300 + + model + +commit f4904634e302957392c177335b233f02a77f5102 +Author: qomputer +Date: Tue Aug 15 21:26:25 2017 +0300 + + Fix sending of message for autorization + +commit fe1b13d7274611e781622b66aa36d94baef4ee5b +Author: qomputer +Date: Tue Aug 15 20:57:18 2017 +0300 + + Fix initial subscriptions + +commit 454147d9fcea49a31944d48ddafbed1ebd61ecef +Author: qomputer +Date: Tue Aug 15 19:48:25 2017 +0300 + + Fix roster_auth + +commit 5c46b882ce114dabbb7baba01255a98bd232c3eb +Author: ne-luboff +Date: Tue Aug 15 18:57:52 2017 +0300 + + Replaced max attempts int value with var + +commit 86e71f51ec258481752de6d1caa3f5f14d1628aa +Author: ne-luboff +Date: Tue Aug 15 18:55:26 2017 +0300 + + Add important TODO + +commit 8e63e8a4a2f6b14070554986c95f76867457c98b +Author: Namdak Tonpa +Date: Tue Aug 15 18:52:53 2017 +0300 + + fix unread messages + +commit c9e54b56f0afbeab252515b42cba664e9afe24c3 +Author: Namdak Tonpa +Date: Tue Aug 15 18:50:34 2017 +0300 + + kvs unread + +commit 64e5f57a096a5ba166ff06285d02fef13e33f6d1 +Author: ne-luboff +Date: Tue Aug 15 18:46:19 2017 +0300 + + Add user objects creation to verify by sms + +commit ca7fb8bc6467dc4896ab47d62218a3feb7e49337 +Author: ne-luboff +Date: Tue Aug 15 17:45:17 2017 +0300 + + Add version dependency + +commit 296b3564cf18c624d74e79265efb493cb063f588 +Author: ne-luboff +Date: Tue Aug 15 14:00:21 2017 +0300 + + Update Auth Verify via SMS + +commit 279906c99d6af24bab6297c436c52acbd860791a +Author: ne-luboff +Date: Tue Aug 15 13:36:21 2017 +0300 + + Login method + +commit 40c3e98e6d7a98748160136dba885a920cbaae9f +Author: ne-luboff +Date: Tue Aug 15 13:30:34 2017 +0300 + + Add comment about logout method + +commit 605b4c954676e40de709d8b7d0046d4d07c9cde8 +Author: ne-luboff +Date: Tue Aug 15 12:34:59 2017 +0300 + + Add voice call in Auth2 + +commit f938ba913b814bce032f224c21da543fce04c6bf +Author: ne-luboff +Date: Tue Aug 15 11:51:54 2017 +0300 + + Add error for invalid input data + +commit b57765914e5acd1c8f1ad191c10f2181ae7994a9 +Author: ne-luboff +Date: Tue Aug 15 11:19:31 2017 +0300 + + Delete helper. Return Auth Reg (via sms) to Max's implementation + +commit 77d46bed195557e3ca482854d821e8bdd3287b32 +Merge: c7f7a7d 5242247 +Author: ne-luboff +Date: Tue Aug 15 11:10:38 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into auth2 + +commit c7f7a7dd518d7c56756012d13f284e6605dcbb06 +Author: ne-luboff +Date: Mon Aug 14 23:04:29 2017 +0300 + + Auth2 Reg Method (via SMS). Auth2 Verify (via SMS) + +commit 5242247203010f4e7cf2e0c2f58abdd126d9e31c +Author: qomputer +Date: Mon Aug 14 22:14:03 2017 +0300 + + Add sending of changed contact to p2p/phone_id + +commit f7b0c1ba76f34f985addcd925e30ffcd31a0dfed +Author: qomputer +Date: Mon Aug 14 16:54:48 2017 +0300 + + Add test for logout + +commit 65f704824dc488a60f1c25c0ff7af28732512f37 +Author: ne-luboff +Date: Mon Aug 14 15:21:06 2017 +0300 + + Replace io:format with ?LOG + +commit eb2a7bd28150294c35cd7f92c203b8fdeb255769 +Merge: 59a4401 0427fe0 +Author: ne-luboff +Date: Mon Aug 14 13:37:38 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into auth2 + +commit 59a44011cb7b1e9a7131a9a586c58ec68885bf05 +Author: ne-luboff +Date: Mon Aug 14 13:37:23 2017 +0300 + + Update telesign_api. Create roster_helper.erl + +commit 0427fe04254e543f588e8cb014eca41eff48e0cd +Author: qomputer +Date: Mon Aug 14 12:42:50 2017 +0300 + + Update the messaging of self with yourself + +commit f07ebd917776a2687f71779ba66d53c57b7225b5 +Merge: c6787f0 b35ae56 +Author: ne-luboff +Date: Mon Aug 14 12:05:43 2017 +0300 + + Fix merge conflict in roster.erl + +commit b35ae56f4f599da737c77fe7194d16b1e165a393 +Author: qomputer +Date: Fri Aug 11 21:24:37 2017 +0300 + + Fix status on confirm + +commit f3e948dd80e88bb1e9f61009cd8df4a493037a59 +Author: qomputer +Date: Fri Aug 11 20:29:52 2017 +0300 + + Fix p2p subscribe + +commit 2f7de22080cd33abcdc0a66faa4aab0e66a8aeea +Author: qomputer +Date: Fri Aug 11 20:13:06 2017 +0300 + + Update logout + +commit 29028a4a279281f94e039d65e587d3801114d7ef +Author: qomputer +Date: Fri Aug 11 19:26:47 2017 +0300 + + Fix request for Confirm + +commit c6787f00649770d39e2eeb16607e9df3ca5ceaef +Merge: 72d2a4c e6d650e +Author: ne-luboff +Date: Fri Aug 11 18:42:06 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit 72d2a4cc704932952837c874e9574e1f85d439ea +Author: ne-luboff +Date: Fri Aug 11 18:42:01 2017 +0300 + + Small refactoring + +commit e6d650e0c61e7fa160ddbf0692d85c8b379afb63 +Author: qomputer +Date: Fri Aug 11 18:23:00 2017 +0300 + + Fix auth when user_id=[] + +commit 0c659d6f2d8277f0b32a7e2db6ae321e60187628 +Author: qomputer +Date: Fri Aug 11 18:04:56 2017 +0300 + + Fix staus on confirm + +commit a064aa3d5342715f20a273186ddd8c178ed8b0a9 +Author: qomputer +Date: Fri Aug 11 17:30:25 2017 +0300 + + Fix staus on connect + +commit 254d13e0f6ad36d122ba1bf99d4f9d5f177930ef +Author: qomputer +Date: Fri Aug 11 17:11:32 2017 +0300 + + Fix staus on disconnect + +commit 4c83d8020a1a949b88a154c91b9541eb145b4bd0 +Merge: f25d81b df5d449 +Author: ne-luboff +Date: Fri Aug 11 17:04:19 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit f25d81bedd68012227163f37c9ac190ba60d6353 +Author: ne-luboff +Date: Fri Aug 11 17:04:12 2017 +0300 + + Add more logs to auth. + Replace io:lib with log. + Start reauth test + +commit df5d4491af8bfa0a78497b1e3277aa37bbd08434 +Author: qomputer +Date: Fri Aug 11 16:41:36 2017 +0300 + + Update presences + +commit e4e0d96faf52bb1bde030c0afed8aa2c73096f6b +Author: qomputer +Date: Fri Aug 11 12:52:03 2017 +0300 + + Fix replay for set Roster + +commit c08da06d4c88fa94429a586b89b201d5162d9db1 +Author: ne-luboff +Date: Fri Aug 11 12:25:35 2017 +0300 + + Replace io:format with LOG in MEssage proto + +commit e22ad48b53e36f02bc6f0318d691c832b12be53f +Author: ne-luboff +Date: Fri Aug 11 12:07:32 2017 +0300 + + Update SET roster response + +commit c148758ee1e96b5db063771531a67f79fd549833 +Author: ne-luboff +Date: Fri Aug 11 12:05:07 2017 +0300 + + Update SET roster response + +commit 1e2e3d36f742560a1ef84d5a4527e881b5dbf641 +Author: 5HT +Date: Fri Aug 11 03:20:04 2017 +0000 + + acl moved to roster + +commit 8b28f34b7b03ee2dace754983c8b10d23b3d3966 +Author: Namdak Tonpa +Date: Fri Aug 11 05:59:04 2017 +0300 + + logout + +commit 337cd649780fd3093deb3599c876c12abece6d20 +Author: Namdak Tonpa +Date: Fri Aug 11 05:38:44 2017 +0300 + + logout + +commit f9b428003fbb2a2a86ac076915df0130725f7cab +Author: Namdak Tonpa +Date: Fri Aug 11 05:28:13 2017 +0300 + + resend + +commit 0f905f41caabc3b07101bb4e90e533b1f2535ed8 +Author: Namdak Tonpa +Date: Fri Aug 11 05:14:59 2017 +0300 + + resend + +commit 45674fa70e2f721cdd25a36c7d17b39096ec9401 +Author: Namdak Tonpa +Date: Fri Aug 11 05:13:56 2017 +0300 + + resend + +commit 926678442397324e0fada0269eb70eb3a74eef09 +Author: Namdak Tonpa +Date: Fri Aug 11 04:47:02 2017 +0300 + + minimize reg clauses fro auth2 + +commit 8a26052f8c995f2a8f8a8060b70efa92d9fdb507 +Author: Namdak Tonpa +Date: Fri Aug 11 04:43:49 2017 +0300 + + minimize reg clauses fro auth2 + +commit 1a659e5f54e1ff71c3bbe3ed57cda668cfb09b0b +Author: Namdak Tonpa +Date: Fri Aug 11 04:40:17 2017 +0300 + + async SMS sending in auth2 + +commit 588c9c297e8c7ad7bd2d9a4c2af01c9d96511f84 +Author: Namdak Tonpa +Date: Fri Aug 11 04:36:00 2017 +0300 + + remove cycling dependency n2o <-> roster + +commit 441ef2f13c42a014d515b3b34f330e77047459c8 +Author: Namdak Tonpa +Date: Fri Aug 11 04:27:14 2017 +0300 + + minimize reg clauses fro auth2 + +commit 2aef3ec0b44abe5058c7c11fb6b29aded02d71cb +Author: Namdak Tonpa +Date: Fri Aug 11 04:15:07 2017 +0300 + + SMS and JWT sending + +commit 27e5e6b33921d97714d723ee96c7a9237feffeec +Author: Namdak Tonpa +Date: Fri Aug 11 02:48:24 2017 +0300 + + move presence broadcast to presence module + +commit a6061c8b52305fa56023d6dd0ff00076471e3fad +Author: Namdak Tonpa +Date: Fri Aug 11 02:41:06 2017 +0300 + + freeze + +commit 746962b1e70e1d68d1813d2a61c43a860f297a5a +Author: Namdak Tonpa +Date: Fri Aug 11 02:37:26 2017 +0300 + + freeze + +commit 534db0eec9054f4825eff2ba5316f6376041e527 +Author: Namdak Tonpa +Date: Fri Aug 11 02:24:20 2017 +0300 + + auth2 skeleton + +commit 8f309e3308b9d7d9aa61f2be47ca2a6197531d67 +Author: Namdak Tonpa +Date: Fri Aug 11 01:52:45 2017 +0300 + + auth2 skeleton + +commit 83317b2d9a62c84d189354540a3b14d995eb3b5a +Author: Namdak Tonpa +Date: Fri Aug 11 01:52:02 2017 +0300 + + auth2 skeleton + +commit 74bcc7d40f2668aa00f5a055896701ea8a0d4ca9 +Author: Namdak Tonpa +Date: Fri Aug 11 01:51:30 2017 +0300 + + auth2 skeleton + +commit db04e723a87acbc04ada7d270512a912207e563b +Author: Namdak Tonpa +Date: Fri Aug 11 01:49:50 2017 +0300 + + auth2 skeleton + +commit 977d62aa7b3091b22c7042311aa6f3516548ae95 +Author: Namdak Tonpa +Date: Fri Aug 11 01:48:20 2017 +0300 + + auth2 skeleton + +commit 19630db57d64d56dabcc436ad3351421417284b4 +Author: Namdak Tonpa +Date: Fri Aug 11 01:42:37 2017 +0300 + + cases structuring + +commit e162c55b4a381099f989bec794263437654fb905 +Author: Namdak Tonpa +Date: Fri Aug 11 01:41:39 2017 +0300 + + cases structuring + +commit 9ecca4205455ba8d7fbac79c7fe3a020d0382ff6 +Author: Namdak Tonpa +Date: Fri Aug 11 01:20:05 2017 +0300 + + auth2 skeleton for Team Review + +commit e75d676ca67a130187553dd9fe70df7525541c8f +Author: 5HT +Date: Thu Aug 10 19:09:38 2017 +0000 + + ATTENTION: revert this if any problems + +commit 42f54b017e76a5ce89df519f04a66c561f5b6b30 +Author: 5HT +Date: Thu Aug 10 18:59:52 2017 +0000 + + night + +commit b2f51baf270d1bdece9e6e9ebd148ad1386aaccc +Author: qomputer +Date: Thu Aug 10 19:43:19 2017 +0300 + + Fix on_auth_post + +commit 79f75365e6dad47d7c372b2a132a63120e000518 +Author: Namdak Tonpa +Date: Thu Aug 10 19:28:34 2017 +0300 + + fix VoxLogin + +commit d50c464f2fc9c664c10b296ae3fccb4902581f28 +Author: qomputer +Date: Thu Aug 10 19:03:05 2017 +0300 + + Fix on_auth_post + +commit 74ccffe33a9cf8cfb6a8984be48b4528c9145b31 +Author: ne-luboff +Date: Thu Aug 10 16:10:13 2017 +0300 + + Delete debyg vox test + +commit 882203e0c80b3dabdae4d4ee42103a1bcb32e1b4 +Merge: 17c2365 1834a3c +Author: ne-luboff +Date: Thu Aug 10 16:08:52 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voximplant_integration + +commit 1834a3c222c858aee294d44cab5d2b16636e3369 +Author: qomputer +Date: Thu Aug 10 15:51:25 2017 +0300 + + Fix set Roster + +commit 17c23658f6c5a667460df09eaaf12ecb36a46a75 +Author: ne-luboff +Date: Thu Aug 10 15:25:46 2017 +0300 + + Test function for vox user login + +commit 3415391f5e09a14ef837f6597fa3668087952de6 +Author: qomputer +Date: Thu Aug 10 14:24:41 2017 +0300 + + Fix add_contact + +commit 889c2fee2c01c4393efc05f91504bf46ab673d3b +Author: qomputer +Date: Thu Aug 10 14:14:30 2017 +0300 + + Fix for value person_id + +commit 5b842b62c4694288b66e2a080278c323e20aa065 +Author: qomputer +Date: Thu Aug 10 13:28:05 2017 +0300 + + Fix on_auth + +commit 213a9364c94416f3a17fa718331103bcc5552a6d +Author: qomputer +Date: Thu Aug 10 13:13:39 2017 +0300 + + Add fake_vox and fix p2p subscribe + +commit a6402c6f36c5a1620be9eae57430a8ec877cfb25 +Author: Namdak Tonpa +Date: Wed Aug 9 20:11:51 2017 +0300 + + Update roster_message.erl + +commit 0113b13686ebaeed3471ce82699b544102f8431d +Author: ne-luboff +Date: Wed Aug 9 19:13:54 2017 +0300 + + Remove debug code + +commit 7514303f9d2752e2f414ae0dc074eb1672086174 +Author: ne-luboff +Date: Wed Aug 9 19:13:07 2017 +0300 + + Replace io:format with LOG " + +commit a1f7fc5f8f83ab50791bf571172e80255386224a +Author: ne-luboff +Date: Wed Aug 9 19:11:04 2017 +0300 + + Remove debug code + +commit f3ea07c98cfaa689b2fb0e30c0eaa1446a93e6f1 +Author: ne-luboff +Date: Wed Aug 9 19:10:12 2017 +0300 + + Remove debug function + +commit 9d6b3814c0da9030ba6da43a2a19d55a2e0faa5d +Author: ne-luboff +Date: Wed Aug 9 19:09:13 2017 +0300 + + Merge new_roster function with master + +commit 3e3caee38ad8eea639a3668295014c980d2a365f +Author: ne-luboff +Date: Wed Aug 9 19:03:09 2017 +0300 + + Replace io:format with ?LOG + +commit 973f66f31b9dda96cfcb8e81a12fb45f9d4f0bf4 +Author: ne-luboff +Date: Wed Aug 9 18:59:28 2017 +0300 + + Delete debug logs + +commit 30e55f505741da1623681e25b8d22294524c840a +Merge: 5ba8ce9 5a4a18d +Author: ne-luboff +Date: Wed Aug 9 18:53:09 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voximplant_integration + +commit 5a4a18d71053423393a5f9080098ed7869e2b5da +Author: qomputer +Date: Wed Aug 9 18:42:08 2017 +0300 + + Fix fake account + +commit 8fc77244530128f1e83972420d29b40076606147 +Author: Namdak Tonpa +Date: Wed Aug 9 18:15:27 2017 +0300 + + person_id in self + +commit 6ca6af4db70f69a69a843c2cccf587041bb0bc15 +Author: Namdak Tonpa +Date: Wed Aug 9 18:09:41 2017 +0300 + + vox + +commit d683ff6907b6072c86a40e10bd2cd12aab9dfe1f +Author: Namdak Tonpa +Date: Wed Aug 9 18:04:33 2017 +0300 + + fix roster + +commit 91934d4d7cb6db2c283bbae6f0250608eff07601 +Merge: 0af3889 a16a5fe +Author: Namdak Tonpa +Date: Wed Aug 9 18:00:35 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 0af3889c1a44156bc33ac2025bbc1adee55183ea +Author: Namdak Tonpa +Date: Wed Aug 9 18:00:31 2017 +0300 + + roster + +commit a16a5fef7fede7318eb483573452886fafb57f90 +Author: 5HT +Date: Wed Aug 9 15:00:02 2017 +0000 + + io:format + +commit 81320eab2d06be886e02bbb2b04e7654f9c33000 +Author: Namdak Tonpa +Date: Wed Aug 9 17:22:25 2017 +0300 + + vox in contact + +commit 0ce2f22977e4870db351c84c23679a1ad6e96733 +Merge: bf345f8 6c6ade0 +Author: Namdak Tonpa +Date: Wed Aug 9 17:02:52 2017 +0300 + + roster fix + +commit 6c6ade0df3075d6841d864c24c9ce43a75548ec6 +Author: 5HT +Date: Wed Aug 9 14:02:30 2017 +0000 + + fix roster + +commit bf345f8c6258617d438f3aeab7744d8386ffd168 +Author: Namdak Tonpa +Date: Wed Aug 9 16:54:00 2017 +0300 + + fix crash + +commit 81f5e2d1e2cd3d3f3440f4410d795e2c28e84455 +Author: Namdak Tonpa +Date: Wed Aug 9 16:50:14 2017 +0300 + + Person + +commit 4da9a0100d7148d4e763ce1452726b8ec19ba88b +Author: 5HT +Date: Wed Aug 9 13:40:03 2017 +0000 + + Person + +commit 5ba8ce98fb97891df1962c713c30c851d1d593c4 +Author: ne-luboff +Date: Wed Aug 9 16:27:25 2017 +0300 + + Fix merge conflict + +commit 5e1899e0af9f8a686e32f39c8c22c87b928b7c53 +Author: Namdak Tonpa +Date: Wed Aug 9 16:24:28 2017 +0300 + + person topic + +commit 3661e848a56d3f96dc2df191726bbdaa83630bd7 +Author: ne-luboff +Date: Wed Aug 9 16:22:06 2017 +0300 + + Fix typo + +commit 47f9adfc01d0514dfede05dcc1cd5cc3ce8c2f3f +Merge: 5007506 9f1df17 +Author: ne-luboff +Date: Wed Aug 9 16:20:38 2017 +0300 + + Fix merge conflict + +commit 9f1df1707d7c5f8401d41b19f299748a98a8d171 +Merge: 0697b9c c934479 +Author: Namdak Tonpa +Date: Wed Aug 9 16:18:42 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 0697b9cbd5362d2eda3261adf38a6a6d02d39086 +Author: Namdak Tonpa +Date: Wed Aug 9 16:18:31 2017 +0300 + + vox + +commit c934479176e1b6b5d6d4fb84202e86a0900209b9 +Author: qomputer +Date: Wed Aug 9 15:57:34 2017 +0300 + + Fix roster_auth + +commit ea3b2eeb572c0a9aefc819b31f886d49cf1424f6 +Author: qomputer +Date: Wed Aug 9 15:53:40 2017 +0300 + + Fix to save confirm-messages + +commit 5007506ea5616a86c3612cfdadbd5e6374fc87f9 +Merge: 264534a fd4950e +Author: ne-luboff +Date: Wed Aug 9 15:43:12 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voximplant_integration + +commit 264534ad678b29ee62146210ad5ad0bda51e97b6 +Author: ne-luboff +Date: Wed Aug 9 15:42:10 2017 +0300 + + Debug. Work with spawned + +commit fd4950e86e0058e8fd590b4fbc45d0b874f1b3a5 +Author: qomputer +Date: Wed Aug 9 15:37:37 2017 +0300 + + Fix supscribe p2p in roster_auth + +commit 2e064c0db01c7c7ecb66ce4e15d29c0e388087de +Author: 5HT +Date: Wed Aug 9 12:16:33 2017 +0000 + + search srach fix + +commit 00c8c3d607e04ab1a813444ec5b3490c2358c190 +Author: Namdak Tonpa +Date: Wed Aug 9 15:13:45 2017 +0300 + + cleanup + +commit b0577f0f3a7b84d4ad4b5385428324cace6efe3e +Merge: a773f88 9b2a38f +Author: 5HT +Date: Wed Aug 9 12:12:33 2017 +0000 + + auth + +commit a773f88bf5463ab5f9f7f1f84c9be1e10ca4868e +Author: 5HT +Date: Wed Aug 9 12:11:52 2017 +0000 + + message + +commit 9b2a38f5cf818fa0da0e783728626a2b7102adc4 +Author: Namdak Tonpa +Date: Wed Aug 9 15:11:02 2017 +0300 + + cleanup + +commit 421f55a8e11ae33bf301d3ad3546ebcda58b9ae2 +Author: 5HT +Date: Wed Aug 9 11:32:41 2017 +0000 + + message + +commit 21e2619b8c0e5141d10df6658b8e27b883a8697f +Author: qomputer +Date: Wed Aug 9 14:15:55 2017 +0300 + + Fix statuses for friend + +commit 043ca5d8e1c5cd9a725ff14fb0f0152e9a9b3d38 +Author: qomputer +Date: Wed Aug 9 14:05:04 2017 +0300 + + Remove statuses patch and set + +commit 11c454cb61c094745c9b21719787ac14ee36028c +Merge: 3a35f4b 8ac9915 +Author: ne-luboff +Date: Wed Aug 9 13:51:17 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voximplant_integration + +commit 3a35f4b06d9e7193900fa8e7dc0670610ac05f5e +Author: ne-luboff +Date: Wed Aug 9 13:50:58 2017 +0300 + + Debug code + +commit 8ac99155236111354a21066a54309d94e8690af5 +Author: Namdak Tonpa +Date: Wed Aug 9 12:41:26 2017 +0300 + + message + +commit a4893840d925d1b8bb3d0c5fcfcc487bfac5b265 +Author: Namdak Tonpa +Date: Wed Aug 9 12:36:26 2017 +0300 + + back + +commit 6351fba30c6dd6e851121744ab1298b120231f7c +Author: Namdak Tonpa +Date: Wed Aug 9 12:30:29 2017 +0300 + + new Message protocol + +commit 3360e8905376964cc64d200c3b1322f06c0d0bf3 +Merge: d58df28 24e94f0 +Author: ne-luboff +Date: Wed Aug 9 11:58:38 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voximplant_integration + +commit 24e94f059216f710bbfc97e71ef127ebc5ad6547 +Author: Namdak Tonpa +Date: Wed Aug 9 11:58:23 2017 +0300 + + presence + +commit d58df28e1787b7745e80d0cc7b25ddaf88aaa936 +Merge: 4c81cdf b150ebb +Author: ne-luboff +Date: Wed Aug 9 11:54:21 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voximplant_integration + +commit b150ebb33050df1bc07e77af48232ed6ee33894e +Author: Namdak Tonpa +Date: Wed Aug 9 11:41:19 2017 +0300 + + crash fix + +commit d636d76beeba9495c59b18f34d13b8a24612f394 +Author: qomputer +Date: Wed Aug 9 11:36:32 2017 +0300 + + Fix subscribe_p2p + +commit 754a8ae4725806e9095e2f08c55db51d8216e85d +Author: Namdak Tonpa +Date: Wed Aug 9 02:39:29 2017 +0300 + + fix History model for iOS + +commit 96ab4481904e8f9d4b98d186e5ee86b0ef4a23f0 +Author: Namdak Tonpa +Date: Wed Aug 9 01:42:08 2017 +0300 + + don't use bullshit names like , /cc @cryoflamer NO MORE THAT ONE UNDERSCORE PER ATOM + +commit bc772031a6530162215b67a9ffc5f592371ca70a +Author: qomputer +Date: Wed Aug 9 01:32:27 2017 +0300 + + Update subscribe_p2p + +commit fc5bb3740b235370ab0567545c0a73c93c914c4f +Author: Namdak Tonpa +Date: Wed Aug 9 00:20:49 2017 +0300 + + retain + +commit c3c6197f253445fe7020f08858078673506783a0 +Author: Namdak Tonpa +Date: Tue Aug 8 23:56:42 2017 +0300 + + fix crasg + +commit 1e6015817bd0f85c8ffdbe23232fd580203cf31e +Author: Namdak Tonpa +Date: Tue Aug 8 21:50:37 2017 +0300 + + pretty + +commit ae146a22d0d5d019bd0f6b9120bbb159188083ef +Author: Namdak Tonpa +Date: Tue Aug 8 21:48:49 2017 +0300 + + fix double profile on init + +commit 2b8f2e28511be765f8ae72882a268d83165cd49e +Author: Namdak Tonpa +Date: Tue Aug 8 21:43:03 2017 +0300 + + profile on init should be sent once + +commit 4c81cdf4e829983ce029b150f39d3bb2aad04606 +Author: ne-luboff +Date: Tue Aug 8 21:33:33 2017 +0300 + + Add TODO for refactoring + +commit e2d864e8dab1b634dabe4be7f13d354aa9097bba +Author: Namdak Tonpa +Date: Tue Aug 8 21:18:12 2017 +0300 + + last message + +commit 61b2eb4fb5f57b2ea23ef33a4bea2a7df2df91e0 +Author: Namdak Tonpa +Date: Tue Aug 8 20:55:09 2017 +0300 + + set mime type for system message about friending + +commit 8a58a39dafc983b5b337a840d492026b6b799cd1 +Merge: 09a5b23 63e38f8 +Author: Namdak Tonpa +Date: Tue Aug 8 20:49:22 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 09a5b232e013ffeaeec04f5b11a9ef88c07ec2bd +Author: Namdak Tonpa +Date: Tue Aug 8 20:49:15 2017 +0300 + + remove comments + +commit 63e38f83471ff3252d1b56fe21a3e06a935035af +Merge: de5c43a 4998943 +Author: ne-luboff +Date: Tue Aug 8 20:27:25 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voximplant_integration + +commit de5c43a1aff819dc822aca18e2e959eec9fbb2e6 +Author: ne-luboff +Date: Tue Aug 8 20:27:10 2017 +0300 + + Add VoxImplant User Id to Roster Contact object + +commit 4998943dc60ed933032e555d58827913bd5787dd +Author: qomputer +Date: Tue Aug 8 19:44:28 2017 +0300 + + Fix on_auth and on+disconnect + +commit 527aef2d57be72d9745f8340b4e9213901c7deec +Author: Namdak Tonpa +Date: Tue Aug 8 18:20:37 2017 +0300 + + these LOG message are not working! attention + +commit 7790e331f809de56424d4483b5210dbdff53cd13 +Author: Namdak Tonpa +Date: Tue Aug 8 18:19:30 2017 +0300 + + fix + +commit 8066325c79225c5fb849b683f4bdfe67be7b685b +Author: qomputer +Date: Tue Aug 8 17:27:45 2017 +0300 + + Fix presense in Profile + +commit 62d611351c60cd3e141df4c3b10bd26cae63fc35 +Author: Namdak Tonpa +Date: Tue Aug 8 17:08:43 2017 +0300 + + p2p + +commit 68dab834beb62cd20659339f73cd795247c3d618 +Author: Namdak Tonpa +Date: Tue Aug 8 17:05:40 2017 +0300 + + feed_key + +commit 25d033401afb2168e3e001245135465f97b638e8 +Author: Namdak Tonpa +Date: Tue Aug 8 16:59:41 2017 +0300 + + payload in Desc + +commit 2f7281e0522486d7bad8ec2ffcd5c080d40476d1 +Author: Namdak Tonpa +Date: Tue Aug 8 16:56:06 2017 +0300 + + payload + +commit 6df781597d85e3c8dbead2edef88fcdb4cbe5759 +Merge: d20ca99 f237afc +Author: Namdak Tonpa +Date: Tue Aug 8 16:54:03 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit d20ca99a3ca482b5f9ab0f1530b64dfb70d75cec +Author: Namdak Tonpa +Date: Tue Aug 8 16:53:56 2017 +0300 + + cursor + +commit f237afc4d7b1be00439400df5a70b3bb68ef7013 +Merge: f006b4d 5b990ad +Author: ne-luboff +Date: Tue Aug 8 16:47:08 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit f006b4d2f2bb507e239a486100403eb42edf7182 +Author: ne-luboff +Date: Tue Aug 8 16:47:03 2017 +0300 + + Found error in send_to_session + +commit 5b990adb26c2e7f34a25fc621c3e3e0c056e95cb +Author: Namdak Tonpa +Date: Tue Aug 8 16:43:58 2017 +0300 + + parse trams + +commit 0704e9e75e0031a8a939eb3ba38b43879eeee4e6 +Merge: 0300f82 0306b30 +Author: ne-luboff +Date: Tue Aug 8 16:38:15 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit 0300f826ea7f9f13246c9dd8e8d6951482f124da +Author: ne-luboff +Date: Tue Aug 8 16:38:08 2017 +0300 + + Add space in verification code + +commit 0306b3020779c6d17ff3b947c9c58cf0e5f06c94 +Author: Namdak Tonpa +Date: Tue Aug 8 16:37:07 2017 +0300 + + new models + +commit 64ea1813dc30ace87b0a53836a9450482e3d2fdc +Author: Namdak Tonpa +Date: Tue Aug 8 16:21:55 2017 +0300 + + fix model + +commit 670ab5150273667db55c7ac923b295e87cac60b2 +Author: Namdak Tonpa +Date: Tue Aug 8 16:20:28 2017 +0300 + + remove sub/unsub on conn/disconn + +commit 9ac2d7e1afb82e0b07ea6765f3573742887ee3f1 +Merge: 2807b3c 44f52fa +Author: Namdak Tonpa +Date: Tue Aug 8 15:35:59 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 2807b3c9d5e10729c5d93285ad3dc74c8e323473 +Author: Namdak Tonpa +Date: Tue Aug 8 15:35:51 2017 +0300 + + parse trans + +commit 44f52fa52fa49f9a9a6b9166582cbf1db80853ae +Merge: a8a3a6c d865c98 +Author: ne-luboff +Date: Tue Aug 8 15:34:27 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit d865c986747411335e6cb42bc4a9641dbaa3a39b +Author: Namdak Tonpa +Date: Tue Aug 8 15:34:00 2017 +0300 + + fix auth + +commit a8a3a6c1135106089d4f4e99a270baeff9c6c044 +Merge: a0f7c05 a0551c1 +Author: ne-luboff +Date: Tue Aug 8 15:33:56 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voximplant_integration + +commit a0551c1fd602add34787029ddd9060c4185fd6e8 +Merge: 08faeee bba7988 +Author: Namdak Tonpa +Date: Tue Aug 8 14:58:57 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 08faeeec8eda2aa817c7ca3b199ee5f12c51875f +Author: Namdak Tonpa +Date: Tue Aug 8 14:58:49 2017 +0300 + + don't unsubscribe on disconnect + +commit a0f7c05078da85d33975c3df6b692d9c69fa16ee +Author: ne-luboff +Date: Tue Aug 8 14:56:25 2017 +0300 + + Add vox user creation and add it to Person object + +commit bba7988aeeb282687e33c550e22290961c9306cd +Merge: d9fd491 db5098a +Author: Anton Makarov +Date: Tue Aug 8 14:38:07 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit d9fd49126458e3dbb03de93353dc879b6f91cd82 +Author: Anton Makarov +Date: Tue Aug 8 14:37:58 2017 +0300 + + Updated TypeSpec: Int -> Int64 + +commit db5098a8c88ae435c256138fed189eaf1050907a +Merge: 3a74b72 c1f0a06 +Author: Namdak Tonpa +Date: Tue Aug 8 14:00:25 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 3a74b72f165467560d60f5566b923e900434350a +Author: Namdak Tonpa +Date: Tue Aug 8 14:00:06 2017 +0300 + + post + +commit 8839209ffa10393223086be84d226c3d1af4a645 +Author: ne-luboff +Date: Tue Aug 8 13:56:01 2017 +0300 + + Update voximplant user creation test + +commit 197d0cb1c3387359b4343f59d61de18bd40941dd +Merge: 7c68776 c1f0a06 +Author: ne-luboff +Date: Tue Aug 8 13:51:59 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voximplant_integration + +commit c1f0a0657f32f72cec58507f599557d0dfb429c2 +Merge: abf9479 e83374e +Author: ne-luboff +Date: Tue Aug 8 13:51:06 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit 7c68776a01b80c7632d2e045808a57d53adcc4b0 +Merge: abf9479 e83374e +Author: ne-luboff +Date: Tue Aug 8 13:49:49 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voximplant_integration + +commit abf9479557172e2e09a9e101fe8290cc6d692ff2 +Author: ne-luboff +Date: Tue Aug 8 13:48:55 2017 +0300 + + Add alphanumeric random data generation + +commit e83374e62b7461572030466f99e14000bc662eb6 +Author: Namdak Tonpa +Date: Tue Aug 8 13:43:02 2017 +0300 + + models + +commit 8dac02d69dc64821e752f851566f0d88fdf32830 +Merge: 6a60e4f 3d6eafa +Author: Namdak Tonpa +Date: Tue Aug 8 13:39:08 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 6a60e4fac6b5608e96063f1144baa42f0880a420 +Author: Namdak Tonpa +Date: Tue Aug 8 13:38:06 2017 +0300 + + wip #65 + +commit 1ba5bfc8ac46421f7f3764b14514c3abc58f4e2d +Author: ne-luboff +Date: Tue Aug 8 13:27:04 2017 +0300 + + Use LOG macros instead of io:format + +commit c6b3cbbccdc71e94a00a931d87a9e399de515aba +Author: ne-luboff +Date: Tue Aug 8 13:24:08 2017 +0300 + + Fix typo. Add example Vox response + +commit 2c83ed5ec99bb1334a6f9fb269a79e20d00450f3 +Author: ne-luboff +Date: Tue Aug 8 13:21:19 2017 +0300 + + Extend Person model (add vox cred fields) + +commit 3d6eafa8334ed79081e29d6cacc20bcd8257e860 +Author: ne-luboff +Date: Tue Aug 8 13:09:06 2017 +0300 + + Update bash script (for amazon connecting) + +commit 097529a1b7b4441e4bf5d07ffa238366e7e7e147 +Author: Namdak Tonpa +Date: Tue Aug 8 03:26:20 2017 +0300 + + online/offline through Contact message, send Profile with Presences and Unread fileds in Contacts on login + +commit 70b310f268e26830b9a90460ad0e40a268e201ac +Author: Namdak Tonpa +Date: Tue Aug 8 02:58:54 2017 +0300 + + presence prerequisites + +commit 7d218ee227e1639fb5908884547888096c6197e3 +Author: Namdak Tonpa +Date: Tue Aug 8 02:51:00 2017 +0300 + + presence + +commit 625d8d2e4c65e0c5f2686d0619d72140328ef7ce +Author: Namdak Tonpa +Date: Tue Aug 8 02:50:49 2017 +0300 + + presence + +commit 110cfb0eb00b99331dc0d0a6258e2f27af251ef4 +Author: Namdak Tonpa +Date: Tue Aug 8 00:17:46 2017 +0300 + + Int -> Int64 + +commit 5d9c83ae015180c8ed0f1e1be3b4d6e7a6aa8550 +Author: Namdak Tonpa +Date: Mon Aug 7 16:08:13 2017 +0300 + + admin + +commit e2afe96c97ba95166e677d289bf30fe03154ff49 +Author: qomputer +Date: Fri Aug 4 19:42:39 2017 +0300 + + Add trycatch for P2P subscribe + +commit 0c5b7ce97e93d9f7e6b03080b0d892f6c5733780 +Author: qomputer +Date: Fri Aug 4 19:23:46 2017 +0300 + + Fix request for Confirm + +commit 8fd112cd3ddff1586b877e2c9a6f92a85392c504 +Author: cryoflamer +Date: Fri Aug 4 19:13:39 2017 +0300 + + updated online/offline presence + +commit 5194b44a340052f9ede8d46d8edfd5b3c7611d53 +Author: cryoflamer +Date: Fri Aug 4 18:49:17 2017 +0300 + + fix auth + +commit db05ea7959f9c1a9d5c3cd349c72a5264a247403 +Author: qomputer +Date: Fri Aug 4 18:28:25 2017 +0300 + + Add Log for UNKNOWN + +commit 431f91dad11c5c8fb13e12cca1869d12a0c6c273 +Author: cryoflamer +Date: Fri Aug 4 18:19:58 2017 +0300 + + upd profile update request + +commit 473bc7e91e8993e7c50a993ded13d8cd69a7430b +Author: qomputer +Date: Fri Aug 4 17:51:15 2017 +0300 + + Update patch for Roster + +commit d9871350c1b71d2f43abb079e3a4f159cfbb8fe4 +Author: cryoflamer +Date: Fri Aug 4 17:07:11 2017 +0300 + + added profile update + +commit f7d27165b68ff35d16970d6d3c8600e53bce0572 +Merge: b75667c 98d0fd5 +Author: Namdak Tonpa +Date: Fri Aug 4 16:10:37 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit b75667c8fb60b3b7d0cb1932e355ca26de320d38 +Author: Namdak Tonpa +Date: Fri Aug 4 16:10:30 2017 +0300 + + new iOS model + +commit 98d0fd508141cdc431c57bed9c78183a0f05613c +Author: cryoflamer +Date: Fri Aug 4 16:07:33 2017 +0300 + + added TODO for profile send after {ok, login} + +commit 6b58a21e1ed1ed394e025fc236054707d6c243ae +Author: Namdak Tonpa +Date: Fri Aug 4 15:55:16 2017 +0300 + + Desc + +commit cd840386c9e2c756710a78d2faf71f6baea831ee +Author: cryoflamer +Date: Fri Aug 4 14:30:43 2017 +0300 + + amend fixed subscribes before {ok, login} + +commit 4c85257c0fe0dc587d0354f4ae957079420299ef +Author: cryoflamer +Date: Fri Aug 4 14:18:26 2017 +0300 + + fixed subscribes before {ok, login} + +commit c6f13e40edf7d5a40b5a80063317ba4a054a8dd5 +Author: qomputer +Date: Fri Aug 4 14:16:30 2017 +0300 + + Fix Profile removing + +commit a2529b348420adfb2602e4455cb688f6894413b0 +Author: qomputer +Date: Fri Aug 4 13:47:48 2017 +0300 + + Fix p2p-subscribe for Friendship protocol + +commit 9e714bc718ab100ce8d8409c82536c23df70d766 +Author: cryoflamer +Date: Fri Aug 4 13:25:17 2017 +0300 + + fixed roster:now_msec + +commit ddb34f1d3551555a8239fa385c26832f21fe24b9 +Author: qomputer +Date: Thu Aug 3 20:30:55 2017 +0300 + + Fix status in Contact for Search + +commit 5832127f7a4ce9056563fa7e25ca1e8adf6d563a +Author: cryoflamer +Date: Thu Aug 3 20:18:12 2017 +0300 + + fix presence on_auth/on_disconnect + +commit b63a4223c3914ddc5ddccfc213fd79f89fdc3b4d +Author: qomputer +Date: Thu Aug 3 20:10:31 2017 +0300 + + Add check type of phone in Search + +commit 08409ba8a974656fa6bc6e40ebd6897f1a577344 +Author: cryoflamer +Date: Thu Aug 3 20:07:46 2017 +0300 + + upd search specs + +commit c57a1dfadf9fb2ef6b7d8c0e5d98aff98db2576e +Author: cryoflamer +Date: Thu Aug 3 19:53:43 2017 +0300 + + added log to roster_auth + +commit 8fcf6202f32bd54f8bf7abbd07c5401960c5fd07 +Author: qomputer +Date: Thu Aug 3 19:44:59 2017 +0300 + + Update Search + +commit 15e1c95ccdee73b4d088c88050945615cb6f9f65 +Author: cryoflamer +Date: Thu Aug 3 19:18:35 2017 +0300 + + added log to p2p subscribe + +commit fadaad5b38602fbeed4546c6fa46c2a910a79dd3 +Author: cryoflamer +Date: Thu Aug 3 18:53:09 2017 +0300 + + added log to p2p sub/unsub + +commit 593d6d3d41849b73b599c22a527bda4a35f54cc3 +Author: cryoflamer +Date: Thu Aug 3 18:45:03 2017 +0300 + + added log to p2p internal + +commit 8f70fdfd9bf9967c4b1de3414d06c7151c5b58de +Author: cryoflamer +Date: Thu Aug 3 18:33:38 2017 +0300 + + returned get profile + +commit 7e081c94ee064ddb6c88d95b893d2f0165fbd938 +Author: cryoflamer +Date: Thu Aug 3 18:22:25 2017 +0300 + + fix ?LOG macros + +commit 6772cdfeb4a02e0ec69a3c799fd55e07cc56e8cd +Author: cryoflamer +Date: Thu Aug 3 18:22:01 2017 +0300 + + fixed parts_phone_id + +commit b632bbc63500b555b3a3fe0cb229e4f0ff54886d +Author: cryoflamer +Date: Thu Aug 3 17:39:42 2017 +0300 + + fix "actions" bug + +commit 4b6ed87791f11ba686c99d6617065bdf5aabb11e +Author: qomputer +Date: Thu Aug 3 17:00:22 2017 +0300 + + Add finction update_roster + +commit 5926fd06f5dacc4edf3e7088bc79fa3e45d92200 +Author: cryoflamer +Date: Thu Aug 3 15:39:27 2017 +0300 + + fix mismatch_user_data bug + +commit bee14fb8d4028639e07fe5b68a510f6393bf6eaa +Author: ne-luboff +Date: Thu Aug 3 14:28:36 2017 +0300 + + Add asserts (for wiki page) + +commit a03b81868fbb82963d6d40c6be4a5d12707f054e +Author: cryoflamer +Date: Thu Aug 3 13:56:16 2017 +0300 + + added "edit" p2p message + +commit b75cdf3de3276a5b55059ff9df3e51efd7a7aa5e +Author: cryoflamer +Date: Thu Aug 3 13:42:13 2017 +0300 + + added id to answer for sent p2p message + +commit 653aa28e9ac1f9d0bbe30eaeedd5f855d94bca34 +Author: cryoflamer +Date: Wed Aug 2 19:32:22 2017 +0300 + + added roster:update_last_unread_contact/2 + +commit ee60ef786be6c632c4115c817ead540f12abc700 +Author: cryoflamer +Date: Wed Aug 2 19:01:04 2017 +0300 + + fix 'History' spec + +commit 2f3e77b999aeb333ea915bcb58f6e1b69b8e35ad +Author: qomputer +Date: Wed Aug 2 18:36:54 2017 +0300 + + Fix unchanging of last_msg and unread in Contact + +commit 8ea6990312e4076574a1609833abd77ca2c0f222 +Author: qomputer +Date: Wed Aug 2 18:25:52 2017 +0300 + + Fix update contacts + +commit 88ef623b991dc90b0164e75cfa773ad586b114dc +Author: qomputer +Date: Wed Aug 2 17:12:13 2017 +0300 + + Update request set for Roster + +commit b84231d4b03a0e3dc47aaf74bab2698b5e68d9fb +Author: cryoflamer +Date: Wed Aug 2 16:16:21 2017 +0300 + + upd get_contacts + +commit 23ce0fb007e672dbbbbeb59f6014c8204ac91a6e +Author: cryoflamer +Date: Wed Aug 2 16:15:20 2017 +0300 + + upd get_contacts + +commit 9d1e664cc9c12eb10e76cff39c638f7b957ab226 +Author: cryoflamer +Date: Wed Aug 2 16:13:42 2017 +0300 + + updated roster:get_contacts + +commit 695af85645e735628c82cca435084aa592a2358c +Author: cryoflamer +Date: Wed Aug 2 15:37:48 2017 +0300 + + added update profile to on_auth + +commit 752ed346fdcc6f5bca1e7ea1d9ea3fae499cc07d +Author: cryoflamer +Date: Tue Aug 1 19:32:47 2017 +0300 + + added update field to Profile + +commit 299fc6930befdc561625e4f32d49fd4b147fa548 +Author: qomputer +Date: Wed Aug 2 15:21:14 2017 +0300 + + Update messages for friends + +commit fc71536dbaf304ea47525902fc0fd40e25477815 +Author: qomputer +Date: Tue Aug 1 19:22:06 2017 +0300 + + Fix Confirm + +commit 0807758dab41e48bb2711b1f186ab9267233b4e0 +Author: cryoflamer +Date: Tue Aug 1 19:05:44 2017 +0300 + + added "update" field to Profile + +commit c06eecc516f8b76f41d91901f4bb9d1f1d360926 +Author: cryoflamer +Date: Tue Aug 1 18:06:33 2017 +0300 + + added NewLastLoadedMsgId + +commit c8b2bd02ba103cab03efa0a6ec06a63b70211cc0 +Author: cryoflamer +Date: Tue Aug 1 18:00:05 2017 +0300 + + added `History` update + +commit 8447728acd5048f449f927291bc1f2462b24c735 +Author: cryoflamer +Date: Tue Aug 1 17:02:02 2017 +0300 + + commented "-compile({parse_transform, roster_swift})." + +commit 7230d3701f7a39afd5a74c42fc97fb2ae1e5c8db +Merge: 1491606 1363699 +Author: ne-luboff +Date: Tue Aug 1 16:53:30 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit 1363699107c82a93ee48f6bbc2e3fa47bc4b8b2f +Author: Namdak Tonpa +Date: Tue Aug 1 16:52:59 2017 +0300 + + fix + +commit 5512e54a1c50d49f664d96c677d8c4a0cb31416a +Merge: a1fb5d0 69816b7 +Author: Namdak Tonpa +Date: Tue Aug 1 16:51:52 2017 +0300 + + fix + +commit a1fb5d014a10204151531895f5d94402b31a895f +Author: Namdak Tonpa +Date: Tue Aug 1 16:50:54 2017 +0300 + + fix + +commit 69816b76b3c07bfbd1633530276fa2bf53745c9d +Author: Anton Makarov +Date: Tue Aug 1 16:50:48 2017 +0300 + + Updated Model for test profile + +commit 149160687d6108045c174e3e8b025758a854aab5 +Merge: 33f3f4d f3f2e92 +Author: ne-luboff +Date: Tue Aug 1 16:48:49 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into logging + +commit 33f3f4d41e828b4370015ed637594f9e52cd86aa +Author: ne-luboff +Date: Tue Aug 1 16:48:36 2017 +0300 + + Update logs in roster_message + +commit f3f2e92903da16af03ff22b2aab773c29bcc6a55 +Author: Anton Makarov +Date: Tue Aug 1 16:41:48 2017 +0300 + + Fixed + +commit 071c259cbf2c49addb1115955f5c4bf3d7d00a83 +Author: Namdak Tonpa +Date: Tue Aug 1 16:37:48 2017 +0300 + + new model + +commit 6972cc8061de0ca3828cdf589f3a946c14834786 +Author: ne-luboff +Date: Tue Aug 1 16:33:23 2017 +0300 + + Add logs in roster_search + +commit 51480476962d78f36f47cc4a5c85fc71c9986ede +Author: ne-luboff +Date: Tue Aug 1 16:29:20 2017 +0300 + + Update logs in roster_roster + +commit 40420439d17375115627164dd8b759d3fe037019 +Author: ne-luboff +Date: Tue Aug 1 16:17:37 2017 +0300 + + Replace io:format with LOG in roster_proto + +commit 2f702ffc3b2ea5bd8c46124886ed93dabdebcbf7 +Merge: a089379 c31d382 +Author: ne-luboff +Date: Tue Aug 1 16:06:02 2017 +0300 + + Fix merge conflict in roster_auth + +commit a089379b6b7ecbed204ed64530755f9de76615fc +Author: ne-luboff +Date: Tue Aug 1 16:03:04 2017 +0300 + + Update logs in roster_person + +commit c31d382992a960be0c45975f43ccf6beb9f9fe29 +Author: cryoflamer +Date: Tue Aug 1 16:00:16 2017 +0300 + + added "created" and "last_online" fields to auth + +commit da755ce1a59c9bf4297953f051c8fc5abc8e0e16 +Author: ne-luboff +Date: Tue Aug 1 15:58:59 2017 +0300 + + Add logs in roster_profile + +commit 598198e336a41c6e2691c2dd3d40fbbe283a53f1 +Merge: 22c80d2 e7db0cb +Author: ne-luboff +Date: Tue Aug 1 15:31:54 2017 +0300 + + Fix merge conflict + +commit 22c80d2fb8aef16ec504da653060e316b62745d9 +Author: ne-luboff +Date: Tue Aug 1 15:24:52 2017 +0300 + + Add logging to roster_friend + +commit e7db0cb21c15a3dba01f8689be617d11dd2a6979 +Author: cryoflamer +Date: Tue Aug 1 15:02:16 2017 +0300 + + added unsubscribe p2p to on_auth + +commit 92ef6d294aca3520639cf166a52d27644b778e67 +Author: cryoflamer +Date: Tue Aug 1 14:43:57 2017 +0300 + + update roster_test + +commit a574257c14b3fc104446814071c9afd19829fd63 +Author: cryoflamer +Date: Tue Aug 1 14:38:18 2017 +0300 + + updated roster_test + +commit a53de5599a2b12878479385d40676f2a50d157d3 +Author: cryoflamer +Date: Tue Aug 1 14:25:11 2017 +0300 + + upd roster_test + +commit c37af2b3b8c046bbc4d292cf2252d28de36be096 +Author: cryoflamer +Date: Tue Aug 1 14:24:26 2017 +0300 + + added last_read message + +commit 754490d82432dbe08b67d47b026755a5a0847f2a +Author: qomputer +Date: Tue Aug 1 14:06:40 2017 +0300 + + Add search for phone + +commit 4400f5c5505bfd6ceb2c589864829e3c5d2d0aa9 +Author: qomputer +Date: Tue Aug 1 14:01:43 2017 +0300 + + Add Search + +commit 24563e1b7371aa4cc721ee44c3ed5ca6ad9a84c9 +Author: cryoflamer +Date: Tue Aug 1 13:49:03 2017 +0300 + + updated p2p + +commit 95ec352a235787cefe40195e2166ca596242d5a2 +Author: ne-luboff +Date: Tue Aug 1 13:33:55 2017 +0300 + + Update rister_friend file formatting + +commit fde246af27db37153500f4d00e6da8250ce31674 +Merge: ceee824 1c316ab +Author: ne-luboff +Date: Tue Aug 1 12:44:33 2017 +0300 + + Fix merge conflict with master branch (1c316ab) + +commit 1c316ab94e08236f499f66ef2c701493950fb448 +Author: cryoflamer +Date: Mon Jul 31 21:30:21 2017 +0300 + + added p2p subscribe to on_auth + +commit 76de7d7b3f34fa6cca454b3f1abeb03769f045fd +Author: qomputer +Date: Mon Jul 31 19:37:14 2017 +0300 + + Fix Roster and Friend request + +commit ea108976080baa3067e44b9ac9c4ac2d98854a2b +Author: qomputer +Date: Mon Jul 31 19:35:16 2017 +0300 + + Update subscribe_p2p etc + +commit 9776680f5e154866ee8eb083e3f6cff0400e6b33 +Author: cryoflamer +Date: Mon Jul 31 19:05:56 2017 +0300 + + added last_msg to p2p + +commit 9648d050bcfe321194af89393109c2457bfbcad7 +Author: qomputer +Date: Mon Jul 31 16:59:43 2017 +0300 + + Update statuses for Friendship protocol + +commit 7c235cafe8505cce3ac6c15244239e625e7a0db4 +Author: cryoflamer +Date: Mon Jul 31 15:26:26 2017 +0300 + + updated roster models + +commit ceee82484af7bad03ef268524c375a503873868a +Author: ne-luboff +Date: Mon Jul 31 15:23:23 2017 +0300 + + Add logs to Auth methods + +commit 5c42399ef66d7492ccf442911d080818c0e5b61d +Merge: 2ccfdfb e48a640 +Author: Namdak Tonpa +Date: Mon Jul 31 14:12:14 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 2ccfdfbe3a602bf1bb6d8dda33014c8be4b04b10 +Author: Namdak Tonpa +Date: Mon Jul 31 14:12:05 2017 +0300 + + search + +commit e48a64062116db9fe821e358653a322ed5d901e2 +Author: cryoflamer +Date: Mon Jul 31 13:53:24 2017 +0300 + + added jwt tests + +commit b625f0ee9e070dafa3c471c2f619ceaf3f7acef9 +Author: cryoflamer +Date: Mon Jul 31 13:06:20 2017 +0300 + + fixed "jwt" bug + +commit 3c9905df7faba34cec5210e1fd1482231c82410c +Author: cryoflamer +Date: Fri Jul 28 18:10:21 2017 +0300 + + added roster:send_action_phone/3 + +commit 898e649877c09d7bb41f65e672a39931d57af212 +Author: cryoflamer +Date: Fri Jul 28 18:02:45 2017 +0300 + + added subscribe to `actions/1/api/phone/:phone` + +commit 3f03b3ecc7f5b51aadcae9a7d93e3ba87fe0102e +Author: cryoflamer +Date: Fri Jul 28 17:00:30 2017 +0300 + + addd roster:now_msec/0 + +commit 62a8d22df59e9554ca86f0a2f00f671944fc29b0 +Author: qomputer +Date: Fri Jul 28 16:48:31 2017 +0300 + + Fix time for messages + +commit e78353ba2ef69d91ba541e77f1fb66422cc915bf +Author: cryoflamer +Date: Fri Jul 28 16:45:34 2017 +0300 + + updated retreive p2p history + +commit f3b60c647a204f505816e5e5e1cb9dbaa92d4d71 +Author: cryoflamer +Date: Fri Jul 28 16:15:26 2017 +0300 + + amend updated roster models + +commit e44314f5fd81e10540b029f7eea9f0cdb0f09dcb +Author: ne-luboff +Date: Fri Jul 28 13:52:25 2017 +0300 + + Delete debug logs + +commit 4ed143a89e989d98b6a2ca3eaa6e33ab9586bd50 +Merge: a7552c0 11c1c7e +Author: ne-luboff +Date: Thu Jul 27 16:13:06 2017 +0300 + + Fix merge conflict + +commit a7552c0c4e292c47ad6152f05a5c13a2a6a908c9 +Author: ne-luboff +Date: Thu Jul 27 16:11:19 2017 +0300 + + Add extra logs (issue #59) + +commit 11c1c7ed02d11b5117dc1212f4400553eafdba3d +Author: cryoflamer +Date: Thu Jul 27 15:20:56 2017 +0300 + + amend added remove session log + +commit d582e954e5fcb1f3360d6e383fd0ee31fa41bace +Author: cryoflamer +Date: Thu Jul 27 15:20:16 2017 +0300 + + added remove session log + +commit bec9cfd921324aa7b4ad726c6f4ad0f71a8e8e6b +Merge: bd64221 2b81006 +Author: ne-luboff +Date: Thu Jul 27 15:11:13 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into offline_messages + +commit 2b81006f0ef87bfc38c3c4b30518f0b8121b4de2 +Author: cryoflamer +Date: Wed Jul 26 17:51:57 2017 +0300 + + removed subscribe to p2p/+/Id + +commit bd6422155851888985923f1494ab23acc08b82cf +Author: ne-luboff +Date: Wed Jul 26 12:42:46 2017 +0300 + + Add TODO to offline messages test + +commit beede8064a7f8bcc179147c43d47cdcdc6b52468 +Author: ne-luboff +Date: Wed Jul 26 12:42:21 2017 +0300 + + Add TODO to offline messages test + +commit 597392742f3c52b321e20512eb05b7bd26662620 +Author: ne-luboff +Date: Wed Jul 26 12:40:37 2017 +0300 + + Start offline-messages test + +commit fe2570a69444b94e9659c18aee46b3acb8f89be0 +Author: qomputer +Date: Tue Jul 25 18:42:38 2017 +0300 + + Fix double replais + +commit 188e77d2eb75ce28861a3e54535972c38ad3396f +Author: ne-luboff +Date: Tue Jul 25 17:43:34 2017 +0300 + + Update server info (readme file) + +commit 79bdca07c4550afc34181f1ad5ae34df4e36954b +Author: qomputer +Date: Tue Jul 25 15:09:09 2017 +0300 + + Add sending back of added Contact with status=not_confirm + +commit 3491df5223187e19837c03483577fdb7dd319cae +Author: qomputer +Date: Tue Jul 25 14:19:01 2017 +0300 + + Fix Confirm Request + +commit efdc6d7cc61d8b638f262046b970c7e056b5dbfb +Author: qomputer +Date: Mon Jul 24 19:52:35 2017 +0300 + + Fix adding roster + +commit ca8e83cd4a6397016977ffb0519a0f337e45fd2b +Author: qomputer +Date: Mon Jul 24 19:32:38 2017 +0300 + + Fix Contact's status + +commit 9641c5c3cf47cfa1a35b036bee54d22e1bc59269 +Author: cryoflamer +Date: Mon Jul 24 19:22:42 2017 +0300 + + added log to Friend get + +commit a20f51a9948238254dfa2d428e4f033a3d9446fd +Author: qomputer +Date: Mon Jul 24 19:05:33 2017 +0300 + + Add request for getting of contact + +commit e50c87ad2ee93ec9352b3dea3f5f570df75d9112 +Author: cryoflamer +Date: Mon Jul 24 17:49:20 2017 +0300 + + added log to roster_friend + +commit 69b3bc875ad5ab07ff57b8cec7674d1f70172113 +Author: qomputer +Date: Mon Jul 24 15:15:56 2017 +0300 + + Fix for Friend Request in case self with oneself + +commit 76d5bc7c4669f33d3f7ab6f4b5dbc79853fa5e8c +Author: cryoflamer +Date: Mon Jul 24 14:59:18 2017 +0300 + + added session not found log + +commit a873320825543f926c48b9419101ac5c563bffd8 +Author: qomputer +Date: Mon Jul 24 14:01:12 2017 +0300 + + Fix io for Friend + +commit a16076bfd0aca478dccd4ea96e7a9bae04d88155 +Author: cryoflamer +Date: Mon Jul 24 13:18:25 2017 +0300 + + added unsubscribe to on_disconnect + +commit e1ed7c2f281d49ad7fa8e91564dadc2c82f8653a +Author: qomputer +Date: Sun Jul 23 17:54:57 2017 +0300 + + Update getting friend's contact + +commit cb8336e845963c2f2b5d8ad1c7a6647681b9c8ad +Author: ne-luboff +Date: Fri Jul 21 19:36:24 2017 +0300 + + Update Readme (server addresses) + +commit eecb4895867ee7203bf3fb02744e12b035267be3 +Author: cryoflamer +Date: Fri Jul 21 18:23:52 2017 +0300 + + fix crash binary_to_term + +commit 2c1b1c1cc65dfc133bcacd775c03dd82eb5589f1 +Author: cryoflamer +Date: Fri Jul 21 18:12:07 2017 +0300 + + added atoms() (fix binary_to_term(... [safe]) + +commit 74188681d1c173a97255400fc7f797c538c93d51 +Author: qomputer +Date: Fri Jul 21 18:04:45 2017 +0300 + + Fix functions for Friend and Contact + +commit d482eb22a1f7d23b4efad03934e9583ca7e36bbd +Author: cryoflamer +Date: Fri Jul 21 17:30:09 2017 +0300 + + removed delete_user from roster_auth + +commit 1e1e0ff976be65d50f985d302dd0136c80775be3 +Author: qomputer +Date: Fri Jul 21 16:56:10 2017 +0300 + + Add sending Contact into ConterPart actions + +commit 40a7e588ef85c723f372a085b81fff6c3330ff81 +Author: cryoflamer +Date: Fri Jul 21 15:44:11 2017 +0300 + + added binaty to "services" + +commit 5ab863952ac0e7a9b62a2ee3a88ca792e4cee852 +Author: ne-luboff +Date: Fri Jul 21 13:32:44 2017 +0300 + + Trying to add device type atom + +commit 8e5f9a9d5bca082c232bd9d8e9382b85eb318ed8 +Author: ne-luboff +Date: Fri Jul 21 13:12:26 2017 +0300 + + Delete debug code (from voice_call method) + +commit 55581c1e59afe0941bb6a9563fb40efb17e0e702 +Merge: 160fe9f 025327c +Author: ne-luboff +Date: Fri Jul 21 13:11:30 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voice_call_request + +commit 160fe9f518f0e87b780a96345cd41ff7bea7e8fd +Author: ne-luboff +Date: Fri Jul 21 13:10:52 2017 +0300 + + Delete spawned call + +commit 025327c7c0140f88b9aba2e1d3c0032bc1dd6ae2 +Author: Namdak Tonpa +Date: Fri Jul 21 11:58:15 2017 +0300 + + Update README.md + +commit 1c48a76ee77e20151422b53b69eaa7c4d50b37a8 +Author: Namdak Tonpa +Date: Thu Jul 20 21:47:26 2017 +0300 + + handle atom constants in specs + +commit 399d1590ed8c8f3d32f12ca03e1011f9ef4be801 +Author: qomputer +Date: Thu Jul 20 19:38:35 2017 +0300 + + Update roster.erl. roster.hrl , roster_friend + +commit b0c8d34e7872496526bdbb9a858bb4be7621106d +Author: cryoflamer +Date: Thu Jul 20 17:59:24 2017 +0300 + + added get_profile to test + +commit 4c1ed0822151bae4dd904e7bf3572664234debb7 +Author: cryoflamer +Date: Thu Jul 20 17:24:08 2017 +0300 + + added publish p2p/From/To + +commit 0364f8554a8a67f40365a478162a86ce73c10b49 +Merge: 31f9846 581c417 +Author: ne-luboff +Date: Thu Jul 20 16:58:25 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voice_call_request + +commit 31f984615888b87908c8556d8666e8c6718c01fd +Author: ne-luboff +Date: Thu Jul 20 16:58:12 2017 +0300 + + Updated request voice call function. Now it works with language param in list + +commit 581c417903cdb8caf5fd246e6db2751bae053ee5 +Author: cryoflamer +Date: Thu Jul 20 16:14:48 2017 +0300 + + fix roster_auth + +commit 58a1a9b8a2a067ee4e5d28ff88cdeb47eac37440 +Author: qomputer +Date: Thu Jul 20 14:09:13 2017 +0300 + + Update roster for set and roster.hrl + +commit 1e01a483ffccf662b076c8ece64062f433836d94 +Author: cryoflamer +Date: Thu Jul 20 13:32:22 2017 +0300 + + replaced tuples io/ok by #io/#ok in auth + +commit 9fbb612728af83d5dc01b955ed5390fe047cacce +Author: Namdak Tonpa +Date: Thu Jul 20 00:43:33 2017 +0300 + + fix Message + +commit 5a9bdef7fa6f9cdfa33e678b1015993eb9cc124c +Author: Namdak Tonpa +Date: Wed Jul 19 23:10:04 2017 +0300 + + disable parse trans + +commit 46049f12660a8b556a66bcf1fe58b73ccc27da95 +Author: Namdak Tonpa +Date: Wed Jul 19 23:09:49 2017 +0300 + + rename tree + +commit cd0e35a54005b56a4d146b09d1011a8d9b2d387d +Author: Anton Makarov +Date: Wed Jul 19 22:04:18 2017 +0300 + + Serializer + +commit 2e5f8f34b3502b8964bb7d49dc83bdb8d166b203 +Author: cryoflamer +Date: Wed Jul 19 18:42:40 2017 +0300 + + added jwt to "services" field + +commit 0138bcbcac0d40dc5852049c76a8ab05b36fb0f3 +Author: cryoflamer +Date: Wed Jul 19 18:20:56 2017 +0300 + + returned login + +commit 1e21a9bee27dba97bb73b6b87668a7eb636091a9 +Author: cryoflamer +Date: Wed Jul 19 18:06:22 2017 +0300 + + added "registered" status + +commit 735980c05de584098c386eb0f1cfabc4c7501544 +Author: Namdak Tonpa +Date: Wed Jul 19 17:33:44 2017 +0300 + + disable parse trans + +commit 5dfaeb43cd888e7cdd8a8c9d1bb6047f97b294d4 +Author: Namdak Tonpa +Date: Wed Jul 19 17:33:21 2017 +0300 + + serializer errors + +commit bd481adb81bb567f3580e5a739f1c08de0c76780 +Author: Anton Makarov +Date: Wed Jul 19 17:29:44 2017 +0300 + + StringAtom + +commit c597364b98e3ff42a3f2d4bf8fbb1f675d57ccf8 +Author: Anton Makarov +Date: Wed Jul 19 17:19:31 2017 +0300 + + StringAtom + +commit c4562ac9e8fa8091cb88bcd069eacdb0c06ddac2 +Merge: 2661616 41fabcc +Author: Namdak Tonpa +Date: Wed Jul 19 17:16:40 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 2661616aecbbd855542cdccc9bca735354273d7e +Author: Namdak Tonpa +Date: Wed Jul 19 17:16:26 2017 +0300 + + disable parse trans + +commit 41fabcca8837e8a0df2106561088d21ea8de8052 +Author: qomputer +Date: Wed Jul 19 17:14:04 2017 +0300 + + Fix get contact + +commit 7f1ba58d63b78bd50cdfdb60378dbdb26d2961f7 +Author: qomputer +Date: Wed Jul 19 17:01:00 2017 +0300 + + Update Person, Friend, Confirm + +commit c5ac75deafccfe3b0d9ff896b2f4be1848a53ab8 +Author: cryoflamer +Date: Wed Jul 19 16:55:22 2017 +0300 + + added auth_case_test2 + +commit 2f9af872e7842f2ef7639b9f3a8b06362abe6f54 +Author: Anton Makarov +Date: Wed Jul 19 16:45:00 2017 +0300 + + Parser List + +commit 04844bb166e83a0f4caabd5a8725ead6067bbb5b +Merge: 0675ac9 55bb4fc +Author: Namdak Tonpa +Date: Wed Jul 19 16:31:34 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 0675ac92a9604242863b06cffc3ad9b55f699409 +Author: Namdak Tonpa +Date: Wed Jul 19 16:31:27 2017 +0300 + + fix build + +commit 55bb4fcc761534e1200c75058f6b62ca37da3701 +Author: cryoflamer +Date: Wed Jul 19 16:30:34 2017 +0300 + + fix roster_auth + +commit dc7f0c8a3da4e0ac6f0dd7df2f92d688108c0024 +Author: Namdak Tonpa +Date: Wed Jul 19 16:25:47 2017 +0300 + + chain on unions + +commit a15cd2bfa83548b3507c6e6734de5660ee6f0690 +Author: Namdak Tonpa +Date: Wed Jul 19 15:36:54 2017 +0300 + + simplify generator + +commit c2f4a63049fc2d6ca0f022bc3b44687d6103c632 +Merge: c9c960a d4ca300 +Author: Namdak Tonpa +Date: Wed Jul 19 15:33:46 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit c9c960ad262afe18f992c67120aa9fbed80bf665 +Author: Namdak Tonpa +Date: Wed Jul 19 15:33:26 2017 +0300 + + index, rec + +commit d4ca300919dd200272dc5f8cee5d95fcd37035ee +Author: Namdak Tonpa +Date: Wed Jul 19 14:42:47 2017 +0300 + + Update README.md + +commit 21e5c55aa3a185036424ad8e7f822b3d9570c5a1 +Author: Namdak Tonpa +Date: Wed Jul 19 14:06:56 2017 +0300 + + disable parse transform + +commit 7cbc6f7c65b196ce3522ae2fc2c4e11313a76e9b +Author: cryoflamer +Date: Wed Jul 19 13:06:39 2017 +0300 + + reordered fields in ok2 and error2 + +commit 71fa531399de0cbd99d2321e7b08d6133ac44bfa +Merge: b3e21f7 af48e04 +Author: ne-luboff +Date: Wed Jul 19 12:43:48 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into amazon_upload_api + +commit af48e046a7a65facad4289eef4178a966da602db +Author: qomputer +Date: Wed Jul 19 12:18:34 2017 +0300 + + Add system messages for friends + +commit b3e21f7168891685d8880992c5a88a3af233cf26 +Merge: 49b1171 f8de9bf +Author: ne-luboff +Date: Wed Jul 19 11:53:41 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into amazon_upload_api + +commit f8de9bf65779e0ca9c5a33b17ac9eb4a1c598a2e +Author: Anton Makarov +Date: Wed Jul 19 06:28:09 2017 +0300 + + Namdak, pls notify me, when you will see this commit + +commit 020bdad7150ad311292b4d41c046a9258ac916ed +Author: Namdak Tonpa +Date: Wed Jul 19 04:45:39 2017 +0300 + + rec models + +commit 0adc29ef9ceccee8c8a48d0db50a7c868d2d80fd +Author: Namdak Tonpa +Date: Wed Jul 19 04:36:47 2017 +0300 + + typing lists + +commit 84f9f452eadfac3ceb0f301c2072db459976cc8b +Author: Namdak Tonpa +Date: Wed Jul 19 03:50:39 2017 +0300 + + pretty + +commit 400cef0758679a8058c805d1e4ccae8a92e6a14f +Author: Namdak Tonpa +Date: Wed Jul 19 03:46:22 2017 +0300 + + formatter + +commit 2863bf86c5813ca547e10217393cd96be47692e7 +Merge: d380448 3d329e8 +Author: Namdak Tonpa +Date: Wed Jul 19 03:29:58 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit d380448146e26a2706bf7f6973bef88ef28a0f81 +Author: Namdak Tonpa +Date: Wed Jul 19 03:29:51 2017 +0300 + + profile + +commit 3d329e807c963b083f7a7ba4de61e5581c291701 +Author: Namdak Tonpa +Date: Wed Jul 19 03:15:02 2017 +0300 + + Update Parser.swift + +commit dd6aa33cbb3e571b2fb6b4efca82b44e39577fea +Author: Namdak Tonpa +Date: Wed Jul 19 02:55:05 2017 +0300 + + typed lists + +commit 18ba4326c1b8bb37c32a10568a8debb76b33d183 +Author: Namdak Tonpa +Date: Wed Jul 19 02:35:45 2017 +0300 + + list -> [AnyObject] + +commit 10eed01432e8da828631b717491f5c491c2c20f9 +Author: Namdak Tonpa +Date: Wed Jul 19 02:05:10 2017 +0300 + + activator + +commit e56b17cf8cba6be0b38547a89d28c28987badcc2 +Author: Namdak Tonpa +Date: Wed Jul 19 01:50:49 2017 +0300 + + Selector.swift + +commit 8044aca3ee5bdb1454dadd2e89f5e4dbb5c8652f +Author: Namdak Tonpa +Date: Wed Jul 19 00:23:46 2017 +0300 + + comment parse_transform, issue in mad + +commit f1e19e3a1d8c4f8b266c1b48942b2f6183e2c2c6 +Author: Namdak Tonpa +Date: Wed Jul 19 00:15:05 2017 +0300 + + prettify codebase + +commit fe29d9cba88841a6654a3664ea299fa6b15127b9 +Author: Namdak Tonpa +Date: Tue Jul 18 23:56:14 2017 +0300 + + pretty print + +commit 6ca275c9dcc71a3bff4cc8bdd7b71caa1e24bea5 +Author: Namdak Tonpa +Date: Tue Jul 18 23:17:33 2017 +0300 + + ** BUILD SUCCEEDED ** + +commit af9880fd743ff2eaa2b01df438e51e7f29767894 +Author: Anton Makarov +Date: Tue Jul 18 23:06:44 2017 +0300 + + List[AnyObject] + +commit ef251a1593e4088a98e9f819cc10b9bba3cf46b9 +Author: Anton Makarov +Date: Tue Jul 18 23:04:20 2017 +0300 + + Tuple() + +commit f39dbd088d8729a991da996b45a63d3ad9e21196 +Merge: d504faf 271fc46 +Author: Anton Makarov +Date: Tue Jul 18 22:40:10 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + + # Conflicts: + # apps/roster/priv/macbert/Source/Parser.swift + +commit d504faf77e4e9efb22f7547e70283d1e7f537402 +Author: Anton Makarov +Date: Tue Jul 18 22:33:23 2017 +0300 + + parseObject + +commit 271fc46ca90b64c5cbc1c68a6cb25fa71fb99b6a +Author: Namdak Tonpa +Date: Tue Jul 18 22:14:17 2017 +0300 + + wip + +commit b4980ec773b53bfc4913413a6ccbcfc493420c4e +Author: Anton Makarov +Date: Tue Jul 18 22:02:06 2017 +0300 + + parser updated to typed lists + +commit f972af1f2cba5f4b617426a605c717f2656b2649 +Author: Anton Makarov +Date: Tue Jul 18 21:57:25 2017 +0300 + + parser updated + +commit 0bd55ffd2dfa1373b82fdfc783af8738aa468612 +Author: Namdak Tonpa +Date: Tue Jul 18 21:54:28 2017 +0300 + + main + +commit 99c3a2abe6545f2d6727afe790f289d7ac1d2b84 +Author: Namdak Tonpa +Date: Tue Jul 18 21:52:31 2017 +0300 + + lists + +commit ed8b2f45a2d159685da897600e1c8a9fcd596439 +Author: Namdak Tonpa +Date: Tue Jul 18 21:36:30 2017 +0300 + + remove spec and model + +commit ca1e2c36970d93c3d816c1e7396b11d05ccbe09d +Author: Namdak Tonpa +Date: Tue Jul 18 21:23:49 2017 +0300 + + project + +commit c3f6883f7011a8801c96328aa6c48fe1f2078710 +Author: qomputer +Date: Tue Jul 18 19:53:43 2017 +0300 + + Add message for friend + +commit 49b117158dd662ac5dfd05b5f0c900543280024e +Merge: f631ba4 6190a0c +Author: ne-luboff +Date: Tue Jul 18 19:17:35 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into amazon_upload_api + +commit f631ba48df2825adf20ac89bdcea8f756742cf53 +Author: ne-luboff +Date: Tue Jul 18 19:17:12 2017 +0300 + + Replaced with method + +commit 6190a0c00ba3a6a88b0c099fd383d07d1748b604 +Author: cryoflamer +Date: Tue Jul 18 19:15:12 2017 +0300 + + updated session_not_found + +commit ba15f079b7976690f17c793745c541d9028cb201 +Author: cryoflamer +Date: Tue Jul 18 19:12:33 2017 +0300 + + fixed auth + +commit 3b290bb209e95a9855eec5b74740a0e8b5bac85a +Author: cryoflamer +Date: Tue Jul 18 19:09:48 2017 +0300 + + fixed session_not_found + +commit 5845ccffa8be4a4fe82f9ab79243bba4f841a7e7 +Merge: 87adff4 27dc641 +Author: ne-luboff +Date: Tue Jul 18 19:08:25 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into amazon_upload_api + +commit 87adff4a364e79645e0a6b97602d9dbc2fd7ed23 +Author: ne-luboff +Date: Tue Jul 18 19:08:13 2017 +0300 + + Back to ftp record (instead of xftp) + +commit 27dc6412e616f81e8248721841eb54cd44d89bb8 +Author: cryoflamer +Date: Tue Jul 18 18:46:36 2017 +0300 + + added jwt code autoverify + +commit 8e22a3ce57a3eb19c66b8f19b354fa7dd6f89ecb +Author: cryoflamer +Date: Tue Jul 18 18:43:32 2017 +0300 + + added export_all + +commit fa44d8e130a8024d3535ed6cf5d5336e5910dc13 +Author: cryoflamer +Date: Tue Jul 18 18:14:27 2017 +0300 + + fix parse_transform + +commit cea5a4b31d8c0dc1137288cb10d3643bd1e2b96d +Merge: e32e5f4 38eee9b +Author: ne-luboff +Date: Tue Jul 18 17:57:35 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into amazon_upload_api + +commit e32e5f4989a7905825bbd5dc057c5748d92a7a22 +Author: ne-luboff +Date: Tue Jul 18 17:57:21 2017 +0300 + + intermediate ftp commit. TODO - back to #ftp-record (instead of #xftp) + +commit 38eee9b356a04291e53253b571791c5e508f3aaf +Author: Namdak Tonpa +Date: Tue Jul 18 16:57:45 2017 +0300 + + error2 ok2 + +commit 35a90e9bff5392aed232a530a7a72cc1f271861d +Author: Namdak Tonpa +Date: Tue Jul 18 16:44:18 2017 +0300 + + macbert + +commit eb73c09bd080e34aacca0181e7eb3a3343f18c74 +Merge: 9e777f0 4875163 +Author: Namdak Tonpa +Date: Tue Jul 18 16:19:33 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 9e777f007efbd27547ccf16475b77bc8ff69ec11 +Author: Namdak Tonpa +Date: Tue Jul 18 16:19:26 2017 +0300 + + tree of macbert + +commit 48751631b0c70c3bc01fa18da7bb2a2c2ec0f7d0 +Author: cryoflamer +Date: Tue Jul 18 16:11:58 2017 +0300 + + updated "ok" record + +commit 39006cca43e2dd6fe2004bf3da7ca217a7a5404e +Author: ne-luboff +Date: Tue Jul 18 14:09:17 2017 +0300 + + Updated request voice call method + +commit 879af7ccdb486d72eb3e3b3c2bcc5f71c50e3b64 +Author: ne-luboff +Date: Tue Jul 18 13:32:36 2017 +0300 + + Added spawned method to call telesign_voice_call function + +commit 5820bad5cf6dc5acc426c2ae2360c685ff245657 +Author: ne-luboff +Date: Tue Jul 18 13:27:35 2017 +0300 + + Added validate_language function using in voice_verify method + +commit 70e5ecd0506ea24fdba2471d87610fa63508f6de +Author: ne-luboff +Date: Tue Jul 18 13:21:50 2017 +0300 + + Fixed typo in verify_language function name. Updated export functions list + +commit 80aa29cfb81a5807a1184b7834454d0a694708d4 +Merge: a6835af 10993e7 +Author: ne-luboff +Date: Tue Jul 18 13:19:05 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voice_call_request + +commit a6835af4d05dd45a6c891f02f2bc33f01af9d890 +Author: ne-luboff +Date: Tue Jul 18 13:18:45 2017 +0300 + + Added verify_language method to telesign helpers (#48) + +commit 10993e779726d68aeaa385eff82a8f535c7835b5 +Author: qomputer +Date: Tue Jul 18 12:59:36 2017 +0300 + + Fix friend handlers and tests + +commit 5aeac26af8106f1add8cd8ea2b2989eab736861c +Author: ne-luboff +Date: Tue Jul 18 12:58:01 2017 +0300 + + Made TTSMessage optional parameter in voice_vefiry method + +commit eb5a5a35b6b45b5511f4c2c3a2c39bbf31334660 +Merge: 7344940 68300ff +Author: ne-luboff +Date: Tue Jul 18 12:05:53 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voice_call_request + +commit 734494004bbf312ca290fcd893bb30f014b28a68 +Author: ne-luboff +Date: Tue Jul 18 12:05:37 2017 +0300 + + Added supported by telesign languages for speech (#48) + +commit 68300ff0212fb787a7c4bf3ee8ddf326e85fbbd7 +Author: Anton Makarov +Date: Tue Jul 18 05:11:59 2017 +0300 + + Spec: IO + +commit 6ed2498b5f45ec72a1070396c3423a5af57d759c +Author: Anton Makarov +Date: Tue Jul 18 04:44:28 2017 +0300 + + Spec: Updated IO model + +commit 9240133d9f642449e04ce6c42b9b9e9a832429e4 +Author: Anton Makarov +Date: Tue Jul 18 03:36:08 2017 +0300 + + Spec updated + +commit da0ef3c5ce859148c7dbc35bc530d4f984769ac8 +Author: Anton Makarov +Date: Tue Jul 18 02:31:00 2017 +0300 + + Parser:updated tuple + +commit 97b23d7ef0f0ed8ef5e6d4d4fba4e2861d24a9bf +Merge: 8a6337d d3d615d +Author: Anton Makarov +Date: Tue Jul 18 01:45:39 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit 8a6337d8bf057754e2032ceeab9aa98fca4da63e +Author: Anton Makarov +Date: Tue Jul 18 01:45:31 2017 +0300 + + NynjaParser update + +commit 20979916ce4da7798dbe508212404baeb5fa8a7d +Author: ne-luboff +Date: Mon Jul 17 20:20:49 2017 +0300 + + Updated test_voice_call (found 5digits limitation) #48 + +commit a6c50ef18876038ce64b494e849048f446c93930 +Merge: a434b88 d3d615d +Author: ne-luboff +Date: Mon Jul 17 19:36:17 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voice_call_request + +commit a434b8869dee50fd73e0ffb4844bca2aacf15cfa +Author: ne-luboff +Date: Mon Jul 17 19:35:55 2017 +0300 + + Started request for voice call (#48) + +commit d3d615d6bb28dcf5cd33b7b458185f39ca262522 +Author: cryoflamer +Date: Mon Jul 17 18:44:16 2017 +0300 + + updated on_auth + +commit e391ed0e4a56e540c4f4a2c5ae861ab38ebd6834 +Merge: 198e96b 32c9e85 +Author: ne-luboff +Date: Mon Jul 17 18:15:35 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into amazon_upload_api + +commit 198e96bbb4d9f281a98b05be1c9a956c3f61e71f +Author: ne-luboff +Date: Mon Jul 17 18:15:21 2017 +0300 + + Thoughts about new ftp protocol + +commit 32c9e8531436ca2a2e82f9c950952a3cb225591b +Author: cryoflamer +Date: Mon Jul 17 18:13:19 2017 +0300 + + added online/offline presence messages + +commit c5ee914ace3e57c4ccd76d332110dbcc812ede8f +Author: cryoflamer +Date: Mon Jul 17 18:03:57 2017 +0300 + + moved on_disconnected to roster_auth + +commit 738100a9c35986adedbaff72337c7d0cb9770e07 +Author: cryoflamer +Date: Mon Jul 17 18:02:21 2017 +0300 + + fix add_fake_contact + +commit 5b6148d186e419a4ce1bd8c77965113a78d1493d +Author: qomputer +Date: Mon Jul 17 17:49:50 2017 +0300 + + Add request for contact + +commit 650028dee07034a5951ab7f786cfe46fb51db5f9 +Author: ne-luboff +Date: Mon Jul 17 17:07:01 2017 +0300 + + Updated rebar.config. Deleted comment + +commit b1e8c119977a74e3237207603ba56bc16531e03e +Author: ne-luboff +Date: Mon Jul 17 16:14:02 2017 +0300 + + Updated export telesign_api. + Deleted debug TODO comment + +commit a79338980f5b0f7f0c72d4b10b7c37009089e523 +Author: ne-luboff +Date: Mon Jul 17 16:07:16 2017 +0300 + + Deleted excess variable definition: + +commit 94d200dc9bc7f4cccf5100671761426c83c3c1ea +Author: ne-luboff +Date: Mon Jul 17 16:05:49 2017 +0300 + + Set JWT_VALID_DURATION to 90 seconds + +commit 6f24fa9059fd2b9113acda124b09a73fb93a5ed0 +Author: ne-luboff +Date: Mon Jul 17 16:03:31 2017 +0300 + + Updated decode_jwt function + +commit 2a71ff1b2fe1b954bd9891bb60906d2cd45be7c5 +Author: ne-luboff +Date: Mon Jul 17 15:59:17 2017 +0300 + + Added comments to Auto Verify Tests + +commit b9cba641a1323dabaa4f890f09c6729780a4f0b9 +Author: ne-luboff +Date: Mon Jul 17 15:52:39 2017 +0300 + + TeleSign Auto Verify Tests Reordering + +commit 26c3ed8b2ef11998c27a1146799472b09bb068d0 +Author: ne-luboff +Date: Mon Jul 17 15:51:18 2017 +0300 + + deleted debug function (test_auto_verify_status) + +commit b4245ae16a6b167ff6b03fdf7e956b5194e444b5 +Author: ne-luboff +Date: Mon Jul 17 15:50:04 2017 +0300 + + Deleted debug logs + +commit 41f31f504877de9a8ba43813d4c727e9d2334c72 +Author: ne-luboff +Date: Mon Jul 17 15:45:18 2017 +0300 + + Added one more negative telesign auto verify test + +commit b6117acf49bdf2ef822492823e1dfe962e90de05 +Merge: 98a4e72 8e9da5e +Author: ne-luboff +Date: Mon Jul 17 15:39:34 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into telesign_autoverify_api + +commit 98a4e725bcf45e4330ba941e76101dc03e0ee740 +Author: ne-luboff +Date: Mon Jul 17 15:39:18 2017 +0300 + + Updated negative test. Deleted hardcode + +commit 8e9da5e86f0e1b6a916f15322b2b5b3f3d4d5129 +Author: cryoflamer +Date: Mon Jul 17 15:32:57 2017 +0300 + + updated spec of 'Profile' record + +commit 20c8fd5b20bf5993959deb37344ee1b7f613ee6f +Author: ne-luboff +Date: Mon Jul 17 15:27:18 2017 +0300 + + Added negative test for JWT decoding + +commit 9dcb9024f7f0f586bbe91b493cb218fab5c5c851 +Author: ne-luboff +Date: Mon Jul 17 15:21:31 2017 +0300 + + Added auto verify postitive test + +commit 25c1285d88eb54d646de2d8dfff371e90d85a95b +Author: ne-luboff +Date: Mon Jul 17 15:11:28 2017 +0300 + + Replaced parse telesign response function to helpers' section + +commit 7c457bf306fca6bdf2eb94396109a4217e31207f +Author: ne-luboff +Date: Mon Jul 17 15:08:14 2017 +0300 + + Finished telesign get autoverify status function + +commit ba4a4e6f51c77e18a288e9b2af8a46453356dfb4 +Author: ne-luboff +Date: Mon Jul 17 14:47:30 2017 +0300 + + Added comments to telesign auto verify test + +commit 2c47b3cd58aa73df3da919545f87a595bbc03ff7 +Merge: 2e2ce12 53b59b6 +Author: ne-luboff +Date: Mon Jul 17 14:43:57 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into telesign_autoverify_api + +commit 2e2ce128922e442671173734ceed6818f5d975bb +Author: ne-luboff +Date: Mon Jul 17 14:43:08 2017 +0300 + + Intermediate commit + +commit 53b59b62c3ac882152c91dc297eda32a40bc888f +Author: cryoflamer +Date: Mon Jul 17 14:27:28 2017 +0300 + + added sms_code_text to send_sms + +commit f4454858e5388ae618ede3b616d17df94e4d3a7f +Author: ne-luboff +Date: Mon Jul 17 13:51:40 2017 +0300 + + Fixed typo in function name + +commit ad74336f4c2c0cce79bfadc903c554fb85b930d4 +Author: ne-luboff +Date: Mon Jul 17 13:50:44 2017 +0300 + + Updated parse telesign response function (added bad input data scenarios) + +commit e7eda2c180882485d8548f97d64c1e4eeafb27a9 +Author: ne-luboff +Date: Mon Jul 17 13:44:01 2017 +0300 + + Separate telesing response parsing in function + +commit ca67f4845c028e3592cbf75009500d96950cefde +Author: ne-luboff +Date: Mon Jul 17 13:22:39 2017 +0300 + + Added getting telesign response code + +commit 4908b3066b6582dbfdf034bd7d275c106fad4620 +Author: ne-luboff +Date: Mon Jul 17 12:47:40 2017 +0300 + + Updated telesign_auto_verify_get_status_by_xid function + +commit 6bfaea24082a233eeae06d28f8679828477a8fac +Author: ne-luboff +Date: Mon Jul 17 12:39:31 2017 +0300 + + Updated get telesign status by xid method + +commit 2caa6267c32b4ec7b40f8391bf780174b267c47d +Author: ne-luboff +Date: Mon Jul 17 12:28:47 2017 +0300 + + Updated decode_jwt method responses + +commit cf5f8921dd9e3d0fb2a0c0d8e8d0b4a5506b3aaa +Author: ne-luboff +Date: Mon Jul 17 12:11:14 2017 +0300 + + Updated decode_jwt method (considering badmatch error) + +commit 8a9699ece554fc81cf9e78e7fbabed5094925f45 +Author: ne-luboff +Date: Mon Jul 17 12:04:29 2017 +0300 + + Added automatic JWT generation to decode jwt test + +commit 1afde7a21e8ae15a7f7b45a9f0d9d5d986f213cb +Author: ne-luboff +Date: Mon Jul 17 11:44:24 2017 +0300 + + Updated decode JWT method (considering decoding error) + +commit f401ac934a98b2ed63565a47d33cd91160b16874 +Author: Namdak Tonpa +Date: Sat Jul 15 01:18:47 2017 +0300 + + patch API test + +commit e022ce80339c00702d270e40028696670a8ac630 +Author: Namdak Tonpa +Date: Sat Jul 15 00:07:49 2017 +0300 + + fix test + +commit 694190aad6326d69eda653378661cb583374a633 +Merge: 6e225d2 aedf066 +Author: Namdak Tonpa +Date: Fri Jul 14 23:58:55 2017 +0300 + + roster + +commit 6e225d2416f0c07af5b94abcf221e1793cb1dfc5 +Author: Namdak Tonpa +Date: Fri Jul 14 23:58:15 2017 +0300 + + patch API reqested by @motorbit + +commit aedf0664f00446b1e054488e541b7b32947f3476 +Merge: f35b4cb c803ebd +Author: ne-luboff +Date: Fri Jul 14 18:05:59 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into telesign_autoverify_api + +commit f35b4cbcc2ae6895f518aef80710ff0495dabe65 +Author: ne-luboff +Date: Fri Jul 14 18:05:45 2017 +0300 + + Added XID retriving from JWT + +commit c803ebd2423029408c17534ab52d7a8f4a309353 +Author: cryoflamer +Date: Fri Jul 14 18:01:43 2017 +0300 + + temporary replaced send_verify for send_sms + +commit 0e28374847d564be8ea2f13108de27abbb9d81fa +Author: qomputer +Date: Fri Jul 14 17:58:26 2017 +0300 + + Update friend and confirm + +commit 589feedae1e410ebe59b584d8f7c7ca6bf2c9f78 +Merge: bc1c813 dbbaab6 +Author: ne-luboff +Date: Fri Jul 14 17:56:40 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into telesign_autoverify_api + +commit bc1c813cd763ba22b2a85e84c001c0979c4bc0d8 +Author: ne-luboff +Date: Fri Jul 14 17:56:24 2017 +0300 + + Started JWT decoding function updating + +commit dbbaab6e442d55c379f7bedaa5c3000141bc1176 +Author: cryoflamer +Date: Fri Jul 14 17:48:20 2017 +0300 + + added multisession verification + +commit 94dde8e7f9991f3e0dfb8e378602d6c4751d4154 +Author: cryoflamer +Date: Fri Jul 14 14:44:06 2017 +0300 + + added send_to_session + +commit d11475b7d9e07e85c28c5615cf84572b77983181 +Author: ne-luboff +Date: Fri Jul 14 17:24:10 2017 +0300 + + Finished JWT generation + +commit a7b6fdad684a33627de54bdbc9fbc7feb5a590bf +Merge: 87255f8 6b77fab +Author: ne-luboff +Date: Fri Jul 14 17:05:23 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into telesign_autoverify_api + +commit 87255f8f70b4222a5ed2a066e2a39c0a1fa56c16 +Author: ne-luboff +Date: Fri Jul 14 17:05:03 2017 +0300 + + Victory. I got valid JWT + +commit 6b77faba17a81cd7c6429f8fde81bdc70ccb09d1 +Author: cryoflamer +Date: Fri Jul 14 15:48:10 2017 +0300 + + added auth_case_resend_test + +commit 63672ebb40048cc96bbf84e65fb4477ee32e7240 +Author: ne-luboff +Date: Fri Jul 14 15:22:10 2017 +0300 + + Trying with another JWT lib + +commit 1f89e3216938d601537ab8f3bd9f34a10ba5b1da +Author: ne-luboff +Date: Fri Jul 14 14:10:06 2017 +0300 + + Added bta to JWT payload + +commit cc8fccaacbcbe47f7386118d00887e48fb2d4c31 +Author: ne-luboff +Date: Fri Jul 14 13:50:19 2017 +0300 + + Updated get verification status function + +commit e0da45a7a8315bc5db17248499d2e26f1ace6cec +Author: ne-luboff +Date: Fri Jul 14 13:03:36 2017 +0300 + + Decoded JWT claims + +commit 2c2a9470a2b186ef5b866db619249c9598bbe89c +Merge: a105cc3 35e3fe3 +Author: ne-luboff +Date: Fri Jul 14 12:42:43 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into telesign_autoverify_api + +commit 35e3fe36ee5fab8e27502786587c7257f360c23d +Author: qomputer +Date: Fri Jul 14 12:22:42 2017 +0300 + + Fix roster_swift + +commit b49d00fd3f854c42fbdacdaaaad77423e6acd2a9 +Author: Namdak Tonpa +Date: Fri Jul 14 05:45:20 2017 +0300 + + line up + +commit e083162f1f3de762a9faa1487d6966b1593a693a +Author: Namdak Tonpa +Date: Fri Jul 14 05:43:00 2017 +0300 + + roster.swift generated from Erlang + +commit c3bd07fd95a4706ca0b9ec78aef1372161b4d3cb +Author: Namdak Tonpa +Date: Fri Jul 14 04:35:43 2017 +0300 + + generation + +commit c81d86c864774728e9a30c53434d823adc70cb2e +Author: Namdak Tonpa +Date: Fri Jul 14 04:33:41 2017 +0300 + + generation + +commit a2a9653d0a2c0782545dc07c9bfef7531df118c0 +Merge: 3225791 5af82d6 +Author: Namdak Tonpa +Date: Fri Jul 14 03:33:50 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 3225791930fe2544e01c7650c17c0a224e903c58 +Author: Namdak Tonpa +Date: Fri Jul 14 03:33:43 2017 +0300 + + fix tests + +commit 5af82d6a803b845efa0850b18f2ee34f7f24776c +Author: Namdak Tonpa +Date: Fri Jul 14 01:28:53 2017 +0300 + + Update roster.hrl + +commit 7653a621c8766debf76bdab305966750587fd586 +Author: Namdak Tonpa +Date: Fri Jul 14 01:27:17 2017 +0300 + + Update PROJECT.md + +commit 69b4bd3aafc3d6bd0778f42c726d9be5a0463376 +Author: Namdak Tonpa +Date: Fri Jul 14 01:26:53 2017 +0300 + + Update PROJECT.md + +commit 548338d1a50ab022be29ae2449bdaba0fff49270 +Author: Namdak Tonpa +Date: Fri Jul 14 01:06:01 2017 +0300 + + Update PROJECT.md + +commit 612d0e17953e53ea8000ca03f493e02594c8f9c5 +Author: Namdak Tonpa +Date: Fri Jul 14 01:05:26 2017 +0300 + + Update PROJECT.md + +commit 4b6e002b47ec62dfff16aaea5ca3340cc25dfc03 +Author: Namdak Tonpa +Date: Fri Jul 14 01:04:09 2017 +0300 + + Update PROJECT.md + +commit 6db6e76211a2922de1168efe183f7fa347cef5c8 +Author: Namdak Tonpa +Date: Fri Jul 14 01:03:23 2017 +0300 + + Create roster_presense.erl + +commit 0d7af78e1c935e401314d745f12f9b60eb056728 +Author: Namdak Tonpa +Date: Fri Jul 14 01:02:30 2017 +0300 + + Update roster_message.erl + +commit 54ba5de1f58f3b238b5d4514e0d39db50c8f5e9e +Author: Namdak Tonpa +Date: Fri Jul 14 01:02:12 2017 +0300 + + Update PROJECT.md + +commit 9b7264d4c292664887452b900ddbef97cccc7e41 +Author: Namdak Tonpa +Date: Fri Jul 14 00:56:47 2017 +0300 + + Update roster_auth.erl + +commit 86c63df5b3a6090ef8955df0f198a0d24cf6f613 +Author: Namdak Tonpa +Date: Fri Jul 14 00:55:42 2017 +0300 + + Update PROJECT.md + +commit 7c00fbc6983dde0a9d33f267511d43d63cb4ce4a +Author: Namdak Tonpa +Date: Fri Jul 14 00:55:02 2017 +0300 + + Update PROJECT.md + +commit 44a7d69f655caec06a533f76afd585896d63e40e +Author: Namdak Tonpa +Date: Fri Jul 14 00:49:31 2017 +0300 + + Update PROJECT.md + +commit 6551ac5e0ccc6f121b85c996e25dc8e88742d15b +Author: Namdak Tonpa +Date: Fri Jul 14 00:48:48 2017 +0300 + + Update PROJECT.md + +commit 98f38aba9238ec3058c6c2d19160380338cf89a7 +Author: Namdak Tonpa +Date: Fri Jul 14 00:48:23 2017 +0300 + + Create PROJECT.md + +commit 455fdbb5eaafa54d3801e2039bfbfdee76a90685 +Author: Namdak Tonpa +Date: Fri Jul 14 00:24:48 2017 +0300 + + fix #40 + +commit c040fa113ac006582a6cb71c6b31365a0ab94cf6 +Author: Namdak Tonpa +Date: Fri Jul 14 00:07:07 2017 +0300 + + fix #39 + +commit a105cc393d55269f25134f05a92e01c049a4681e +Author: ne-luboff +Date: Thu Jul 13 19:32:09 2017 +0300 + + Test phone number in separate variable + +commit a8b0a5abf8537b18f97ee51c0bddbbbc8ecb8153 +Author: ne-luboff +Date: Thu Jul 13 19:30:04 2017 +0300 + + Started JWT decoding function + +commit a5eea5022b5dbbff4138fd70524bba209430cd44 +Author: ne-luboff +Date: Thu Jul 13 19:10:16 2017 +0300 + + Added telesign endpoint for mobile verification + +commit feced46669b313db749387fc2fc570e83ef978d1 +Author: ne-luboff +Date: Thu Jul 13 19:06:09 2017 +0300 + + Started auto verify status + +commit e1c123edb8b29fc1e2db589119864e2ed1b9acb7 +Author: ne-luboff +Date: Thu Jul 13 18:55:35 2017 +0300 + + Deleted excess code + +commit 4fde07d21847669c90e040280fc1a15f393812b0 +Merge: d77a144 fea141a +Author: ne-luboff +Date: Thu Jul 13 18:52:58 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into telesign_autoverify_api + +commit d77a144b5f010464cf4c0bb637a1fe55233b5c27 +Author: ne-luboff +Date: Thu Jul 13 18:52:42 2017 +0300 + + Added more logs + +commit fea141a15f3f201bf237e1b99af8218a9e924751 +Author: qomputer +Date: Thu Jul 13 18:35:18 2017 +0300 + + Update roster_test + +commit 0be7cf21903c6ee4123612e56e9796162b16224f +Merge: 550e45a bcf2bf3 +Author: cryoflamer +Date: Thu Jul 13 18:32:07 2017 +0300 + + Merge branch 'temp' + +commit bcf2bf34dd09ae94762b4fcd25eb76a733df2eb5 +Author: cryoflamer +Date: Thu Jul 13 18:31:48 2017 +0300 + + added multisession_test + +commit 550e45aa9842d43c5a2ec7331ec516d6fb97af82 +Merge: 61ac37e 892618a +Author: ne-luboff +Date: Thu Jul 13 18:23:20 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into telesign_autoverify_api + +commit 61ac37e2dd79f38ac01ac391677df45862b01faa +Author: ne-luboff +Date: Thu Jul 13 18:03:57 2017 +0300 + + Updated test_auto_verify + +commit f764776b59643fdd4f8e4b5c827230f0649b3266 +Author: ne-luboff +Date: Thu Jul 13 17:59:58 2017 +0300 + + Fixed typo in test name + +commit b7a5c45b7e2a5d1af700c682f46efe247755dd58 +Author: ne-luboff +Date: Thu Jul 13 17:57:10 2017 +0300 + + Added JWT generation + +commit fe26d825a43a0a4cdf65c3b54c498e0f674de502 +Author: ne-luboff +Date: Thu Jul 13 17:30:52 2017 +0300 + + Added JWT lib to project + +commit 892618a5e2629c8d8225fa796dbecb5221053d49 +Author: cryoflamer +Date: Thu Jul 13 16:58:30 2017 +0300 + + tuneup + +commit d266007dc84904f037fc36c11bd899108f9bbb34 +Author: cryoflamer +Date: Thu Jul 13 16:41:50 2017 +0300 + + fix + +commit 3c2d938f3bb629151946ed747717ffca20b2f995 +Author: cryoflamer +Date: Thu Jul 13 16:30:47 2017 +0300 + + fix session_not_found + +commit 5de3a653331decc7119d4b60fba353e2fa2def6d +Author: qomputer +Date: Thu Jul 13 16:08:18 2017 +0300 + + Fix for get profile + +commit 1db78f548204b440a3cd362805840d4e5c5a633e +Author: ne-luboff +Date: Thu Jul 13 16:01:44 2017 +0300 + + Updated existing telesign tests + +commit 723acd8790f1bd6216aeb486692c18f8e1f6807d +Author: ne-luboff +Date: Thu Jul 13 15:53:53 2017 +0300 + + Separated Customer_key decod (in single function) + +commit 6192839d362c95facc22d0de3cb39b0a34dcdcc4 +Author: ne-luboff +Date: Thu Jul 13 15:46:52 2017 +0300 + + Started Telesign Auto Verify Handler. Updated unique generator + +commit be1062bf0e157a431b31aa477f465469b271ddd6 +Author: cryoflamer +Date: Thu Jul 13 15:14:28 2017 +0300 + + fix create_profile + +commit da22603d745a861f463e5b90aac9fa9a38281c73 +Author: cryoflamer +Date: Thu Jul 13 14:31:58 2017 +0300 + + fix roster_test + +commit f9319047d1377584c532f475ac003ef116a86d31 +Author: cryoflamer +Date: Thu Jul 13 14:25:51 2017 +0300 + + added reg_case_test + +commit bae9ee95c38b8331a8eb3d1ef57d1503ad52d541 +Merge: 0a990cd 2ea5381 +Author: ne-luboff +Date: Thu Jul 13 13:53:52 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into amazon_upload_api + +commit 0a990cd7320588eba7d7955254d03680781c7899 +Author: ne-luboff +Date: Thu Jul 13 13:53:14 2017 +0300 + + Updated amazon_api file formating + +commit 41319b41652ad0ec0cad855399b7f2b0c1617885 +Author: ne-luboff +Date: Thu Jul 13 13:52:12 2017 +0300 + + Updated export (amazon_api) + +commit 390cd82b02cc93059d9600a72b1303a55a66e74d +Author: ne-luboff +Date: Thu Jul 13 13:50:19 2017 +0300 + + Added unique key processing to AWS upload function + +commit 697aebcc02fafd3874e1f0eae8fc0e1d9906053d +Author: ne-luboff +Date: Thu Jul 13 13:32:51 2017 +0300 + + Added function for unique filename + +commit db7233ad97da86adb996ee8cd7afc38c9a4c1598 +Author: ne-luboff +Date: Thu Jul 13 13:12:23 2017 +0300 + + returned n2o_ftp protocol to sys.config file + +commit e496e2cddfd2e3722c6b3564f80fe31cb7111dcc +Author: ne-luboff +Date: Thu Jul 13 13:11:18 2017 +0300 + + Replaced ftp record with xftp record + +commit 2ea53819885ad00bf43f857264fc37f2c151ee1c +Author: Namdak Tonpa +Date: Thu Jul 13 13:07:34 2017 +0300 + + nameless tuple + +commit d97ef914d51d208052fa5a4b4d2e0c52c182c3a5 +Merge: 23e6285 539cda1 +Author: Anton Makarov +Date: Thu Jul 13 12:48:37 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit 23e6285ed8fb94150ec8455324f61bc1df14ba76 +Author: Anton Makarov +Date: Thu Jul 13 12:48:24 2017 +0300 + + wip + +commit 539cda19d198e4d4b004eb60e08b4f0098806b46 +Author: 5HT +Date: Thu Jul 13 00:53:02 2017 +0300 + + profile status get + +commit 78c7187cd875e2b7a71a5abe98c5dd19d870e3be +Author: Anton Makarov +Date: Wed Jul 12 22:03:38 2017 +0300 + + Nynja Parser + +commit 6a223cc07b1630459585c4445d7e7aa9547fb533 +Author: Namdak Tonpa +Date: Wed Jul 12 21:52:56 2017 +0300 + + Binary -> String + +commit 8f575bd3efbcf71a17c2e491a1df70bcce00fecc +Author: Namdak Tonpa +Date: Wed Jul 12 21:49:14 2017 +0300 + + parser.swift + +commit 81126f7e1f8f2bd9d0e729740cd085ba8924b6d5 +Author: Namdak Tonpa +Date: Wed Jul 12 20:42:40 2017 +0300 + + swift + +commit b2e86822ec9ca0ee8ce806532e661b9a8c17049c +Merge: 30e061e 7236578 +Author: Namdak Tonpa +Date: Wed Jul 12 20:21:30 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 30e061eb75575ec5fdbda6379c1d7d371b925cca +Author: Namdak Tonpa +Date: Wed Jul 12 20:21:23 2017 +0300 + + swift parser + +commit 72365781256744fc4cee2c2086266826e14fec93 +Author: qomputer +Date: Wed Jul 12 20:16:24 2017 +0300 + + Fix tests + +commit 808b3bd802dcb993cab32b4225bf04a583e0aac8 +Author: cryoflamer +Date: Wed Jul 12 20:02:55 2017 +0300 + + added session_not_found to auth_case_test + +commit 5767e7178710dc5ce276e87026f5547b1b1d7cc3 +Author: ne-luboff +Date: Wed Jul 12 19:57:30 2017 +0300 + + Defined exchanged FTP protocol. TODO - update record fields and processing + +commit 0539cb57bfee4420ee7fa18aec578ddd6710d858 +Author: qomputer +Date: Wed Jul 12 19:54:45 2017 +0300 + + Fix contact add + +commit 9f704c2d9ebe06bf8138787f3e0521ab1a501b6a +Merge: b2fb93c 633b725 +Author: Namdak Tonpa +Date: Wed Jul 12 19:26:39 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit b2fb93c7cea9c28a0216e917bdac438ea37e3236 +Author: Namdak Tonpa +Date: Wed Jul 12 19:26:32 2017 +0300 + + fix + +commit 87f1657ba92ad6d2398810b5e4d5afa148b913e3 +Author: ne-luboff +Date: Wed Jul 12 17:27:19 2017 +0300 + + Added uploading to S3 in ftp protocol + +commit 831277feaab0c5a86f025f5dccbbbe04e3493af6 +Author: ne-luboff +Date: Wed Jul 12 16:53:13 2017 +0300 + + Updated FTP protocol. Deleted excess tabs (~n) + +commit 6b40eafbe9f157102a8261c4600b9705f688319c +Author: ne-luboff +Date: Wed Jul 12 16:49:35 2017 +0300 + + Updated FTP protocol, replaced io:format with ?LOG + +commit 848a6c8a5bdb7ed1f2397c9360a3ec2f363016fb +Author: ne-luboff +Date: Wed Jul 12 16:35:13 2017 +0300 + + Updated ftp protocol file formating + +commit ca80bfefbcb8adf69c5b695f5c94576c401f609e +Author: ne-luboff +Date: Wed Jul 12 16:29:07 2017 +0300 + + Renamed file roster_n2o_ftp.erl -> roster_ftp.erl + +commit b241ccef305417e55777017e0bb21826dabe4d01 +Author: ne-luboff +Date: Wed Jul 12 16:25:55 2017 +0300 + + Added new ftp protocol (replaced n2o_ftp with roster_n2o_ftp). Updated roster upload settings + +commit 633b7256e90488d79612a76241d134deb8fbfa41 +Author: cryoflamer +Date: Wed Jul 12 16:02:07 2017 +0300 + + updated auth_case_test + +commit 74086a2c0f42440d2542d4e44f18fe6d9078a1a4 +Author: Namdak Tonpa +Date: Wed Jul 12 15:33:55 2017 +0300 + + roster api + +commit c325c8ad022a2926e5e35b68ffaed78c8f42ea3e +Merge: 69ad344 5a3fde8 +Author: Namdak Tonpa +Date: Wed Jul 12 14:59:54 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 69ad3446820c065eadc4f750d4c343d38467e32c +Author: Namdak Tonpa +Date: Wed Jul 12 14:59:46 2017 +0300 + + contact.avatar + +commit 5a3fde803ffb84b838f4d601b61071ae265ca05e +Author: qomputer +Date: Wed Jul 12 13:58:10 2017 +0300 + + Update behavior on disconnect + +commit 2335a22bdd55d7483e7fee13d9aaf3b5f04e2359 +Author: Namdak Tonpa +Date: Wed Jul 12 03:40:59 2017 +0300 + + io,ok|error + +commit e42b4b6aceec9a1b9865c9b28eaca165c8dba947 +Author: Namdak Tonpa +Date: Wed Jul 12 03:31:47 2017 +0300 + + io protocol + +commit a6680044aea40d82a8a12ba5a00b1c5cc5b447d1 +Author: Namdak Tonpa +Date: Tue Jul 11 23:41:50 2017 +0300 + + add Token to already_registered + +commit 232bd8616006d555000576c173093826df4ce50f +Author: Namdak Tonpa +Date: Tue Jul 11 18:04:48 2017 +0300 + + actions/vsn/.. events/vsn/// + +commit 63c912d3e51946e4545de4f7fb6ad18d75a1c6cc +Author: Namdak Tonpa +Date: Tue Jul 11 17:59:21 2017 +0300 + + actions/1/... + +commit d097158662e3a15f3a03b7fd29bc248f2b67f509 +Author: Namdak Tonpa +Date: Tue Jul 11 17:25:10 2017 +0300 + + profile methods is public + +commit 87bf1223e5475370438705806ed24e68afb8a14d +Author: qomputer +Date: Tue Jul 11 15:54:22 2017 +0300 + + Fix roster:authorized + +commit fc97783fb60344bdcbcc9093bce8025306b6b3f4 +Author: qomputer +Date: Tue Jul 11 14:56:57 2017 +0300 + + Fix my merge + +commit 55b3a97971e16805767c72f6566aa822f215c0da +Author: qomputer +Date: Tue Jul 11 14:48:37 2017 +0300 + + Fix session_not_found + +commit bce82608ef10502a4df4d57c7df5c8d60735df3e +Merge: 6f15281 7148522 +Author: 5HT +Date: Tue Jul 11 12:39:36 2017 +0300 + + fix merge + +commit 6f152811aeef2a74eaaf535f6ee531e89feb3b6e +Author: 5HT +Date: Tue Jul 11 12:35:51 2017 +0300 + + fix kvs:index for ClientId + +commit 7148522d13b2a21a8d14778a08d5c0d68b9183a8 +Author: Namdak Tonpa +Date: Tue Jul 11 03:50:23 2017 +0300 + + remove macros + +commit 36bec7a121199e9df2a6d0e7abe4f28d91ec0ff2 +Author: Namdak Tonpa +Date: Tue Jul 11 01:39:46 2017 +0300 + + review AUTH + +commit eb3d0c40b0035506a9dcb45e9084a0322d5b0e9c +Author: Namdak Tonpa +Date: Mon Jul 10 20:15:12 2017 +0300 + + fix + +commit ce3a74fa1180109389c3a45bfd33829995017c4b +Author: 5HT +Date: Mon Jul 10 20:13:56 2017 +0300 + + server + +commit abbd861dc0ff49aea8ac59b547de4edb6205acd0 +Author: Namdak Tonpa +Date: Mon Jul 10 19:29:29 2017 +0300 + + don't check auth on remove roster + +commit ec73fe4b5b703f527f9b09c4c004074a95e48431 +Author: Namdak Tonpa +Date: Mon Jul 10 19:24:02 2017 +0300 + + don't check auth on remove roster + +commit 5d36a540adc5442adb0d5c2acb3cb4fd7398a402 +Author: Namdak Tonpa +Date: Mon Jul 10 18:42:48 2017 +0300 + + fix test + +commit 2369eed78f9b2ef91354bec2874337c27f5cbc25 +Merge: ef86757 44ba6c6 +Author: Namdak Tonpa +Date: Mon Jul 10 18:41:56 2017 +0300 + + test + +commit ef867571b4ed0d3801a84a92692cab274a852e0d +Author: Namdak Tonpa +Date: Mon Jul 10 18:41:20 2017 +0300 + + merge + +commit 44ba6c6e8cf2562e0657419eb7f496afce9a85f0 +Author: qomputer +Date: Mon Jul 10 18:11:38 2017 +0300 + + Fix tests + +commit 5fbed51fbdab779413437842bc6949a84e5b4acf +Author: Namdak Tonpa +Date: Mon Jul 10 17:52:15 2017 +0300 + + sleep fix + +commit 238684330b9e4616daf393713a12c43bbdc4e293 +Merge: f2523fe 10dca63 +Author: Namdak Tonpa +Date: Mon Jul 10 17:34:10 2017 +0300 + + merge, fixbui;d + +commit f2523febfb163be30e59ef1e2d5c24e82fd7d7ad +Author: Namdak Tonpa +Date: Mon Jul 10 17:32:52 2017 +0300 + + retrieve nested profile + +commit 10dca63696ce317a3ef3c1366978407a99553fb4 +Author: cryoflamer +Date: Sun Jul 9 18:16:52 2017 +0300 + + updated roster_test:auth_case_test + +commit 26e310151061527f636ebefe1a2a108222d6d6f5 +Author: cryoflamer +Date: Sun Jul 9 16:50:27 2017 +0300 + + moved roster_auth:start() to send_sms + +commit eb447978d8f747a0bd3438349cd598f94a8bbb9e +Author: qomputer +Date: Sat Jul 8 19:33:52 2017 +0300 + + Update create_profile, fix test_roster + +commit a85c49d3a16a6189ae6169a8f20dbf2207732ea2 +Author: Namdak Tonpa +Date: Sat Jul 8 18:45:56 2017 +0300 + + todo + +commit 02b6fb84db4bdeba10f5c283620ad882b5b683b5 +Author: Namdak Tonpa +Date: Sat Jul 8 13:20:58 2017 +0300 + + cleanup logs + +commit d1719a5e779b74e72e7bd1f9746516d25c6171e8 +Author: Namdak Tonpa +Date: Sat Jul 8 05:04:50 2017 +0300 + + friend authorized + +commit e714766a2f8297adf3c19898cac812941fc3793e +Author: qomputer +Date: Fri Jul 7 18:20:24 2017 +0300 + + Fix misc_test_roster. + +commit 0de3e7fa56daf17feeb65b129f05cb72d7ade2da +Author: cryoflamer +Date: Fri Jul 7 17:59:46 2017 +0300 + + removed delete_user + +commit a88e59cf66534aecc1ea8fdc8c4b54e054b829ee +Author: qomputer +Date: Fri Jul 7 17:53:07 2017 +0300 + + Fix purge_user. + +commit f42102bb54e6f898a3c301df93f5d2ef95b23f48 +Merge: 73d9941 cda2ebc +Author: qomputer +Date: Fri Jul 7 17:31:09 2017 +0300 + + Fix misc_test_roster. + +commit 73d99413177852d7545f43cb427b665b81fbd3d1 +Author: qomputer +Date: Fri Jul 7 17:15:49 2017 +0300 + + Add handlers to roster for UNK + +commit cda2ebccf13d95e18e609654f7937e8bec97078c +Author: qomputer +Date: Fri Jul 7 17:15:49 2017 +0300 + + Add handlers to roster for UNK + +commit 8e0f2e540b039c461693144b990c2e15bdd9159d +Author: cryoflamer +Date: Fri Jul 7 17:14:44 2017 +0300 + + added log to test_roster + +commit f141323e6bd2ad7cce1cef574d2b6480c97d43c0 +Author: cryoflamer +Date: Fri Jul 7 17:03:02 2017 +0300 + + updated test_auth + +commit 14c02344dec8c21a62f35a716a6d357b5d391410 +Author: cryoflamer +Date: Fri Jul 7 17:00:42 2017 +0300 + + fixed delete_user + +commit 805bba02ebb9d37321fdaf1871919ae01dc7365b +Author: qomputer +Date: Fri Jul 7 16:21:53 2017 +0300 + + Fix purge_user and remove_roster + +commit b0916a36ee2061293eea9fe8b28b1891dd4b8a3a +Author: cryoflamer +Date: Fri Jul 7 15:50:12 2017 +0300 + + added delete_user to roster_auth:info + +commit 32a8c21bf6d7fa21867aa180e0f6e3ee81104f9c +Author: cryoflamer +Date: Fri Jul 7 15:45:55 2017 +0300 + + fixed purge_user + +commit e8f604b60d04d7deeea5cfc95b962a81b8ccbb14 +Author: cryoflamer +Date: Fri Jul 7 14:46:46 2017 +0300 + + fixed roster_auth + +commit 576ac2871fc836c54a8f589dbc340b69831121cf +Author: qomputer +Date: Fri Jul 7 13:36:23 2017 +0300 + + Fix handlers and tests for roster + +commit 35b31985ba81164727376769bdf7aa40f29f59ba +Author: cryoflamer +Date: Fri Jul 7 13:19:01 2017 +0300 + + fixed roster_test + +commit ac42ffbbe0453f010063e1e642933e89543872f1 +Author: cryoflamer +Date: Fri Jul 7 12:55:05 2017 +0300 + + removed flood logs + +commit 0729113997297a2d8800ea52643ef54a1c78878b +Author: cryoflamer +Date: Thu Jul 6 19:05:24 2017 +0300 + + set dev_key as first index + +commit 5ee1069713c4d6caa3fbbe8696cef65bb68c346f +Author: qomputer +Date: Fri Jul 7 12:06:53 2017 +0300 + + Add general_test_roster + +commit 7f5f941d9a69c89d4b37aea9b0c43f54aecef4b7 +Author: cryoflamer +Date: Thu Jul 6 18:06:01 2017 +0300 + + updated roster:send_event for new "evens//..." + +commit 1eb78ee9af82f6abf3e02128206210c3046a55cb +Author: cryoflamer +Date: Thu Jul 6 16:34:31 2017 +0300 + + fixed session_not_found + +commit 73b8494dd09cfd4ec84afb96978bcac6025794fa +Author: qomputer +Date: Thu Jul 6 14:11:49 2017 +0300 + + Fix tests of Roster + +commit 38e60a1c89029c82940f5e8504c9f6bf5be252dd +Author: cryoflamer +Date: Thu Jul 6 13:33:04 2017 +0300 + + moved resend to info + +commit bd6efdf8e2b24f3c2d467786556cce8e52cf1b42 +Author: cryoflamer +Date: Thu Jul 6 13:24:55 2017 +0300 + + applied async sms send + +commit a6c3a70e05501d9f5ebd1c2e56fabca32735a980 +Author: qomputer +Date: Wed Jul 5 23:53:46 2017 +0300 + + Add test_del_contacts() and unsubsribe p2p, fix test_roster and delete contacts + +commit fe384b8ad3613c3fab6a3ce8b9ccb317d1d391f1 +Author: cryoflamer +Date: Wed Jul 5 18:36:03 2017 +0300 + + moved verify fun to info + +commit 084af963985145c0fcb3b0735a7034f0e9dbeb7a +Author: cryoflamer +Date: Wed Jul 5 18:21:07 2017 +0300 + + removed #auth_state + +commit 8fad93e7fa4f734cd94f92b8afdc99d3cc124dc3 +Author: cryoflamer +Date: Wed Jul 5 16:43:50 2017 +0300 + + added helper n2o_async for telesign sms sending + +commit c032495fae6a080526df01fc2a3f520df80f7df0 +Author: Namdak Tonpa +Date: Wed Jul 5 16:04:40 2017 +0300 + + enable INGLIGHT logs + +commit 9b39844c62c241d5a5fa5c29463afa4600fe0b87 +Author: cryoflamer +Date: Wed Jul 5 15:48:04 2017 +0300 + + changed answer for resend_sms + +commit 11a08799244734e17798a1253ba0bab328b372f9 +Author: cryoflamer +Date: Wed Jul 5 15:43:56 2017 +0300 + + merged session_not_found and verify_session_not_found + +commit ccdaf8be1a186b8437c724e4596d2a1c37618b07 +Author: cryoflamer +Date: Wed Jul 5 15:43:13 2017 +0300 + + updated purge_user + +commit e8fc8157ef92b85c1665b80bdd3e644abb8d268c +Author: cryoflamer +Date: Wed Jul 5 14:53:55 2017 +0300 + + merged verify_session_found and session_found + +commit 67c2baf9493e7914b1258c525fa22281896ebca4 +Author: cryoflamer +Date: Wed Jul 5 14:04:48 2017 +0300 + + replaced verify and resend_sms for #'Auth'{type=verify/resend_sms} + +commit 36ed441b86c8dd71a826e384fd7c0f5d3f5e3331 +Author: Namdak Tonpa +Date: Wed Jul 5 05:18:25 2017 +0300 + + cleanup test + +commit e45a51f870d0f9dc9cd22bb2039aabc262a3298b +Author: Namdak Tonpa +Date: Wed Jul 5 05:09:00 2017 +0300 + + cleanup test + +commit c6822b9c5cce446fbed7703fb470d12b7657584b +Author: Namdak Tonpa +Date: Wed Jul 5 05:05:46 2017 +0300 + + test offline message delivery + +commit 1830931496ad77973ba507b6cbef3c19e3826170 +Merge: ea3c4ad 42ad99a +Author: Namdak Tonpa +Date: Wed Jul 5 02:39:58 2017 +0300 + + respect io protocol + +commit ea3c4ad9ee725a38dbd403bce780a93f2cd99e74 +Author: Namdak Tonpa +Date: Wed Jul 5 02:39:12 2017 +0300 + + respect io protocol + +commit 42ad99a4f1e7c57cc93afe11acfe7a02c73b28f5 +Author: qomputer +Date: Wed Jul 5 02:21:21 2017 +0300 + + Fix subscribe_p2p + +commit 2f063530e36375bc40d97c7781e1b92e661fd643 +Author: Namdak Tonpa +Date: Tue Jul 4 21:28:12 2017 +0300 + + offline messages test + +commit ba75e50183de22650eab57274c9959aea4456f79 +Author: cryoflamer +Date: Tue Jul 4 20:10:19 2017 +0300 + + updated io answers + +commit 10d232d144279386f0b7aecba1bdd09658f76d03 +Author: qomputer +Date: Tue Jul 4 19:25:18 2017 +0300 + + Fix Friend->Roster + +commit 9e37e89f708fd3e4ef4c97148b2a7fe071df2a87 +Author: cryoflamer +Date: Tue Jul 4 19:07:24 2017 +0300 + + fixed send_verify + +commit 7cdd634f8f581f911c57464494da8a8839da65d4 +Author: cryoflamer +Date: Tue Jul 4 18:46:32 2017 +0300 + + added auth for register fake phones + +commit 10e7da1bfd5d401e0fd1cb3b2348c394fc72b7fd +Author: cryoflamer +Date: Tue Jul 4 18:00:39 2017 +0300 + + fix delete_sessions + +commit f76fa6cc53f89836538d0cda37f59574f328ca91 +Author: cryoflamer +Date: Tue Jul 4 17:57:37 2017 +0300 + + added purge_user + +commit 32dd74687af5dec4f7b4e78037f8817dcfe255ba +Author: Namdak Tonpa +Date: Tue Jul 4 17:53:51 2017 +0300 + + cleanup + +commit 0e0bb7b2e066476168c3da85b139d9c04c0fcb26 +Author: Namdak Tonpa +Date: Tue Jul 4 17:52:57 2017 +0300 + + cleanup + +commit 4a052171ffc3fc563f31461e7f247516bfc94569 +Author: Namdak Tonpa +Date: Tue Jul 4 17:42:48 2017 +0300 + + remove init + +commit 431ab49a0f62ab124a555cbf88bfb7722e54a797 +Author: Namdak Tonpa +Date: Tue Jul 4 17:34:12 2017 +0300 + + Contact.status + +commit 6ae2698251f00ed611239adaffa43306c8b97743 +Author: Namdak Tonpa +Date: Tue Jul 4 17:26:37 2017 +0300 + + WE WILL USE OUR OWN VALIDATION FUNCTION NOT EMQ ACLs + +commit 171427a512aa57bb8f712bdc79d9384f7756809b +Author: Namdak Tonpa +Date: Tue Jul 4 17:21:15 2017 +0300 + + PERSON API + +commit a793c2103354942c9d873a6dc24f4bc7a1cbd86c +Merge: 3e94ed7 cb37bbf +Author: Namdak Tonpa +Date: Tue Jul 4 17:07:45 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 3e94ed78a65cb8cc093412b8958bdd9d11f33860 +Author: Namdak Tonpa +Date: Tue Jul 4 17:07:35 2017 +0300 + + Profile Code Review + +commit cb37bbf59cce3530878d96423fefc406cb042546 +Merge: 969b4e2 c44ca19 +Author: ne-luboff +Date: Tue Jul 4 16:49:45 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into amazon_upload_api + +commit c44ca1900cd2501fcba8341362d287c854b89401 +Author: Namdak Tonpa +Date: Tue Jul 4 16:43:45 2017 +0300 + + REMOVE + +commit 969b4e233aad483ac1e0d28d12d86a8ebe8262a8 +Author: ne-luboff +Date: Tue Jul 4 16:24:04 2017 +0300 + + Changed Amazon S3 buckets + +commit 63aaae9a8c5a02740b3cdaaec9bddbb855dec45b +Author: Namdak Tonpa +Date: Tue Jul 4 15:58:19 2017 +0300 + + list rosters + +commit 4ba6a79bfa307201fd90285f0ce8055815389d37 +Merge: 4b13a8b 2e536b6 +Author: Namdak Tonpa +Date: Tue Jul 4 15:55:06 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 4b13a8b4fa229e9cd1fb108d45ebdd671ccc860c +Author: Namdak Tonpa +Date: Tue Jul 4 15:54:51 2017 +0300 + + Reviewed ROSTER API + +commit 2e536b64a6101fc2ca14aa2a01af53540a43ee08 +Author: cryoflamer +Date: Tue Jul 4 15:43:53 2017 +0300 + + added delete_sessions + +commit 1791e46a983fbcb8cc96d543f17eba25bd8bb9cd +Author: Namdak Tonpa +Date: Tue Jul 4 15:37:17 2017 +0300 + + logs + +commit 0647b4831826ff2a2311ffd68329caae3ee516ef +Author: ne-luboff +Date: Tue Jul 4 15:35:23 2017 +0300 + + Deleted excess code + +commit be44c4c3705e353fb07e0cfed4d0b3d8eafa1cec +Author: Namdak Tonpa +Date: Tue Jul 4 15:34:38 2017 +0300 + + person logs + +commit b793670ecccff4ae49be6a0c9e9d07112296027b +Author: Namdak Tonpa +Date: Tue Jul 4 15:33:19 2017 +0300 + + wip + +commit 4d7a0df8c6e0be20de4573ccac02cdb5db5bf957 +Author: ne-luboff +Date: Tue Jul 4 15:31:32 2017 +0300 + + Finally removed ercloud lib. Refactored existing amazon api helper and it test + +commit 1f29a3c44dab35d04321021f2b898a2e7b058549 +Author: Namdak Tonpa +Date: Tue Jul 4 15:30:52 2017 +0300 + + proper log message + +commit 4bd2de7e9bef5d6deb97a78dbc0314c44cf56d3b +Author: Namdak Tonpa +Date: Tue Jul 4 15:28:12 2017 +0300 + + switch protocol + +commit c99e0bfc85c1cd485b3fc857039aa86830d23459 +Author: Namdak Tonpa +Date: Tue Jul 4 15:10:37 2017 +0300 + + cleanup roster API + +commit 962805876c9e3f2a7273a99ab20ea60944f710cc +Author: Namdak Tonpa +Date: Tue Jul 4 15:09:43 2017 +0300 + + cleanup roster API + +commit c5c6f5bac0a77123ef5e4952df14987478a402d6 +Author: Namdak Tonpa +Date: Tue Jul 4 14:10:22 2017 +0300 + + remove Roster.user_id + +commit 7b63cdd805f03fceb6d18723c4ef489a9af5c2bd +Author: Namdak Tonpa +Date: Tue Jul 4 13:58:34 2017 +0300 + + authorized Roster by Token + +commit 910e622fc4e3d11e71af1b82ad2e30354ef7f57d +Author: Namdak Tonpa +Date: Tue Jul 4 13:33:22 2017 +0300 + + more strict impl (let it crash on error) + +commit acd49215c3a35815a85862bc7396346745fecddb +Author: Namdak Tonpa +Date: Tue Jul 4 13:31:19 2017 +0300 + + extend test + +commit 8e238315dc813d3440827f154bcbcf5c3f4e1562 +Author: Namdak Tonpa +Date: Tue Jul 4 13:28:29 2017 +0300 + + multiple contacts roster handling + +commit 4c14668f290eae6448994c5face36111cd3c2c78 +Author: Namdak Tonpa +Date: Tue Jul 4 13:10:25 2017 +0300 + + remove_contacts + +commit 8e68a729466295188b9840b9a2c78f9b0c45f5dd +Author: Namdak Tonpa +Date: Tue Jul 4 12:44:17 2017 +0300 + + #Roster.subscribe = true (default) + +commit 663df28d2e93d9c7cb5c94b212c66c135b68e7a9 +Author: Namdak Tonpa +Date: Tue Jul 4 11:58:14 2017 +0300 + + remove iterator from Contact + +commit a492190d59021f6b70b4f9d80c64ec21f6ca3703 +Author: Namdak Tonpa +Date: Tue Jul 4 07:27:12 2017 +0300 + + cleanup + +commit 006823986b1dc8264870bc10be8d3a70f5834c83 +Author: Namdak Tonpa +Date: Tue Jul 4 07:22:35 2017 +0300 + + refactoring AUTH + +commit c14e1019dac4a27b59ced0948b402ed1019faff0 +Author: Namdak Tonpa +Date: Tue Jul 4 07:02:37 2017 +0300 + + refactor AUTH + +commit ad4fc37b44280a870b5e1f1f84ab66df38b8d5d9 +Author: Namdak Tonpa +Date: Tue Jul 4 06:09:53 2017 +0300 + + TOTAL ROSTER CLEANUP + +commit 8e3e7dc3c5b229644d01d95cdb0cb56b56b6f2a1 +Author: Namdak Tonpa +Date: Tue Jul 4 05:46:05 2017 +0300 + + change roster:add_user to roster:create_profile (new API) + +commit d227d5b757235c9a3c27c549b88e37481d614b26 +Author: Namdak Tonpa +Date: Tue Jul 4 05:34:17 2017 +0300 + + fix tests + +commit 10d3589a2546c82fdea1d07d05d12ca6e990a8a1 +Author: Namdak Tonpa +Date: Tue Jul 4 03:54:16 2017 +0300 + + roster api test + +commit 44e23f5a1e76274175bb4d0668bc3903a0bf20bd +Author: Namdak Tonpa +Date: Tue Jul 4 03:50:48 2017 +0300 + + roster test + +commit c0fc4f6005321f1e66441eee934709592265fc87 +Author: Namdak Tonpa +Date: Tue Jul 4 03:39:29 2017 +0300 + + ROSTER API TESTS + +commit 04dec7f6b2b6b9c1100ec4923d8491ec76027ec3 +Author: Namdak Tonpa +Date: Tue Jul 4 02:44:24 2017 +0300 + + NEW ROSTER API by 5HT drop in replacement + +commit 2c61f1467cf79514397e8f1dd9dc1d552ea927ee +Author: Namdak Tonpa +Date: Tue Jul 4 01:51:54 2017 +0300 + + TOTAL CLEANUP + +commit 400ed0f543fbddff9760a00b89ca5852f9c1f558 +Author: Namdak Tonpa +Date: Tue Jul 4 01:47:43 2017 +0300 + + cleanup + +commit 00b6cfbe6259f99f4d48dd8a77086c2e1239464a +Author: Namdak Tonpa +Date: Tue Jul 4 01:33:34 2017 +0300 + + fix test + +commit c344179bdd38e7e3626e9868752e31dbcd6c5c25 +Author: ne-luboff +Date: Mon Jul 3 23:36:14 2017 +0300 + + changed aws s3 lib (ercloud -> mini_s3) + +commit 13cea532c8ac15b2a0091c676e50df79a4c7847f +Author: Namdak Tonpa +Date: Mon Jul 3 23:34:33 2017 +0300 + + names surname in roster + +commit 5a6e32b5de495627c7dfafeef4c278fbceb056fe +Author: Namdak Tonpa +Date: Mon Jul 3 22:58:44 2017 +0300 + + move docs to protocol + +commit f9b08b0dd358daed88f9df3b646101e1f334ba13 +Author: Namdak Tonpa +Date: Mon Jul 3 22:43:34 2017 +0300 + + remove orphan code + +commit 01472b34c34840e3d936a3d67e184d3927f1cf48 +Merge: 8280740 c1312f5 +Author: Namdak Tonpa +Date: Mon Jul 3 22:34:37 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 828074001c52a5c53e9398320952d040f803062e +Author: Namdak Tonpa +Date: Mon Jul 3 22:34:22 2017 +0300 + + fix verified + +commit c1312f58508cc9362996878b142011933ac9e34f +Author: qomputer +Date: Mon Jul 3 20:05:28 2017 +0300 + + Add variant 'roster_unconditional' and fix test_roster + +commit f0d04adf7a5e4e3a03c4518d1f6262beb816dbaf +Author: cryoflamer +Date: Mon Jul 3 19:56:41 2017 +0300 + + added auth_case_test2 + +commit b08ebac66c05f1fe767f8f416846feaeea4f4542 +Author: cryoflamer +Date: Mon Jul 3 17:30:58 2017 +0300 + + added default handler for proc({publish..., and simple_p2p_test + +commit 18e0ef696cf8f41f425185ac1cef55f8a982d355 +Author: qomputer +Date: Mon Jul 3 16:34:32 2017 +0300 + + Fix roster_test + +commit 1bd87859dd7a22af3c05ee75fef67bdf89c28590 +Author: Namdak Tonpa +Date: Mon Jul 3 16:21:28 2017 +0300 + + add History to test + +commit e35810c8a38cbb5fee756a50ec644fe8cbf443cd +Author: Namdak Tonpa +Date: Mon Jul 3 16:19:32 2017 +0300 + + be sync + +commit cecad560aeb428e73fe34d8cc2f70e5de7092f2d +Author: Namdak Tonpa +Date: Mon Jul 3 15:31:07 2017 +0300 + + history + +commit 2001c6799b32d6ae52f5e3975be215996e4df159 +Author: Namdak Tonpa +Date: Mon Jul 3 15:16:08 2017 +0300 + + remove unused files + +commit 5608511f3c88eca32dd4b3d62387a6329899c36c +Author: Namdak Tonpa +Date: Mon Jul 3 14:46:41 2017 +0300 + + chain + +commit a05fc1cc931f0477ac9a9170b8679c798d9ac15f +Author: Namdak Tonpa +Date: Mon Jul 3 14:38:38 2017 +0300 + + roster test fixed + +commit d9187c9b3ee675918b803621ac3c91dc98e6db52 +Author: Namdak Tonpa +Date: Mon Jul 3 14:32:02 2017 +0300 + + WRONG API NOTES + +commit 8747bc3f19c580dc19b59ac4cb2607de83435208 +Author: Namdak Tonpa +Date: Mon Jul 3 14:31:20 2017 +0300 + + fix WRING friend API + +commit 15ab1e1a667f65d59a31cdc5dfc38eb59ac35958 +Author: Namdak Tonpa +Date: Mon Jul 3 14:26:09 2017 +0300 + + fix crash + +commit 78d77244b563817124ec6963713ff59212b64f7f +Author: Namdak Tonpa +Date: Mon Jul 3 14:24:56 2017 +0300 + + disable message hooks + +commit f46f774a36387de13a6f510a1aac1d0bb23c8698 +Author: Namdak Tonpa +Date: Mon Jul 3 14:19:38 2017 +0300 + + test + +commit 59e8aff1a6770c9365e78c9e5975aeea0da9fcf3 +Author: Namdak Tonpa +Date: Mon Jul 3 14:17:11 2017 +0300 + + test + +commit 0cba46dd5a830643aeeb6692ad8f13d62a9faf7a +Author: cryoflamer +Date: Mon Jul 3 14:11:07 2017 +0300 + + added on_auth call for fake and verified requests + +commit 0b425f4492134018ca7a54a094125ff60e6a9241 +Author: Namdak Tonpa +Date: Mon Jul 3 13:27:27 2017 +0300 + + Correct Friend Test + +commit 5d7efffb593c591274735075783af3e05c592835 +Author: Namdak Tonpa +Date: Mon Jul 3 12:39:19 2017 +0300 + + P2PINVITE + +commit 6c227ae7c89f1addba0862f60063fd94397f8f04 +Author: Namdak Tonpa +Date: Mon Jul 3 12:36:14 2017 +0300 + + P2P+ is never called + +commit ecbd69cc13c777f71260893ce4f4faa4a451f01a +Author: Namdak Tonpa +Date: Mon Jul 3 12:08:03 2017 +0300 + + remove {init} as it no longer part of protocol + +commit a2b2e6267b8dbacfbfc72c37d7af640f6b90bb08 +Author: Namdak Tonpa +Date: Mon Jul 3 11:57:46 2017 +0300 + + apply requests from @5HT to tests + +commit 13aa04025a548e70396c7c8d743d37b61648b19a +Author: Namdak Tonpa +Date: Mon Jul 3 11:27:30 2017 +0300 + + accept string sms code + +commit 8bea6fd0dc2bfb34416c2510ce4157c9a1ce4253 +Author: Namdak Tonpa +Date: Mon Jul 3 11:15:46 2017 +0300 + + fix start with fresh database + +commit 34e5a913a3e8e4d9d67b150ea45010e666fdfaf5 +Author: cryoflamer +Date: Sat Jul 1 18:06:22 2017 +0300 + + updated AUTH.md + +commit 424fdc33c28fae8ea11abe1f4c5e96c482c8b3ea +Author: cryoflamer +Date: Sat Jul 1 16:39:49 2017 +0300 + + added fake phone register + +commit bbf1bd1be4c83da7008b670ce2c2d92667e3c707 +Author: qomputer +Date: Sat Jul 1 15:34:05 2017 +0300 + + Add test and fix functions for Roster,Friend and P2P + +commit 3a19641e6cba6f128f1174497c82696dba8409fe +Author: cryoflamer +Date: Fri Jun 30 19:23:55 2017 +0300 + + added fun roster_test:p2p_test/2 + +commit 96f46a40ad4a64e0669ccc91d9f2f57c866bd3b1 +Author: qomputer +Date: Fri Jun 30 18:37:42 2017 +0300 + + Update test_roster() + +commit bfad357c4bdec8eac15c33b94fefaf8d2a4ba99d +Author: cryoflamer +Date: Fri Jun 30 17:04:47 2017 +0300 + + added resend test + +commit f28dfe4fe1c0dbc496e8fe2bdb2c6b73a8002f72 +Author: cryoflamer +Date: Fri Jun 30 16:11:25 2017 +0300 + + fixed test_proto:session_found + +commit 5fff2f6c38ff075224dff6e9c86a107039fb852e +Author: cryoflamer +Date: Fri Jun 30 15:37:12 2017 +0300 + + added roster_test:test_verify + +commit 0c2e57cce3a56fe2aa97aca7801f44b4bb6efd8d +Author: cryoflamer +Date: Fri Jun 30 15:36:58 2017 +0300 + + added roster_test:test_verify + +commit 78fb8829d078cc13beb8bbd4d08721544c9f0446 +Author: ne-luboff +Date: Fri Jun 30 14:18:44 2017 +0300 + + Updated erlcloud lib, working on upload to S3 function + +commit 604bad002a872d9f404b841cc222bea993d39182 +Author: Namdak Tonpa +Date: Fri Jun 30 11:32:12 2017 +0300 + + {ok,sms_send} + +commit 7bddaf046eabb1a5fa53965880350548258b7eca +Author: Namdak Tonpa +Date: Fri Jun 30 10:54:08 2017 +0300 + + AUTH token + +commit 36ddce0913552c2f394a244214cc99da51363c6a +Author: Namdak Tonpa +Date: Fri Jun 30 10:43:20 2017 +0300 + + token + +commit c70a7e35651e465e4f1cd3a267573b9c9e16d17d +Author: Namdak Tonpa +Date: Fri Jun 30 10:41:00 2017 +0300 + + Tests: Put Token inside Client State + +commit 23914f13e1e760a30cdfdba78317512ea91b38e2 +Author: Namdak Tonpa +Date: Fri Jun 30 10:21:28 2017 +0300 + + init protocol + +commit 6f1d35053a3e50a2185504f82832cc52370f2808 +Author: Namdak Tonpa +Date: Fri Jun 30 10:16:19 2017 +0300 + + add async init + +commit f3c03e2e2c8c899847056fc1a94e93fd11610185 +Author: Namdak Tonpa +Date: Fri Jun 30 01:58:26 2017 +0300 + + Tests + +commit b8977d38c83fcbffb0b7a00e3893cc6f7c377b4e +Merge: 4ad4a9d 84129ab +Author: cryoflamer +Date: Fri Jun 30 00:40:24 2017 +0300 + + Merge branch 'async_test' + + # Conflicts: + # apps/roster/src/roster_test.erl + +commit 4ad4a9d22d68fc1dddce496cbe3c4ae67702931b +Author: cryoflamer +Date: Fri Jun 30 00:37:33 2017 +0300 + + updete proc(Unknown + +commit b53debb08757cbd38c086fc0a4363329e9389240 +Author: cryoflamer +Date: Fri Jun 30 00:36:46 2017 +0300 + + added auth_start2 test fun + +commit 84129ab286b462326338379e5f73de8748ae7f24 +Author: cryoflamer +Date: Fri Jun 30 00:25:29 2017 +0300 + + added auth_start2 test fun + +commit 3e6b35a5f6e4d07cdff2f4c9c81a698ab6dcf589 +Author: Namdak Tonpa +Date: Thu Jun 29 23:25:20 2017 +0300 + + auth + +commit a3d361b583aa81b4536d26c952dcf2bc82f0cf0a +Author: Namdak Tonpa +Date: Thu Jun 29 22:43:48 2017 +0300 + + test + +commit 76555486e245df578a9d77da79c15267ff6510fb +Author: cryoflamer +Date: Thu Jun 29 22:29:40 2017 +0300 + + added roster_test:start_auth2 + +commit f83d73c0f49cfd621f10816b9a468fafa6752e2c +Author: qomputer +Date: Thu Jun 29 20:35:30 2017 +0300 + + Update test_roster etc + +commit b24771426bc5359a055e359dc3d026aef4fcabac +Author: ne-luboff +Date: Thu Jun 29 18:05:16 2017 +0300 + + Started upload file to amazon feature. Find 3rd part library (erlcloud). TODO - use only Simple Storage Service Helper from 3rd part library (instead of all > package) + +commit 5916d74fcf787da3bdaab100c330051418577764 +Merge: c873196 bc0d99a +Author: Namdak Tonpa +Date: Thu Jun 29 16:07:40 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit c8731967749be2eb454583ed74f6ba6e7c9d7ac2 +Author: Namdak Tonpa +Date: Thu Jun 29 16:07:34 2017 +0300 + + Multiple Clients in Tests: Template for Future Tests + +commit 105662520b10f5854be980531c935e623d4b7b94 +Author: ne-luboff +Date: Thu Jun 29 16:03:00 2017 +0300 + + Added datetime info to log row + +commit bc0d99ab7a20e53921296ea6ed01eed8c3afbf27 +Author: cryoflamer +Date: Thu Jun 29 15:36:07 2017 +0300 + + updated AUTH.md + +commit de5593d8acda5a7a38d4cd41709888b09b6e058b +Author: Namdak Tonpa +Date: Thu Jun 29 11:33:04 2017 +0300 + + Test Examples + +commit d47b30e84133407d7a6ef580dc22f44776eb826d +Author: Namdak Tonpa +Date: Thu Jun 29 11:19:21 2017 +0300 + + Message API JS example + +commit f29f975868b86064ab59adcd1327999ad267b4f8 +Author: Namdak Tonpa +Date: Thu Jun 29 11:16:36 2017 +0300 + + initial message API + +commit f6d6b1f9b16d786d2f878be1f97205e4aec258ae +Merge: 30f21f7 4b29a50 +Author: cryoflamer +Date: Wed Jun 28 04:12:01 2017 +0300 + + Merge branch 'login_feature_test' + +commit 4b29a501635ac17057a3facf82d469af0bec277f +Author: cryoflamer +Date: Wed Jun 28 04:11:31 2017 +0300 + + fixed send_verify and test + +commit 17ca983c400586bac02a9323288d6e80f801122a +Author: cryoflamer +Date: Tue Jun 27 19:47:28 2017 +0300 + + update positive_send_verify + +commit c81283fdd1cadf7eb3c94c1bb5d0bd03fa03bb5b +Merge: 29af77f 30f21f7 +Author: cryoflamer +Date: Tue Jun 27 19:08:05 2017 +0300 + + Merge branch 'master' into login_feature_test + +commit 29af77fbb18a627a7341c0b924c7337f576b767d +Author: ne-luboff +Date: Tue Jun 27 19:02:27 2017 +0300 + + Updated test for issue #36 + +commit 30f21f745ccd13c5bd425dca8ff1527c44e5ff48 +Author: cryoflamer +Date: Tue Jun 27 18:37:38 2017 +0300 + + updated p2p test + +commit d8359b8d14e8a8ca1cf53db60a11392155aed52c +Author: ne-luboff +Date: Tue Jun 27 18:29:09 2017 +0300 + + Updated send_verify function. Started test for it (issue #36) + +commit 9eb2c84548bc00d9c54f3866a62cb3a0d2047c9f +Author: cryoflamer +Date: Tue Jun 27 16:08:06 2017 +0300 + + added check for vnodes + +commit 8edbbfac878858c761c67e94f93edead5f33abf3 +Author: cryoflamer +Date: Mon Jun 26 18:57:45 2017 +0300 + + updated PRESENCE.md and fixed presence + +commit 65ab051c154a836cf7e18c8a94a1e02e392bdca0 +Author: cryoflamer +Date: Mon Jun 26 18:27:13 2017 +0300 + + online/offline presence only for fist/last session + +commit eec532c26380296329498f610e8ac8c80800c813 +Author: cryoflamer +Date: Mon Jun 26 17:55:08 2017 +0300 + + added retain online/offline presence + +commit 9d063724aeca828ceec7b80677d6d6530bd30149 +Author: qomputer +Date: Mon Jun 26 14:17:29 2017 +0300 + + Fix update_roster and del_user + +commit 2e3d2386239df4ac098c9d776751d9303d27754b +Author: cryoflamer +Date: Mon Jun 26 13:31:01 2017 +0300 + + added offline presence + +commit 8df5e813f2c1216eaa4f80d221e131bc00073d20 +Author: cryoflamer +Date: Mon Jun 26 13:29:24 2017 +0300 + + amend: fix: removed find_active_client field from #auth_state + +commit 8334f60355b0e420d624f2d203cde27ad6c9b0cc +Author: cryoflamer +Date: Mon Jun 26 13:13:18 2017 +0300 + + fix: removed find_active_client field from #auth_state + +commit be4273dbef0cd138a7581fa5abc3743a18a0329a +Author: cryoflamer +Date: Mon Jun 26 12:59:51 2017 +0300 + + fixed send_sms in roster_proto:auth + +commit 91dee65c8d1ea6181aeace235b572d48ededba89 +Author: cryoflamer +Date: Sun Jun 25 18:07:08 2017 +0300 + + fixed online/offline presence + +commit 0931c4e6fe8f84a94b1dc8e09d8eaef6066341fe +Author: qomputer +Date: Sun Jun 25 00:40:26 2017 +0300 + + Fix doc/ROSTER.md + +commit dba08cb0dcb2f59a360d987813f9a3de63cb344b +Author: qomputer +Date: Sun Jun 25 00:30:30 2017 +0300 + + Update doc/ROSTER.md + +commit 407dedfd9151c00130716d8e6cb9edcaf5eb4be0 +Author: qomputer +Date: Sat Jun 24 18:42:38 2017 +0300 + + Update tests for queries + +commit 995c8b2a9335a15bc48ef0523a8f415842919271 +Author: cryoflamer +Date: Fri Jun 23 19:10:40 2017 +0300 + + added on_auth func for pesence + +commit 6695209023c8c85354958177505453972afbd996 +Author: cryoflamer +Date: Fri Jun 23 17:16:58 2017 +0300 + + upd gen_sms_code fun + +commit 73aeb70ab9fdf96cdb721dba50240b465d352b76 +Merge: 91d4a11 1d3182a +Author: cryoflamer +Date: Fri Jun 23 16:53:46 2017 +0300 + + Merge branch 'login_feature' + +commit 1d3182a56f09208dbd5d90823cfa6530356103b3 +Author: cryoflamer +Date: Fri Jun 23 16:50:33 2017 +0300 + + fixed send verify to live session + +commit 91d4a11ebf6fc78a3a0d33e12586abbaba11616a +Author: cryoflamer +Date: Fri Jun 23 16:35:01 2017 +0300 + + updated 'Friend' record and table + +commit 2931458c7b26c5aebad852da1a23aad4cfb5ee1b +Author: cryoflamer +Date: Fri Jun 23 15:53:34 2017 +0300 + + added roster:update_roster(add, {phone, _Phone}, ... + +commit d8e5031883265f178edb94906994026d592af602 +Author: ne-luboff +Date: Fri Jun 23 15:52:51 2017 +0300 + + Updated login-code-in-app logic + +commit b701e0df5fce13da7b5271d970a52ba12cbd8d8b +Author: cryoflamer +Date: Fri Jun 23 15:14:02 2017 +0300 + + updated update_roster + +commit a79facd50dde119d032269ee519976274ac76755 +Author: cryoflamer +Date: Fri Jun 23 15:04:01 2017 +0300 + + fix roster_proto + +commit abaede48c8b2d35430ce54fa208e8227d01d6dba +Author: cryoflamer +Date: Fri Jun 23 14:14:44 2017 +0300 + + fixed roster:neew_contacts + +commit c6060b0bce5e99238569a7d240676faf15d52918 +Author: ne-luboff +Date: Fri Jun 23 13:33:47 2017 +0300 + + Updated telesign_api export functions list + +commit 1b311a4b4f6fc7bc59d3f97d054189a4b4717c91 +Author: cryoflamer +Date: Fri Jun 23 12:55:05 2017 +0300 + + updated p2p ping-pong test + +commit 9a5a94a982859c2a2832e80f9bc1ff2d3debe13f +Author: cryoflamer +Date: Fri Jun 23 12:33:15 2017 +0300 + + updated INIT.md + +commit cb487b58e4c5ee312f2d5d30f0ffa26fd4efcce9 +Author: qomputer +Date: Thu Jun 22 19:03:37 2017 +0300 + + Fix function query_case_test + +commit c5877f91641599127451415cb453a7289a76ddaf +Author: cryoflamer +Date: Thu Jun 22 17:55:09 2017 +0300 + + fixed roster_acl + +commit f13a1b5689237d42e132de5024f52b691493daba +Merge: b73f6ea 935c423 +Author: ne-luboff +Date: Thu Jun 22 17:54:31 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit b73f6ea9c237b210daa4c16e785d6b67149aa639 +Author: ne-luboff +Date: Thu Jun 22 17:54:25 2017 +0300 + + Added Voice Verify Service Implementation (#26) + +commit 935c4234b6aae0151f24bb325f08c6b120c84f2c +Author: cryoflamer +Date: Thu Jun 22 17:11:14 2017 +0300 + + added roster_acl module + +commit dc97958e4b6160b70034fba5d8446bb6c474c560 +Merge: 0521081 7f188d1 +Author: ne-luboff +Date: Thu Jun 22 14:12:16 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit 0521081ddf8d7c681002d9ecb74d40c8436e9b7b +Author: ne-luboff +Date: Thu Jun 22 14:12:01 2017 +0300 + + Added reporting to telesign (issue #28) + +commit 7f188d1241bdd4e6260f82dc4749459c1a11a4ee +Author: cryoflamer +Date: Thu Jun 22 13:55:54 2017 +0300 + + fixed roster_test + +commit 51068cf3b201743310821cb3ea4d800329a5c49d +Author: cryoflamer +Date: Thu Jun 22 13:42:44 2017 +0300 + + added ping-pong test + +commit c0ba36c4893624d4cb25fe27d1c95998ff54ed01 +Author: cryoflamer +Date: Thu Jun 22 13:09:59 2017 +0300 + + updated roster_test + +commit 1e5059bc074c4d786d92438434b61c4c0f92a800 +Author: cryoflamer +Date: Thu Jun 22 11:49:11 2017 +0300 + + removed fun receive_test/3 grom gen_test + +commit b2222423dd3cd52cb2a9ed70a4510243aec9487f +Author: ne-luboff +Date: Wed Jun 21 21:38:48 2017 +0300 + + Updated gen_sms_code function. Include find_existing_active_sessions to flow + +commit 7f13edb06fb3f6a0dbc8d3f5bd518263544a395d +Merge: c6225a5 b48fd35 +Author: ne-luboff +Date: Wed Jun 21 19:57:25 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into login_feature + +commit c6225a50b9e9e2a811e223a83464f2f3fd81388f +Author: ne-luboff +Date: Wed Jun 21 19:57:17 2017 +0300 + + small refactor in login feature + +commit b48fd351601695405225e1b2777351ba4e435b20 +Author: qomputer +Date: Wed Jun 21 18:42:01 2017 +0300 + + Update and fix functional for Person, Roster, Profile + +commit 9efc61b632055c18d6422dd5937f9ead6c4bd9ea +Author: cryoflamer +Date: Wed Jun 21 16:16:50 2017 +0300 + + update AUTH.md + +commit b7358a933669b468c8b99805eab227e1b7a5f9d5 +Author: cryoflamer +Date: Wed Jun 21 15:46:10 2017 +0300 + + changed auth "io" server answers + +commit 570fd61038caf01fd8744b25c73fa04b5a0e708f +Merge: 2efb5eb dbcbaef +Author: ne-luboff +Date: Wed Jun 21 13:41:20 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into login_feature + +commit 2efb5eb0ff704ebd4064a456c4d10579f7aab40a +Author: ne-luboff +Date: Wed Jun 21 13:40:49 2017 +0300 + + Started multiple device login feature + +commit dbcbaef24bee06776e84d350e6b9f39789dcfe47 +Author: qomputer +Date: Wed Jun 21 12:44:07 2017 +0300 + + Fix update_roster and add update_person + +commit 0a20cc27067d228b1114dc6e4e3b22ddf22fc612 +Author: qomputer +Date: Tue Jun 20 19:12:00 2017 +0300 + + Update handlers and tests for queries Profile, Roster, Person etc + +commit 302bad4f56bee40e9b6a453f759ee22c9a97a6e4 +Author: cryoflamer +Date: Tue Jun 20 16:49:03 2017 +0300 + + added p2p test ping + +commit 3ae8810f32c6250330dc5c11fd6c35bb159c32e2 +Author: cryoflamer +Date: Tue Jun 20 15:27:49 2017 +0300 + + added receive_fun field to #state + +commit 801b35ac5e5e58f63f823b4337c6eff1bbf0dbd3 +Author: cryoflamer +Date: Tue Jun 20 14:47:49 2017 +0300 + + tuned roster:del_user + +commit 824f78d39336ac519b80905a0147aa84efc1b424 +Author: qomputer +Date: Tue Jun 20 14:43:48 2017 +0300 + + Fix del_user + +commit 2e378a7ad4edea8d0a9d73619368570374a6fd38 +Author: cryoflamer +Date: Tue Jun 20 14:32:40 2017 +0300 + + updated roster:del_user + +commit 1003782358eb69bab6b813a07ff3791f9fd2bd84 +Author: Namdak Tonpa +Date: Tue Jun 20 06:24:40 2017 +0200 + + dataset + +commit 2e6725a92e36616f697a5198e8eb12a6d05b5db9 +Author: cryoflamer +Date: Mon Jun 19 23:27:46 2017 +0300 + + updated test generator + +commit 5da54ae8d3a5c85719ecc2680f62ce5b057a7350 +Author: cryoflamer +Date: Mon Jun 19 21:41:00 2017 +0300 + + fixed auth + +commit f4996932735ea0c7c2644f1336b0b048e5c28cb8 +Author: cryoflamer +Date: Mon Jun 19 19:53:23 2017 +0300 + + added igor changes + +commit d88d81fb85328100aa225eed404ea7cc0a792c9e +Author: cryoflamer +Date: Mon Jun 19 19:37:56 2017 +0300 + + updated test generator + +commit 2778cfae8f182d4443bc208d64c79dc1e0fc2142 +Author: qomputer +Date: Mon Jun 19 19:21:35 2017 +0300 + + Update test of Profile and some fix roster.erl + +commit 01b4473f23b24420e8d0aa8396a25b66cb8a0df5 +Author: cryoflamer +Date: Mon Jun 19 17:44:45 2017 +0300 + + added state to gen_test and receive_client + +commit 4bd70c7072c3189067dc096b7798b9b06eea8288 +Author: cryoflamer +Date: Mon Jun 19 16:55:45 2017 +0300 + + added subscribe for "p2p/+/Id" after login + +commit d07d20fd867ba0a03567d9268a4e90c00f38410f +Author: cryoflamer +Date: Fri Jun 16 23:03:41 2017 +0300 + + rempved received_verify + +commit 9e789edf14eaa4c377d5d4a96249a10dfe0c0642 +Author: cryoflamer +Date: Fri Jun 16 22:45:00 2017 +0300 + + updated tests for send and resend sms + +commit 342377c3526a34d273697cba1ba5cbd01a7374b0 +Author: cryoflamer +Date: Fri Jun 16 21:47:09 2017 +0300 + + removed ignore files + +commit 4c02e452369a4cb06e004cfb6f02a6800fea2737 +Author: cryoflamer +Date: Fri Jun 16 21:46:41 2017 +0300 + + added ignore files + +commit 479f1439ab1bf7f6c3b1963c73bc7fc17e590a63 +Merge: 8d83282 e634d86 +Author: cryoflamer +Date: Fri Jun 16 20:37:44 2017 +0300 + + Merge remote-tracking branch 'origin/master' + + # Conflicts: + # apps/roster/src/roster_proto.erl + +commit 8d83282dd608d2c629971df1c94ce7309bbeb089 +Author: qomputer +Date: Fri Jun 16 18:41:55 2017 +0300 + + Update functions for Roster,Person and Profile + +commit e725e91c5e0553b1feed53c2a2b38c83dd3daeb0 +Author: ne-luboff +Date: Fri Jun 16 19:10:20 2017 +0300 + + finished async sms sending + +commit 8bb4c1758ad158371ec4525f692229edd30afc89 +Author: cryoflamer +Date: Fri Jun 16 18:55:50 2017 +0300 + + added SendFun to send_sms + +commit e634d86905abea0a964e46b0659556060abe8f95 +Author: qomputer +Date: Fri Jun 16 18:41:55 2017 +0300 + + Update functions for Roster,Person and Profile + +commit 35352f07dfca05466d4122aca25dcc168754a2aa +Merge: c566a52 d3afdb4 +Author: cryoflamer +Date: Fri Jun 16 18:38:23 2017 +0300 + + remove double dummy_sms_send + +commit c566a5292e6515f818a67c8363e66dee9433569e +Author: cryoflamer +Date: Fri Jun 16 18:30:10 2017 +0300 + + updated send_sms_response + +commit 04331586ad79a8f149773f7acbbc3058a7aee14c +Merge: f95c01c d9a3daa +Author: ne-luboff +Date: Fri Jun 16 17:18:32 2017 +0300 + + Merged with master + +commit d3afdb401220b08371cf5d9d60985cdf50f950f6 +Author: cryoflamer +Date: Fri Jun 16 18:30:10 2017 +0300 + + updated send_sms_response + +commit d9a3daa23507bc434b6771ebd7ed0f67568b9044 +Author: cryoflamer +Date: Fri Jun 16 18:21:21 2017 +0300 + + fixed verify for signup + +commit d5e02be2e769938e2a79f54efdeb496aa014cd0c +Author: cryoflamer +Date: Fri Jun 16 17:40:46 2017 +0300 + + added full cicle test for signup + +commit 06ce3eecc635c771c262f6ac5a7dd6bbbf5cab63 +Author: cryoflamer +Date: Fri Jun 16 17:40:06 2017 +0300 + + fixed auth in roster_proto + +commit b2afa9aa7f814cccff13088d69377202279a88eb +Merge: f95c01c f90a853 +Author: ne-luboff +Date: Fri Jun 16 17:18:32 2017 +0300 + + Merged with master + +commit f95c01c9148b59bac854be7e323b7fd25a75c959 +Author: ne-luboff +Date: Fri Jun 16 17:16:21 2017 +0300 + + replaced emqttc:publish function with n2o_vnode:send + +commit 456faa2864b502569ea19eafd4a9868768e47e9a +Author: ne-luboff +Date: Fri Jun 16 16:58:05 2017 +0300 + + Merge with master + +commit e8a1bd4a2265ba764794a9304e5537d8e7ce4775 +Author: ne-luboff +Date: Fri Jun 16 16:45:42 2017 +0300 + + async sms-sending. v1 + +commit f90a853023b106a0927ad48c82a3c99e88960c18 +Author: cryoflamer +Date: Fri Jun 16 15:36:24 2017 +0300 + + added Resend to AUTH.md + +commit e777bb4fdc5d6a25cbd6f78f1e9f79e5283ce2bb +Author: cryoflamer +Date: Fri Jun 16 15:29:21 2017 +0300 + + updated roster proto:auth and tuned roster_test + +commit 36ee8bdd3bf27b9c62f046b727f1717d0f926d05 +Author: cryoflamer +Date: Fri Jun 16 14:13:38 2017 +0300 + + updated auth. Added #auth_state + +commit 14418a0fe8dab09d1d9b6129d38c99716a0f7976 +Author: cryoflamer +Date: Fri Jun 16 13:07:19 2017 +0300 + + changed answer for delete_user request + +commit 21dc370ef6b07ecea8d79f357562735999af7218 +Author: cryoflamer +Date: Fri Jun 16 12:09:56 2017 +0300 + + fixed roster:auth + +commit cff664c5526aa9ed12dd054832aeeede11674db5 +Author: qomputer +Date: Thu Jun 15 19:21:44 2017 +0300 + + Add function update_roster and update Roster's handler + +commit f906ea2f957303e500814613bfd8dae74fa9ba0d +Author: cryoflamer +Date: Thu Jun 15 19:17:34 2017 +0300 + + tuning positive_p2p + +commit 6c4d65c037119d365224cf52543c0164c2ed64e8 +Author: cryoflamer +Date: Thu Jun 15 19:03:22 2017 +0300 + + added positive_p2p test + +commit b10bb6e81091e6077d890c477d9fceab0b9d55f8 +Author: cryoflamer +Date: Thu Jun 15 15:08:49 2017 +0300 + + added roster:get_contact by phone + +commit f8a98b66c9fd67071e5f76d488044bb818d96cd9 +Author: cryoflamer +Date: Thu Jun 15 15:06:33 2017 +0300 + + added roster:get_rosters/1 + +commit 1b8be2d4f0bafbdc4a2702fa58c5b950570c4786 +Author: cryoflamer +Date: Thu Jun 15 14:25:46 2017 +0300 + + added emqtt hooks for p2p + +commit baf402de1ccf5b3b31a8e18880f7e8e0f7540bf8 +Author: cryoflamer +Date: Thu Jun 15 14:17:06 2017 +0300 + + new topic schema for p2p PRIVARE.md + +commit b0f620e428fd1d91837c8483a0e84f3f47f8c503 +Author: qomputer +Date: Thu Jun 15 01:39:46 2017 +0300 + + Fix handlers for Profile and Person + +commit a8f626979872f75be5e0380b2bf3e4149cccd56d +Author: cryoflamer +Date: Wed Jun 14 23:02:03 2017 +0300 + + added gen_test fun and LOG macros + +commit 65c69724a71cbf7b58df4d2ec82c0ed4fd21592a +Author: cryoflamer +Date: Wed Jun 14 21:10:54 2017 +0300 + + added test wrapper + +commit 63bc19db4cb0b7b9b31943f748e8ac72d0f6f730 +Author: ne-luboff +Date: Wed Jun 14 20:24:43 2017 +0300 + + Updated VoxImplant Create User Test + +commit 44c94e8037aecd9769d7c2f9a52afd6b229746df +Author: ne-luboff +Date: Wed Jun 14 20:19:58 2017 +0300 + + Updated telesign test. V2 + +commit 52918cc4d86c071924dff402df42b7147832bc48 +Author: ne-luboff +Date: Wed Jun 14 19:06:28 2017 +0300 + + Updated telesign test + +commit ea5429de18c87e3785cc63fdd398d902f161a46c +Merge: 1c17d19 b6413ca +Author: qomputer +Date: Wed Jun 14 18:43:32 2017 +0300 + + Fix roster_proto + +commit 1c17d19fe37da77bbbc496db27f49a8a701c5687 +Author: qomputer +Date: Wed Jun 14 18:26:04 2017 +0300 + + Add function for sending additional messages + +commit cd47253a08cb453dd9b37cdf989cf2e8a79fca6d +Author: qomputer +Date: Wed Jun 14 18:26:04 2017 +0300 + + Add function for sending additional messages + +commit b6413ca130cc4e48a54679a58dacf26d21125724 +Author: qomputer +Date: Wed Jun 14 18:26:04 2017 +0300 + + Add function for sending additional messages + +commit 0ff50590fa7a0583a9de1f76c3dd39b87b740776 +Author: cryoflamer +Date: Wed Jun 14 17:35:35 2017 +0300 + + updated tests for verify and resend + +commit bf59509da23b7d70297e711cf7e4fce4a724c9dc +Author: cryoflamer +Date: Wed Jun 14 17:32:55 2017 +0300 + + updated auth, verify, and resend_sms + +commit 7afb3118c1bd22dc664764f65b0c396de7ef2824 +Author: cryoflamer +Date: Wed Jun 14 17:30:24 2017 +0300 + + added session help funcs + +commit 4f38c15f35b2d752282d64655f3c81e3be248254 +Author: ne-luboff +Date: Wed Jun 14 15:26:15 2017 +0300 + + Updated VoxImplant helper. Added Bind user to App functionality + +commit 65814d361414053bc4f24985126ea12441fe51ae +Author: cryoflamer +Date: Wed Jun 14 15:03:29 2017 +0300 + + added 'Client' cache table and emqttd hooks to roster.erl + +commit 7a77e91f78a70489f39d517d16880411022041b3 +Author: cryoflamer +Date: Tue Jun 13 19:42:27 2017 +0300 + + removed debug_info from rebar.config + +commit c8bb983460f280351c7a5208e644b56d1fe05b4b +Author: cryoflamer +Date: Tue Jun 13 19:33:59 2017 +0300 + + updated docs and added resend_sms + +commit 28293b1b8395966ba4341e9d5b4fd697a5cc0031 +Author: ne-luboff +Date: Tue Jun 13 19:31:55 2017 +0300 + + Added Create VoxImplant User helper. TODO - add test + +commit 3e4fdcdf6c6d076ad68326af4855c4d4fdd63f3d +Author: qomputer +Date: Tue Jun 13 19:06:54 2017 +0300 + + Add test-function create_user and fix del_user + +commit c57eeb803c49816871be377d9f52bee74f296001 +Author: qomputer +Date: Tue Jun 13 13:32:03 2017 +0300 + + Fix del_user + +commit d3ed8226d3a01d50c41bfeba90b35107274f7974 +Author: qomputer +Date: Tue Jun 13 13:20:49 2017 +0300 + + Update ROSTER.md + +commit c19fd40ed28e4c627a038d6a738e933e72fe9741 +Author: cryoflamer +Date: Tue Jun 13 12:28:52 2017 +0300 + + update AUTH.md + +commit eb92ea2b2025396186c29a34a1531e3323914c1c +Author: cryoflamer +Date: Tue Jun 13 12:15:10 2017 +0300 + + update AUTH.md + +commit 5bffc8b4b487d0b06d2572dd8d5cc84f96793500 +Author: cryoflamer +Date: Tue Jun 13 12:14:49 2017 +0300 + + added add_user fun to auth + +commit 7cf4efd3732fa0c4760be0715b509523dd8c6ca3 +Author: qomputer +Date: Mon Jun 12 19:14:36 2017 +0300 + + Update handler for profile + +commit 97567f0bdb497c0c0eb76f31c7ec58fd753b4c99 +Author: cryoflamer +Date: Mon Jun 12 19:30:21 2017 +0300 + + added unifuncs for testing + +commit 26f77c6723ab7b1d7b21786e45e3beeafaefdef5 +Author: cryoflamer +Date: Mon Jun 12 19:07:07 2017 +0300 + + added start_client without gen_server + +commit 6a39b523e371f2bf40a6a525a473707b5e1d1e15 +Author: cryoflamer +Date: Mon Jun 12 19:06:35 2017 +0300 + + updated auth + +commit 112eec766f05a280fa1fa3db032bb0194fdafaeb +Author: cryoflamer +Date: Mon Jun 12 18:43:02 2017 +0300 + + added auth_positive and fixed bugs + +commit e5a333f24634b54ceebdb6c3ebe8db60b7c6a62a +Author: cryoflamer +Date: Mon Jun 12 16:38:15 2017 +0300 + + added delete_user to doc + +commit 633f0c48b4df1f923556e4dbd99d10c850f018b1 +Author: cryoflamer +Date: Mon Jun 12 16:07:19 2017 +0300 + + added delete_user from client. Only for development!!! + +commit 997191959cc4b10c882de33c1d40ae786388529f +Author: cryoflamer +Date: Mon Jun 12 15:02:06 2017 +0300 + + fixed send_sms + +commit 6b680ca2546daa02cf5134789a41f6104ebf849b +Author: cryoflamer +Date: Mon Jun 12 15:01:32 2017 +0300 + + added async send fun to send_sms + +commit 3815fb49922c03c5e04627c78b2d09aa28b36fd9 +Author: qomputer +Date: Mon Jun 12 14:21:23 2017 +0300 + + Update roster:add_user + +commit 5b6f3308aed8aba03efdd7fd871232d69f2a4d24 +Author: ne-luboff +Date: Mon Jun 12 14:18:30 2017 +0300 + + Added async TeleSign API call + +commit b126d33b53259a4973350d34ffeba8b52282cc29 +Author: cryoflamer +Date: Mon Jun 12 02:18:32 2017 +0300 + + updated sms_send + +commit b11c6fd1422fdc9911b5512a566be0169cd3c47d +Author: qomputer +Date: Mon Jun 12 00:40:00 2017 +0300 + + Add function add_user and fix roster_proto + +commit f6d658dc213b971207479b9cd5c958b5b594ca74 +Author: cryoflamer +Date: Sun Jun 11 21:13:48 2017 +0300 + + tuning for roster + +commit 9934138afb2f8c17b061f6075ade343c552c5dc7 +Author: cryoflamer +Date: Sun Jun 11 19:24:30 2017 +0300 + + fixed auth bugs + +commit d77f81a6dde7516091c6815792a35bb40fac5e11 +Author: cryoflamer +Date: Sun Jun 11 13:10:49 2017 +0300 + + updated auth and fixed some warnings + +commit d04667a72ea1b4742e74bc630dfdf51dc7e08105 +Author: cryoflamer +Date: Sun Jun 11 02:02:38 2017 +0300 + + fix auth bugs + +commit 3a0f88fb94fcff62e3b263312baed578f7282712 +Author: cryoflamer +Date: Sat Jun 10 20:50:02 2017 +0300 + + signup refactoring + +commit 38572bcba011ed8ac0017d43c8937af8eb8cc8a6 +Author: cryoflamer +Date: Fri Jun 9 19:52:18 2017 +0300 + + updated sms verify and auth + +commit 46be951f32625944135597dc639a3f57a84d3bb3 +Merge: fc6c78e 9253e22 +Author: qomputer +Date: Fri Jun 9 19:42:30 2017 +0300 + + Merge branch 'master' of ssh://github.com/NYNJA-MC/server + +commit fc6c78ed894ef2b76106d1d14443774d8ba47e22 +Author: Namdak Tonpa +Date: Fri Jun 9 19:20:57 2017 +0300 + + Create README.md + +commit f8b88941d16a1f9033c810fd7bf1841895158bb1 +Author: qomputer +Date: Fri Jun 9 19:38:41 2017 +0300 + + Update roster.hrl and some handlers + +commit 9253e22d6068d1852817140204f3f8a862aca6b8 +Author: Namdak Tonpa +Date: Fri Jun 9 19:20:57 2017 +0300 + + Create README.md + +commit 9734b22a68f9b9439a95379e76196413dbf70a05 +Author: qomputer +Date: Fri Jun 9 18:06:06 2017 +0300 + + Update roster_proto with Roster etc + +commit 6132fb0a42b99023e2023931261b4c77942ebc35 +Merge: 5c2e71d 81c1a7d +Author: Namdak Tonpa +Date: Fri Jun 9 18:36:46 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 5c2e71db34449176cc88f65d1763d53713f76690 +Author: Namdak Tonpa +Date: Fri Jun 9 18:36:35 2017 +0300 + + model + +commit 81c1a7dc997928e4188092b7aa46739f35f828a5 +Author: Namdak Tonpa +Date: Fri Jun 9 18:15:05 2017 +0300 + + Create PRESENCE.md + +commit 661d014da1b807d088e2e8f5bf844c0c611889af +Author: cryoflamer +Date: Fri Jun 9 18:13:26 2017 +0300 + + handled "invalid Token" in auth + +commit a8f57ab9ceb8f4d04c5ab8e8d94e6e3dea01a773 +Author: Namdak Tonpa +Date: Fri Jun 9 18:13:22 2017 +0300 + + Create ROSTER.md + +commit b259c3804ee17da6d6b775521032bc18499a5f85 +Author: Namdak Tonpa +Date: Fri Jun 9 18:12:40 2017 +0300 + + Create ROSTER.md + +commit 3b4863fe8497e6530fcbae945bd619243720deaa +Author: Namdak Tonpa +Date: Fri Jun 9 18:09:27 2017 +0300 + + Create ROSTER.md + +commit 4f2bf83e934d0ab0929bb93873c938d1ed2bd081 +Author: Namdak Tonpa +Date: Fri Jun 9 18:05:17 2017 +0300 + + Create PRIVATE.md + +commit 829927350b38c6bf7f02f420173e06e5a1326569 +Author: Namdak Tonpa +Date: Fri Jun 9 18:03:53 2017 +0300 + + Create PUBLIC.md + +commit 46b7f76252c9a1bc56e46c99c4c87b5f10593e4b +Author: Namdak Tonpa +Date: Fri Jun 9 17:39:43 2017 +0300 + + Create README.md + +commit 452a2e0656fbfd70fe5327122e3a656e76fe3fd5 +Author: Namdak Tonpa +Date: Fri Jun 9 17:18:44 2017 +0300 + + Create SPEC.md + +commit 749d98c43e7cbeb6bd2805975ae11cdc5539da34 +Author: Namdak Tonpa +Date: Fri Jun 9 17:11:28 2017 +0300 + + Create SPEC.md + +commit 5cfdc783ab31f4f7e248380fbdb0de11e6af7409 +Author: Namdak Tonpa +Date: Fri Jun 9 16:50:38 2017 +0300 + + Create ROSTER.md + +commit ae93038a7514bed3bab95b2437f85d256fce897f +Merge: d89b8a5 0b34b9f +Author: Namdak Tonpa +Date: Fri Jun 9 16:46:26 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit d89b8a54db93d4479d1ca6ddcfff4fe362bcddcf +Author: Namdak Tonpa +Date: Fri Jun 9 16:46:22 2017 +0300 + + person + +commit 0b34b9f6634c78863753c5afc5999a4098f76c57 +Author: Namdak Tonpa +Date: Fri Jun 9 16:20:56 2017 +0300 + + Create ROSTER.md + +commit efb6891c341b62ec6d3438d5da80b26361b67d99 +Author: Namdak Tonpa +Date: Fri Jun 9 16:17:33 2017 +0300 + + Create PUBLIC.md + +commit 9c711903444f5a3dce6aa32636cf41c73568cb88 +Author: Namdak Tonpa +Date: Fri Jun 9 16:16:07 2017 +0300 + + Create PRIVATE.md + +commit de8026c623fd66f09d33f13537196316e9228b02 +Author: cryoflamer +Date: Fri Jun 9 15:24:51 2017 +0300 + + commented create #msg table + +commit 184d6afe50424c785ae6b3dfe0f34a22ff23e6e1 +Author: Namdak Tonpa +Date: Fri Jun 9 14:47:20 2017 +0300 + + doc + +commit 6477455a50379c4a5cb0f464a6bceef83e28af79 +Merge: 363ff47 8a1a025 +Author: Namdak Tonpa +Date: Fri Jun 9 14:44:37 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 363ff47ca436a13b3b922e10570e01913b606788 +Author: Namdak Tonpa +Date: Fri Jun 9 14:44:28 2017 +0300 + + approve / revoke + +commit 8a1a0250518d70bac0d3be45a807cb220ae311ed +Author: ne-luboff +Date: Fri Jun 9 14:37:20 2017 +0300 + + Added telesign api helper (for sms sending) + +commit d4c3e0e15aa9e82ce0edf5673310d3e6c1e7f183 +Author: Namdak Tonpa +Date: Fri Jun 9 14:31:50 2017 +0300 + + Create SPEC.md + +commit e34193e7e0d134aaedd0d3c8b32573d2f6d25eae +Author: Namdak Tonpa +Date: Fri Jun 9 14:28:41 2017 +0300 + + fox + +commit 3d25b9ed7f68dadf8a205c51db882d90f8947485 +Author: Namdak Tonpa +Date: Fri Jun 9 14:23:40 2017 +0300 + + doc + +commit a15fb15599eebbaa8a5cd79665f72ca169d26538 +Author: Namdak Tonpa +Date: Fri Jun 9 14:22:21 2017 +0300 + + doc + +commit e3d402497086553ee837fb8d20f3beaf911eba02 +Author: Namdak Tonpa +Date: Fri Jun 9 14:09:37 2017 +0300 + + doc + +commit 048691681430da8840e669f5181034920623d3f0 +Author: Namdak Tonpa +Date: Fri Jun 9 14:09:11 2017 +0300 + + presence + +commit 79d7732e9d475da13b9446ace853cbb14b7cce20 +Author: Namdak Tonpa +Date: Fri Jun 9 14:03:37 2017 +0300 + + doc + +commit 38d2951f1e27079dde1e208f8af0d09c28134096 +Author: Namdak Tonpa +Date: Fri Jun 9 13:58:16 2017 +0300 + + doc + +commit b735bbbf26fa66d4842b44af81a5cfc690c6008d +Author: Namdak Tonpa +Date: Fri Jun 9 13:52:45 2017 +0300 + + Create PRIVATE.md + +commit 7f7692cff4436ca2a730627e72a7e4fdde937a4b +Author: Namdak Tonpa +Date: Fri Jun 9 13:52:00 2017 +0300 + + Create PUBLIC.md + +commit 0ab30757a9b3fcd2a7e26a0bc3dc13d5f599e522 +Author: Namdak Tonpa +Date: Fri Jun 9 13:21:12 2017 +0300 + + Create PUBLIC.md + +commit ce5bf6de16515463ba625d61f9c6b374afe22a04 +Author: Namdak Tonpa +Date: Fri Jun 9 13:00:56 2017 +0300 + + private and public messaging + +commit 3f6bbab0c6a0831a31545f2e7583c9f337910415 +Author: Namdak Tonpa +Date: Fri Jun 9 13:00:23 2017 +0300 + + private and public messaging + +commit 555b7516dc0fa55623eb90212bac431a9054a6a2 +Author: Namdak Tonpa +Date: Fri Jun 9 12:41:26 2017 +0300 + + Create INIT.md + +commit 346979a01a597256c8273522d76d67807a510c2e +Author: Namdak Tonpa +Date: Fri Jun 9 12:41:08 2017 +0300 + + Create FTP.md + +commit d164253d07c6290201c51143747116c6aed019d1 +Author: Namdak Tonpa +Date: Fri Jun 9 12:40:52 2017 +0300 + + Create AUTH.md + +commit f67b6890340e1f47c168a0588b6a5b2f2972e0e8 +Author: Namdak Tonpa +Date: Fri Jun 9 12:36:52 2017 +0300 + + doc + +commit b3a8126411a24c1b9b1d4af84a9557149bd74f10 +Author: Namdak Tonpa +Date: Fri Jun 9 12:36:34 2017 +0300 + + doc + +commit 5396ffd60c8c0aa4166b799410995475ceea5c1d +Author: Namdak Tonpa +Date: Fri Jun 9 12:35:45 2017 +0300 + + doc + +commit 1cbfb1c645b93e65d1672ab8324533fb3809b07d +Author: cryoflamer +Date: Fri Jun 9 00:18:35 2017 +0300 + + updated authenticate and test + +commit 349275713433f37700cc49795837961745542072 +Author: qomputer +Date: Fri Jun 9 00:13:09 2017 +0300 + + Add handler GetProfile + +commit d0f4f494fc40ce428f8d3f017a73a84abe25cb67 +Author: cryoflamer +Date: Thu Jun 8 22:19:42 2017 +0300 + + fixed Auth and sms verify + +commit b77005ef524d6e1f52203ec1002ff87b268766c7 +Author: qomputer +Date: Thu Jun 8 20:01:54 2017 +0300 + + Add handlers for requests + +commit 02d6a2c9cdf5b90bb45d1293858c00785ce695b7 +Author: cryoflamer +Date: Thu Jun 8 19:54:35 2017 +0300 + + added attempts to 'Auth' and auth test + +commit 7f1b6a1b87f085dcaac85047a60b6d301122cdc4 +Author: qomputer +Date: Thu Jun 8 18:21:03 2017 +0300 + + Update get_something + +commit ca8f9fcfcca070e514f8c0f7a6bee06f9717788b +Author: cryoflamer +Date: Thu Jun 8 18:10:25 2017 +0300 + + added sms_code field + +commit fd3d8916c6ea619857abf990fb2513662a1e2594 +Merge: ca4b784 59c7918 +Author: Namdak Tonpa +Date: Thu Jun 8 15:26:17 2017 +0300 + + maxim merge + +commit ca4b784eaeacd8aa42db40526ba16f70a96a694d +Author: Namdak Tonpa +Date: Thu Jun 8 15:25:35 2017 +0300 + + maxpacket, enable FILE proto + +commit 59c7918eb1bf817baa0e5142ce35bd8f43d990ad +Author: qomputer +Date: Thu Jun 8 15:06:09 2017 +0300 + + Fix get_something + +commit b85da50f21363b31c29b0c90d814519673bc545c +Author: cryoflamer +Date: Thu Jun 8 14:35:21 2017 +0300 + + updated info('Auth', ...) + +commit e697dfdb9636b8df81533d95dd665f0561fbb18e +Author: cryoflamer +Date: Thu Jun 8 14:34:37 2017 +0300 + + added user_id field to 'Auth' table + +commit 3b787135300d03e60af9f0f15d9d6b76ba571ba8 +Author: qomputer +Date: Thu Jun 8 00:02:30 2017 +0300 + + Add test and sample replay for any endpoints + +commit 0c6e1d133917d5e90bbdbcab6cca29187b896a5b +Author: cryoflamer +Date: Wed Jun 7 19:13:40 2017 +0300 + + updated info('Auth', ... + +commit 99595e578a3e499b9558d273463fa25f233c0dc9 +Author: cryoflamer +Date: Wed Jun 7 19:12:38 2017 +0300 + + added some new fields and indexes to roster tables + +commit a3dfebad02f849d9c215c983bd51b95f117ee884 +Author: cryoflamer +Date: Wed Jun 7 12:34:30 2017 +0300 + + added vnode_counter to Auth reply + +commit bb311168d3406132b2fd5f2e92bef4b702c8f820 +Author: cryoflamer +Date: Tue Jun 6 19:20:04 2017 +0300 + + added prototype auth + +commit 9d16c96672217908b12878556ba46b765a61feb6 +Author: Namdak Tonpa +Date: Tue Jun 6 18:40:16 2017 +0300 + + cleanup plugins + +commit fa4813d45e0f682be6810ff3824c55533ded4925 +Merge: 797acc6 246f29e +Author: 5HT +Date: Sun Jun 4 17:41:03 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 797acc6bccad3209e801c26ac14c42afc1794c55 +Author: 5HT +Date: Sun Jun 4 17:40:54 2017 +0300 + + disable FTP for now + +commit 246f29ee746fde6be697703b416a3db81b8b1e2e +Author: qomputer +Date: Fri Jun 2 01:20:47 2017 +0300 + + Fix function web_chat + +commit a0beb23d4ee765eee5cd464906d41026d9d4bb6c +Author: qomputer +Date: Thu Jun 1 19:32:00 2017 +0300 + + Call publish_init before web_chat + +commit df8e6d00b2f7144c9c6eb337654df22d755bfa88 +Author: qomputer +Date: Thu Jun 1 17:37:31 2017 +0300 + + Update roster_test + +commit ba6329c77daed23413ae62a9f19e7616f8ee4fff +Author: qomputer +Date: Thu Jun 1 15:33:10 2017 +0300 + + Add web chat test + +commit 19c2dbb5252921876393e28ae06174133304c699 +Author: cryoflamer +Date: Thu Jun 1 16:27:15 2017 +0300 + + added test_sup supervisor + +commit 2b8535baae3bf58576880e4581ba709872161460 +Author: cryoflamer +Date: Thu Jun 1 15:01:28 2017 +0300 + + added stored token to publish_init + +commit eac5f0d802dc00abfbc98c0df2fe1ca1ba2bca10 +Author: cryoflamer +Date: Thu Jun 1 13:59:37 2017 +0300 + + updated roster_test + +commit 01d227ea7b878af24f4a8980136cea2d05702976 +Author: Namdak Tonpa +Date: Wed May 31 23:03:57 2017 +0300 + + tuning + +commit 420a2edcc2ea160df4bc4efac52cdcd59daf1df5 +Author: qomputer +Date: Wed May 31 14:30:40 2017 +0300 + + Update test webchat + +commit a6302b3d1249e248154af37fa4f47bb64f5e1509 +Author: qomputer +Date: Wed May 31 01:24:43 2017 +0300 + + Update for test web chat + +commit a9de6f8e1cf3bf6eab3b9d71c14463d2ea916daf +Author: cryoflamer +Date: Tue May 30 16:33:06 2017 +0300 + + added Token to State context + +commit 6f41134d39f6d2269de20f65cea19cced29e1104 +Author: cryoflamer +Date: Tue May 30 14:55:48 2017 +0300 + + updated publish_init + +commit 63a35199955de0d12af3397d02a1bdeb9c2dc763 +Author: cryoflamer +Date: Tue May 30 13:41:10 2017 +0300 + + added sync start() function + +commit bf47a087d325a5b2ae9eee93cefac43faa36817a +Author: qomputer +Date: Tue May 30 13:35:50 2017 +0300 + + Add test for web chat + +commit 2e5187723839ca271c70ec4f184ed37ae8010be0 +Author: cryoflamer +Date: Tue May 30 13:26:40 2017 +0300 + + added receive for publish_init + +commit eb2292950e3a18060dc5b92b848d265a754a2ddd +Author: cryoflamer +Date: Mon May 29 22:22:11 2017 +0300 + + fixed subscribe and publish in roster_test + +commit a2926c4d244aefae4f9ef64a9be713b53459d381 +Author: cryoflamer +Date: Mon May 29 21:48:33 2017 +0300 + + added random number for events topic + +commit ebf029f5795c501fdff6d1497ab650b1b5a9d965 +Author: cryoflamer +Date: Mon May 29 19:14:35 2017 +0300 + + added publish_init function (sends {init,<<>>}) + +commit f59e9f00b9364427e83953d8cb4c52ef1a31491c +Author: qomputer +Date: Mon May 29 19:01:30 2017 +0300 + + Add unsubscribe + +commit 7d041d2b68f694a8811d874c074be38662f8e54f +Author: 5HT +Date: Mon May 29 18:24:51 2017 +0300 + + production configuration + +commit aca8b96cae5b2910ce430f3c608ea49d5043ccc9 +Merge: 2ba7674 2b55167 +Author: 5HT +Date: Mon May 29 18:07:52 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 2ba7674aeba5f78d1ad3e00358f5f2856b17b05a +Author: 5HT +Date: Mon May 29 18:07:44 2017 +0300 + + fix launch on Linux + +commit 2b55167b9a7785b13c932b629f1f90e880bc3406 +Author: qomputer +Date: Mon May 29 18:04:48 2017 +0300 + + Add handler for call(roster_test,{subscribe,<>}) + +commit 4110952cf758915dcd0d89e87ec1a46821bb69cf +Merge: a0c17ce 08a81da +Author: Namdak Tonpa +Date: Mon May 29 17:54:40 2017 +0300 + + Merge branch 'master' of github.com:nynja-mc/server + +commit a0c17cebe1db014676bfaa288fc7e46ebf611ac6 +Author: Namdak Tonpa +Date: Mon May 29 17:54:32 2017 +0300 + + EMQ 2.1.2 + +commit 08a81da75b4c9d26dec0f85a9adddab2f1363631 +Author: cryoflamer +Date: Mon May 29 17:25:00 2017 +0300 + + added Init connect for test_roster + +commit e3e36fed29091b6defb0577fabeb4cc4179337ce +Author: cryoflamer +Date: Mon May 29 15:26:48 2017 +0300 + + added roster_test mqttc gen_server + +commit 2132489991b5fe2d9fde06640b64fb4620526da1 +Merge: bdc8580 1dc9726 +Author: Namdak Tonpa +Date: Mon May 29 01:23:53 2017 +0300 + + Merge branch 'master' of github.com:nynja-mc/server + +commit bdc8580bbece0b67a6e8f666173f504907a7751f +Author: Namdak Tonpa +Date: Mon May 29 01:23:45 2017 +0300 + + fmt + +commit 1dc97264cb80fb2db1fdc23f2136b9a7226d97e8 +Author: Namdak Tonpa +Date: Mon May 29 01:16:48 2017 +0300 + + Update + +commit 30da5e302e7a21874c8d067f59e10afeae2d770d +Author: Namdak Tonpa +Date: Mon May 29 01:16:33 2017 +0300 + + Update SPEC-1.0.md + +commit 7458ba004f18a3ec6d8e7e01eb9f856bf4bd32ff +Author: Namdak Tonpa +Date: Mon May 29 01:00:26 2017 +0300 + + Update SPEC-1.0.md + +commit 247fee337f023370930c1b052114d5f6d5875a1b +Author: Namdak Tonpa +Date: Mon May 29 00:58:08 2017 +0300 + + Update SPEC-1.0.md + +commit 75b2edad86dc5abb12a50c000c2fa952efc8572e +Author: Namdak Tonpa +Date: Mon May 29 00:57:39 2017 +0300 + + Update SPEC-1.0.md + +commit 9f882e436b0926451569ad9978ea5e2899246d2f +Author: Namdak Tonpa +Date: Sun May 28 11:01:07 2017 +0300 + + message ordering + +commit 46dc58e23d2f21e8f491d67465a7c5c155c0af74 +Author: Namdak Tonpa +Date: Sun May 28 02:29:16 2017 +0300 + + nodes + +commit 0ac56cc3f4b4cba316603602a54b827a09f5775c +Author: Namdak Tonpa +Date: Sat May 27 21:27:56 2017 +0300 + + getting more robust + +commit b80eb1f0fe40bb91e7576a11e6b84606930d6645 +Author: Namdak Tonpa +Date: Sat May 27 12:26:40 2017 +0300 + + cleanup logs + +commit 34b739148fadce2954ffffbb72d9cfd4a4483e89 +Author: Namdak Tonpa +Date: Sat May 27 11:16:27 2017 +0300 + + remove modules + +commit 28e326c196bef5bd0e189f97a463b36321080f26 +Author: Namdak Tonpa +Date: Fri May 26 22:30:27 2017 +0300 + + svg title + +commit ed5ee58c5709954166248e0fb755565b1af7ace4 +Author: Namdak Tonpa +Date: Fri May 26 22:28:35 2017 +0300 + + cleanup + +commit e3de31c3cb743b5cd8e30239d695e4d8c43cbd03 +Author: Namdak Tonpa +Date: Fri May 26 21:00:08 2017 +0300 + + full functional sample + +commit 8e726eb9d9e6eaf4a7a11d4f02cc17064d000ead +Author: Namdak Tonpa +Date: Fri May 26 20:16:55 2017 +0300 + + broadcast message failed + +commit a4c94fb467456189d3b6dbcd4bd849635e8c453d +Author: Namdak Tonpa +Date: Thu May 25 20:10:03 2017 +0300 + + emqttc for testing + +commit c08942620c88faa09ec93767bf4e5c50066650a8 +Merge: 80bb14d c0416cc +Author: Namdak Tonpa +Date: Thu May 25 19:29:04 2017 +0300 + + Merge pull request #22 from NYNJA-MC/issue-13 + + Issue 13 + +commit c0416ccc0ab147095a85b8459d1e50d68d05dba1 +Author: ne-luboff +Date: Thu May 25 18:46:34 2017 +0300 + + Added protocol to token generation (issue #13) + +commit a30fc4313cf3c44449701d053fd051822840f76f +Author: ne-luboff +Date: Thu May 25 17:34:00 2017 +0300 + + started auth protocol implementation (#13) + +commit c1fea716f97689955872a1051bb7e6ce354cf305 +Merge: aa76aea 80bb14d +Author: ne-luboff +Date: Thu May 25 12:52:58 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into issue-13 + +commit aa76aea3414b630044a3f63e9dc62cec22514616 +Author: ne-luboff +Date: Thu May 25 12:41:11 2017 +0300 + + deleted unnecessary files and code (issue #13). + +commit 80bb14dc8415346d6c5b34c0febb446323d0939e +Author: Namdak Tonpa +Date: Wed May 24 17:18:04 2017 +0300 + + Update SPEC-1.0.md + +commit dbe1a36ca94dff41f9735f123599f0d5bc69ebca +Author: ne-luboff +Date: Wed May 24 11:51:03 2017 +0300 + + Started auth token implementation (Issue #13) + +commit 7467020fc34c26d5b9e083abb1fdcef5f7539017 +Author: Namdak Tonpa +Date: Tue May 23 15:18:13 2017 +0300 + + Update SPEC-1.0.md + +commit 792e2f409abbf2f59b75d8592d4d497b1073dc41 +Author: Namdak Tonpa +Date: Fri May 19 11:55:58 2017 +0300 + + Update SPEC-1.0.md + +commit 9bec47af7b30fbe9a2185016077e25fff486050f +Merge: b7e6763 c8b451d +Author: Namdak Tonpa +Date: Fri May 19 11:34:14 2017 +0300 + + Merge branch 'master' of github.com:nynja-mc/server + +commit b7e67633b62251f51395d455def1b5cc45064ed5 +Author: Namdak Tonpa +Date: Fri May 19 11:34:03 2017 +0300 + + readme #13 and #15 + +commit c8b451d674cf8699608bcea18093dab3a0698a9d +Author: Dmitriy Dovgiy +Date: Thu May 18 19:30:53 2017 +0300 + + removed .applist from git and added in gitignore + +commit 93c420bd03d00a47a6f094878df4f71edc7f16e3 +Merge: 9853374 cb8b406 +Author: Dmitriy Dovgiy +Date: Thu May 18 19:29:08 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 9853374977b4e6a6f09aef9516483c02955f6878 +Author: Dmitriy Dovgiy +Date: Thu May 18 19:28:54 2017 +0300 + + created spa and configed it like deps + +commit cb8b4063cfac6dc4248b29f9cbf7720ed65ff3b8 +Author: Namdak Tonpa +Date: Thu May 18 16:35:38 2017 +0300 + + fix + +commit 1822b662314a97855f579b41e950e943903c454d +Author: Namdak Tonpa +Date: Thu May 18 14:26:42 2017 +0300 + + roster + +commit acf3a0d8f8460d97c25c71c9e9185a1a0756514b +Author: Namdak Tonpa +Date: Thu May 18 10:51:19 2017 +0300 + + btstrp + +commit 6c9aae88df101d3f6bfd511a1f101758abf1fdd5 +Merge: 2c0d16c d452ec4 +Author: Namdak Tonpa +Date: Thu May 18 09:51:09 2017 +0300 + + Merge branch 'master' of github.com:nynja-mc/server + +commit 2c0d16c79d8d56026eb1715b94c718c4cec1a92a +Author: Namdak Tonpa +Date: Thu May 18 09:50:58 2017 +0300 + + move most static to CDN + +commit d452ec4104c8b61d27ecb6fdb19e0d2569750563 +Author: Namdak Tonpa +Date: Thu May 18 09:42:53 2017 +0300 + + Delete mqttws31.js + +commit 78f9dc728eaf0c9e5ee384a746a440c47e03bfcf +Author: Namdak Tonpa +Date: Wed May 17 15:40:49 2017 +0300 + + initial database + +commit 31902c51e9c50986028bc69e7d16878eebd4532c +Author: Namdak Tonpa +Date: Tue May 16 17:27:24 2017 +0300 + + host + +commit 4fc4a0b2f19b3f2d52705c7da121324ab646f84c +Merge: 6ad290b 6969a4c +Author: Namdak Tonpa +Date: Tue May 16 17:22:17 2017 +0300 + + Merge branch 'master' of github.com:nynja-mc/server + +commit 6ad290b9da207bd2f0862a41e428cd11c7abc8af +Author: Namdak Tonpa +Date: Tue May 16 17:22:09 2017 +0300 + + CDN MQTT + +commit 6969a4c2af5fff5e84962b0eeff6e02fd53e943d +Merge: 88779bb 5431809 +Author: Dmitriy Dovgiy +Date: Tue May 16 13:29:10 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 543180937d164d49c518ffbcccd093be8b85f669 +Author: Namdak Tonpa +Date: Tue May 16 13:24:46 2017 +0300 + + remove syslog finally + +commit 88779bbde1c1e31c6ebce2fcb301b87c562f26be +Author: Dmitriy Dovgiy +Date: Tue May 16 13:24:02 2017 +0300 + + added .gitignore + +commit b4c7fa40e587a368c4e2a22c962023dcd0c3e9b0 +Merge: d9e1a81 168a8d0 +Author: Namdak Tonpa +Date: Tue May 16 13:18:28 2017 +0300 + + Merge branch 'master' of github.com:nynja-mc/server + +commit d9e1a81275bbfebb982c77eed14951619975eeba +Author: Namdak Tonpa +Date: Tue May 16 13:18:19 2017 +0300 + + remove syslog + +commit 168a8d05c26deb2db8fa2751ffd40a4df722d982 +Author: Namdak Tonpa +Date: Tue May 16 12:55:05 2017 +0300 + + otp.mk + +commit a1048ff6b2bceedf6f0803ecd7df4447f5e4c0cd +Merge: b5e585e 635d728 +Author: Namdak Tonpa +Date: Tue May 16 11:32:43 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit b5e585eadd132db6cd306c40c540d10583e66281 +Author: Namdak Tonpa +Date: Mon May 15 09:02:13 2017 +0300 + + make plugins cd /Users/maxim/depot/voxoz/n2o + +commit 635d7284f141a3035564ee14db62317a1832cbe7 +Author: Namdak Tonpa +Date: Sat May 13 05:27:30 2017 +0300 + + Update SPEC-1.0.md + +commit fa7bae11d4c83056c2b6079e07c8e040f5aefce0 +Author: Namdak Tonpa +Date: Sat May 13 03:17:10 2017 +0300 + + Update SPEC-1.0.md + +commit 6a79f2a42fadf10f806a73dc306952bc418d2584 +Author: Namdak Tonpa +Date: Sat May 13 03:15:23 2017 +0300 + + Update SPEC-1.0.md + +commit 86cdec56b2f42b4298d2b43f7e1ea59abc2657a3 +Author: Namdak Tonpa +Date: Sat May 13 03:11:31 2017 +0300 + + Update SPEC-1.0.md + +commit c55d19a6e7ce156425a87df8eb9ad8e0c53426f3 +Author: Namdak Tonpa +Date: Sat May 13 03:09:18 2017 +0300 + + Update SPEC-1.0.md + +commit 16e66f4dbe329d44ff54e91e487f323f3bb9aa62 +Author: Namdak Tonpa +Date: Sat May 13 03:07:35 2017 +0300 + + Update SPEC-1.0.md + +commit 4139b4db8c54a8432ae5449e718a74867c6568d5 +Author: Namdak Tonpa +Date: Sat May 13 03:03:43 2017 +0300 + + Rename SPEC-1.0.txt to SPEC-1.0.md + +commit f0e56f3fcce0a4b5e28e84e73218bc84a8d9fb66 +Author: Namdak Tonpa +Date: Sat May 13 03:03:11 2017 +0300 + + protocol + +commit e6452079796c65e1566dfba784f6ad9402e98b5e +Author: Namdak Tonpa +Date: Thu May 4 17:32:43 2017 +0300 + + hex.pm + +commit ad927335e8ed6b2cbee0ed2c4985f2d1cc39d381 +Author: Namdak Tonpa +Date: Thu May 4 15:23:53 2017 +0300 + + remove lager + +commit d869d8af161a903d4e6f6f1ca390ffbb2c2384cc +Author: Namdak Tonpa +Date: Thu May 4 15:16:37 2017 +0300 + + review + +commit 8a107281485044fde9c391edda3c79f8c3600f6a +Author: Namdak Tonpa +Date: Tue May 2 17:12:30 2017 +0300 + + syslog + +commit 32499315ddcc562855f75c226cd11435f83d83b7 +Author: Namdak Tonpa +Date: Tue May 2 17:00:21 2017 +0300 + + syslog + +commit 9f2ebd05d9fec5de1176cce6e29277de175a280c +Author: Namdak Tonpa +Date: Tue May 2 03:05:36 2017 +0300 + + readme + +commit cb771268ceb03781289222d5a86fff277a819125 +Author: Namdak Tonpa +Date: Tue May 2 03:04:16 2017 +0300 + + readme + +commit 1de1174d9b4d1579a98000cf4f7119858270d796 +Author: Namdak Tonpa +Date: Tue May 2 02:17:15 2017 +0300 + + supress logs + +commit bd556a8bff90242f09a0c6fa1de7bd689511c05e +Author: Namdak Tonpa +Date: Tue May 2 01:07:06 2017 +0300 + + fix + +commit e47c2d4ac848391f2e534c3e674b76930340d6fa +Author: Namdak Tonpa +Date: Tue May 2 01:04:38 2017 +0300 + + cong + +commit 22b11e309abda20ac73b9f90fbf18d1ecffe7c06 +Author: Namdak Tonpa +Date: Tue May 2 00:56:47 2017 +0300 + + nitro + +commit 0bbeb4e80a2c09454ec13d52d25617e6457fd19f +Author: Namdak Tonpa +Date: Tue May 2 00:54:23 2017 +0300 + + n2o 4.5 mqtt + +commit 982634b7a5d2182c71a812a4628bb36bd63669dd +Merge: f531a13 2e3e251 +Author: Namdak Tonpa +Date: Thu Apr 27 05:04:20 2017 +0300 + + Merge branch 'master' of https://github.com/voxoz/mqtt + +commit f531a13db91bd1439462d7febc906c52a05adf38 +Author: Namdak Tonpa +Date: Thu Apr 27 05:04:15 2017 +0300 + + proto + +commit 2e3e251b6af5cc954bba4e350d5c89828e9cc3b3 +Author: Namdak Tonpa +Date: Wed Apr 26 23:23:46 2017 +0300 + + Update README.md + +commit 1432abede42610af210b500190c29d3d398e1f31 +Author: Namdak Tonpa +Date: Wed Apr 26 22:14:03 2017 +0300 + + mqtt + +commit 9b3493484e8bf247caf562e832da7e58652fcd3f +Author: Namdak Tonpa +Date: Wed Apr 26 22:12:48 2017 +0300 + + sample app title + +commit 78c605c71f01ebb7dd9f183ad3ea0ddb507810fb +Author: Namdak Tonpa +Date: Wed Apr 26 22:11:28 2017 +0300 + + synrc neo + +commit 151812b27757c72831a868ae03186af0a96ceec5 +Author: Namdak Tonpa +Date: Wed Apr 26 22:01:55 2017 +0300 + + pretty logs + +commit 72d83469ff34091a791b9fc10769a0225b7d96fe +Author: Namdak Tonpa +Date: Wed Apr 26 20:17:04 2017 +0300 + + message + +commit c95af4676c67b53a48526cfa7ff2a14a2d1228b1 +Author: Namdak Tonpa +Date: Wed Apr 26 16:14:30 2017 +0300 + + send + +commit 7aecc7262dd9c5964e07e50d4a0eec58d92997ff +Author: Namdak Tonpa +Date: Wed Apr 26 16:12:28 2017 +0300 + + new commit + +commit 37239d2796c215abef2b85f7ca61e5c6d4db476d +Author: Namdak Tonpa +Date: Wed Apr 26 07:49:03 2017 +0300 + + readme + +commit 36981badc9096babdaf8b6a0303fc9691f5c910e +Author: Namdak Tonpa +Date: Wed Apr 26 07:40:49 2017 +0300 + + readme + +commit 907ea7367d628c72350a707acde8cf17e77201d0 +Author: Namdak Tonpa +Date: Wed Apr 26 07:37:19 2017 +0300 + + readme + +commit 8e3159ae85c237316b34e7d8f6d84d0d6b21f486 +Author: Namdak Tonpa +Date: Wed Apr 26 07:25:13 2017 +0300 + + readme + +commit d6d73cda4e1c26617e0b8dca80d987307430a8f6 +Author: Namdak Tonpa +Date: Wed Apr 26 07:24:39 2017 +0300 + + readme + +commit 54756368e42209085c0579fce624a72a678f3634 +Author: Namdak Tonpa +Date: Wed Apr 26 07:16:17 2017 +0300 + + readme + +commit 1f4dae475089c2f722b36558ec6d91e853446364 +Author: Namdak Tonpa +Date: Wed Apr 26 06:39:01 2017 +0300 + + cleanup + +commit 32f3129211840fcb1a5d47bddd09b0d68414982e +Author: Namdak Tonpa +Date: Wed Apr 26 06:20:19 2017 +0300 + + cleanup + +commit dd19915a1e5ac216b86bc2d3a5fcdd9743677634 +Author: Namdak Tonpa +Date: Wed Apr 26 06:03:54 2017 +0300 + + cleanup + +commit e095862d82a30d2a4a43d53d9b3935911c72f3dc +Author: Namdak Tonpa +Date: Wed Apr 26 05:55:01 2017 +0300 + + readme + +commit 3b7fad47f9e927154d60079bfdd5156c5c7698ab +Author: Namdak Tonpa +Date: Wed Apr 26 05:27:01 2017 +0300 + + EMQ N2O + +commit cd923986fe8711e7084bf795291574dd1a2e1cc4 +Author: Namdak Tonpa +Date: Wed Apr 26 05:25:08 2017 +0300 + + cleanup N2O MQTT SPA sample + +commit 3f45334f11c1b04032fd3f234a381c6eb784c9fd +Author: Namdak Tonpa +Date: Wed Apr 26 02:42:55 2017 +0300 + + remote chat + +commit 50cb5512315d247b984c7b8416d13a9c6a68d873 +Author: Namdak Tonpa +Date: Wed Apr 26 02:16:26 2017 +0300 + + working Review sample + +commit 5b40cc7aada37e3a8226b14bed686659184bcbfe +Author: Namdak Tonpa +Date: Tue Apr 25 21:44:37 2017 +0300 + + bridge + +commit d8a3887443e39ce3bab08407f997a51fdfd89ca3 +Author: Namdak Tonpa +Date: Tue Apr 25 16:54:01 2017 +0300 + + n2o + +commit 631213486a51caaa164e1c0835641616da45a1e3 +Merge: 9b51983 b28567a +Author: Namdak Tonpa +Date: Tue Apr 25 13:13:39 2017 +0300 + + Merge branch 'master' of https://github.com/voxoz/mqtt + +commit 9b5198358c320967548c96e81cd9795287828b14 +Author: Namdak Tonpa +Date: Tue Apr 25 13:13:33 2017 +0300 + + added n2o to the project + +commit b28567abc19c9487f40d789b654d9248da07868d +Author: Namdak Tonpa +Date: Mon Apr 24 10:50:54 2017 +0300 + + Update README.md + +commit 58eeea95ed5512b4987b837cd7dd1ff1c71e04df +Author: Namdak Tonpa +Date: Mon Apr 24 10:50:37 2017 +0300 + + Update README.md + +commit fe4b64de77a59865d950c0cf2f3f2db82d72e4b5 +Author: Namdak Tonpa +Date: Thu Apr 20 22:02:43 2017 +0300 + + app.src, readme + +commit c9f8e05a2e2567f967d7d565e738bca2d4ed66f5 +Author: Namdak Tonpa +Date: Thu Apr 20 21:37:45 2017 +0300 + + apply master + +commit afcc2ca2bc7631c711b9fe400f7957ac9781f8c8 +Merge: 1292b42 a0c2662 +Author: Namdak Tonpa +Date: Thu Apr 20 21:01:13 2017 +0300 + + Merge branch 'master' of https://github.com/voxoz/mqtt + +commit 1292b4272c50e2d5e5e6d30f7c89fca62a13a433 +Author: Namdak Tonpa +Date: Thu Apr 20 20:58:33 2017 +0300 + + 1883 default port + +commit a0c266202e7f1a839e3aa0d980d678fa785d0392 +Author: Namdak Tonpa +Date: Wed Apr 19 23:09:04 2017 +0300 + + Update README.md + +commit c080e76c05e2d6be78ed495471f05b80d6eed893 +Author: Namdak Tonpa +Date: Wed Apr 19 23:08:21 2017 +0300 + + readme + +commit cc61424e4c335e8afe8fe56bc22293985e9489b8 +Author: Namdak Tonpa +Date: Wed Apr 19 23:03:23 2017 +0300 + + readme + +commit 2c2d252186d472420e8091508898f32865e1a88e +Author: Namdak Tonpa +Date: Wed Apr 19 20:01:38 2017 +0300 + + otp.mk + +commit de0690a1ada52675348d23002c10f8979ffbd334 +Author: Namdak Tonpa +Date: Wed Apr 19 18:26:34 2017 +0300 + + applist + +commit 7001615f3d84cdb641b9eaf203778bbd80f4e131 +Author: Namdak Tonpa +Date: Wed Apr 19 18:20:59 2017 +0300 + + release + +commit 32b72346a6e87a4d5962eb43685222fc75efb7af +Author: Namdak Tonpa +Date: Wed Apr 19 18:20:20 2017 +0300 + + release + +commit 28dabe982e7d570de874f43e8172d11e777ada7b +Author: Namdak Tonpa +Date: Wed Apr 19 17:38:08 2017 +0300 + + user + +commit f45bc418e45f540d27021317bb9677e728a619cf +Author: Namdak Tonpa +Date: Wed Apr 19 17:36:55 2017 +0300 + + readme + +commit 6a3e5325536971aff3a966c7d8b00e5c2462bf1d +Author: Namdak Tonpa +Date: Wed Apr 19 12:18:38 2017 +0300 + + client + +commit e3652a154fd796fbe3d92acf6cc0aa4306d40c5c +Author: Namdak Tonpa +Date: Wed Apr 19 11:53:39 2017 +0300 + + otp.mk + +commit ed94d7d3cdfed0644ad55d3f510c814161ffcd65 +Author: Namdak Tonpa +Date: Wed Apr 19 11:39:19 2017 +0300 + + emq_persistence, fix plugins + +commit 33c9a56e60c7f37dfe4df02d04a85b690b3d9e87 +Merge: 84eac76 8207cd6 +Author: Namdak Tonpa +Date: Wed Apr 19 11:01:24 2017 +0300 + + Merge branch 'master' of https://github.com/voxoz/mqtt + +commit 84eac761d98248120db064c1c432f10d384f3e39 +Author: Namdak Tonpa +Date: Wed Apr 19 11:01:18 2017 +0300 + + fix emq_modules + +commit 8207cd6ba7a723c9c1fb7a7a9ef7fdf16d614ac7 +Author: Namdak Tonpa +Date: Wed Apr 19 09:58:23 2017 +0300 + + Update README.md + +commit b50ac40a4fdc7577af1e00ce4c8c033d61231183 +Merge: 2db3645 0863233 +Author: Namdak Tonpa +Date: Tue Apr 18 21:42:54 2017 +0300 + + Merge branch 'master' of https://github.com/voxoz/mqtt + +commit 2db364579c0f5dd69094f1cbfdce8dd68171d770 +Author: Namdak Tonpa +Date: Tue Apr 18 21:42:45 2017 +0300 + + mode change + +commit 0863233481cda0dcfbf4cf79f7101cb739356266 +Author: Namdak Tonpa +Date: Tue Apr 18 21:19:56 2017 +0300 + + Update otp.mk + +commit 16376617b72e5650aea896ff0946b174af674d63 +Author: Namdak Tonpa +Date: Tue Apr 18 21:10:46 2017 +0300 + + make console, mad rep + +commit 5aa73787991ce83d501e8c15ae056ca1267d830a +Author: Namdak Tonpa +Date: Tue Apr 18 20:59:24 2017 +0300 + + remove mad + +commit 7c903bbaff56898c4ee1a5a8fe07ce24209bddd5 +Author: Namdak Tonpa +Date: Tue Apr 18 20:52:57 2017 +0300 + + make console + +commit 616c2c801de1ecf97ea40b348894c1f16c29cc52 +Merge: 8da5f49 374e4c6 +Author: Namdak Tonpa +Date: Tue Apr 18 20:18:47 2017 +0300 + + Merge branch 'master' of https://github.com/voxoz/mqtt + +commit 8da5f49a9f874a3d12aa5d93c98229a437121b1d +Author: Namdak Tonpa +Date: Tue Apr 18 20:18:41 2017 +0300 + + cleanup + +commit 374e4c688ee3cd5269d7a3ba53daaeaeab0728fe +Author: Namdak Tonpa +Date: Tue Apr 18 20:18:01 2017 +0300 + + Update README.md + +commit 079ccb2ad33b1516eb5974ef2ea8e6f59a333993 +Author: Namdak Tonpa +Date: Tue Apr 18 20:17:44 2017 +0300 + + Update README.md + +commit 3f5da7927a455cabb8ed596024a2fd4874ddeec1 +Author: Namdak Tonpa +Date: Tue Apr 18 20:14:21 2017 +0300 + + Update README.md + +commit 0bcf6b265c99704447127b22d17bdcaa13ec87d7 +Author: Namdak Tonpa +Date: Tue Apr 18 20:11:48 2017 +0300 + + Create README.md + +commit 6a609b5985dedeab443562331be75b18cc681862 +Author: Namdak Tonpa +Date: Tue Apr 18 20:08:44 2017 +0300 + + init diff --git a/hq b/hq new file mode 100644 index 000000000..bd2249f2d --- /dev/null +++ b/hq @@ -0,0 +1,6825 @@ +commit 454147d9fcea49a31944d48ddafbed1ebd61ecef +Author: qomputer +Date: Tue Aug 15 19:48:25 2017 +0300 + + Fix roster_auth + +commit 8e63e8a4a2f6b14070554986c95f76867457c98b +Author: Namdak Tonpa +Date: Tue Aug 15 18:52:53 2017 +0300 + + fix unread messages + +commit c9e54b56f0afbeab252515b42cba664e9afe24c3 +Author: Namdak Tonpa +Date: Tue Aug 15 18:50:34 2017 +0300 + + kvs unread + +commit ca7fb8bc6467dc4896ab47d62218a3feb7e49337 +Author: ne-luboff +Date: Tue Aug 15 17:45:17 2017 +0300 + + Add version dependency + +commit 296b3564cf18c624d74e79265efb493cb063f588 +Author: ne-luboff +Date: Tue Aug 15 14:00:21 2017 +0300 + + Update Auth Verify via SMS + +commit 279906c99d6af24bab6297c436c52acbd860791a +Author: ne-luboff +Date: Tue Aug 15 13:36:21 2017 +0300 + + Login method + +commit 40c3e98e6d7a98748160136dba885a920cbaae9f +Author: ne-luboff +Date: Tue Aug 15 13:30:34 2017 +0300 + + Add comment about logout method + +commit 605b4c954676e40de709d8b7d0046d4d07c9cde8 +Author: ne-luboff +Date: Tue Aug 15 12:34:59 2017 +0300 + + Add voice call in Auth2 + +commit f938ba913b814bce032f224c21da543fce04c6bf +Author: ne-luboff +Date: Tue Aug 15 11:51:54 2017 +0300 + + Add error for invalid input data + +commit b57765914e5acd1c8f1ad191c10f2181ae7994a9 +Author: ne-luboff +Date: Tue Aug 15 11:19:31 2017 +0300 + + Delete helper. Return Auth Reg (via sms) to Max's implementation + +commit 77d46bed195557e3ca482854d821e8bdd3287b32 +Merge: c7f7a7d 5242247 +Author: ne-luboff +Date: Tue Aug 15 11:10:38 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into auth2 + +commit c7f7a7dd518d7c56756012d13f284e6605dcbb06 +Author: ne-luboff +Date: Mon Aug 14 23:04:29 2017 +0300 + + Auth2 Reg Method (via SMS). Auth2 Verify (via SMS) + +commit 5242247203010f4e7cf2e0c2f58abdd126d9e31c +Author: qomputer +Date: Mon Aug 14 22:14:03 2017 +0300 + + Add sending of changed contact to p2p/phone_id + +commit f7b0c1ba76f34f985addcd925e30ffcd31a0dfed +Author: qomputer +Date: Mon Aug 14 16:54:48 2017 +0300 + + Add test for logout + +commit 65f704824dc488a60f1c25c0ff7af28732512f37 +Author: ne-luboff +Date: Mon Aug 14 15:21:06 2017 +0300 + + Replace io:format with ?LOG + +commit eb2a7bd28150294c35cd7f92c203b8fdeb255769 +Merge: 59a4401 0427fe0 +Author: ne-luboff +Date: Mon Aug 14 13:37:38 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into auth2 + +commit 59a44011cb7b1e9a7131a9a586c58ec68885bf05 +Author: ne-luboff +Date: Mon Aug 14 13:37:23 2017 +0300 + + Update telesign_api. Create roster_helper.erl + +commit 0427fe04254e543f588e8cb014eca41eff48e0cd +Author: qomputer +Date: Mon Aug 14 12:42:50 2017 +0300 + + Update the messaging of self with yourself + +commit f07ebd917776a2687f71779ba66d53c57b7225b5 +Merge: c6787f0 b35ae56 +Author: ne-luboff +Date: Mon Aug 14 12:05:43 2017 +0300 + + Fix merge conflict in roster.erl + +commit b35ae56f4f599da737c77fe7194d16b1e165a393 +Author: qomputer +Date: Fri Aug 11 21:24:37 2017 +0300 + + Fix status on confirm + +commit f3e948dd80e88bb1e9f61009cd8df4a493037a59 +Author: qomputer +Date: Fri Aug 11 20:29:52 2017 +0300 + + Fix p2p subscribe + +commit 2f7de22080cd33abcdc0a66faa4aab0e66a8aeea +Author: qomputer +Date: Fri Aug 11 20:13:06 2017 +0300 + + Update logout + +commit 29028a4a279281f94e039d65e587d3801114d7ef +Author: qomputer +Date: Fri Aug 11 19:26:47 2017 +0300 + + Fix request for Confirm + +commit c6787f00649770d39e2eeb16607e9df3ca5ceaef +Merge: 72d2a4c e6d650e +Author: ne-luboff +Date: Fri Aug 11 18:42:06 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit 72d2a4cc704932952837c874e9574e1f85d439ea +Author: ne-luboff +Date: Fri Aug 11 18:42:01 2017 +0300 + + Small refactoring + +commit e6d650e0c61e7fa160ddbf0692d85c8b379afb63 +Author: qomputer +Date: Fri Aug 11 18:23:00 2017 +0300 + + Fix auth when user_id=[] + +commit 0c659d6f2d8277f0b32a7e2db6ae321e60187628 +Author: qomputer +Date: Fri Aug 11 18:04:56 2017 +0300 + + Fix staus on confirm + +commit a064aa3d5342715f20a273186ddd8c178ed8b0a9 +Author: qomputer +Date: Fri Aug 11 17:30:25 2017 +0300 + + Fix staus on connect + +commit 254d13e0f6ad36d122ba1bf99d4f9d5f177930ef +Author: qomputer +Date: Fri Aug 11 17:11:32 2017 +0300 + + Fix staus on disconnect + +commit 4c83d8020a1a949b88a154c91b9541eb145b4bd0 +Merge: f25d81b df5d449 +Author: ne-luboff +Date: Fri Aug 11 17:04:19 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit f25d81bedd68012227163f37c9ac190ba60d6353 +Author: ne-luboff +Date: Fri Aug 11 17:04:12 2017 +0300 + + Add more logs to auth. + Replace io:lib with log. + Start reauth test + +commit df5d4491af8bfa0a78497b1e3277aa37bbd08434 +Author: qomputer +Date: Fri Aug 11 16:41:36 2017 +0300 + + Update presences + +commit e4e0d96faf52bb1bde030c0afed8aa2c73096f6b +Author: qomputer +Date: Fri Aug 11 12:52:03 2017 +0300 + + Fix replay for set Roster + +commit c08da06d4c88fa94429a586b89b201d5162d9db1 +Author: ne-luboff +Date: Fri Aug 11 12:25:35 2017 +0300 + + Replace io:format with LOG in MEssage proto + +commit e22ad48b53e36f02bc6f0318d691c832b12be53f +Author: ne-luboff +Date: Fri Aug 11 12:07:32 2017 +0300 + + Update SET roster response + +commit c148758ee1e96b5db063771531a67f79fd549833 +Author: ne-luboff +Date: Fri Aug 11 12:05:07 2017 +0300 + + Update SET roster response + +commit 1e2e3d36f742560a1ef84d5a4527e881b5dbf641 +Author: 5HT +Date: Fri Aug 11 03:20:04 2017 +0000 + + acl moved to roster + +commit 8b28f34b7b03ee2dace754983c8b10d23b3d3966 +Author: Namdak Tonpa +Date: Fri Aug 11 05:59:04 2017 +0300 + + logout + +commit 337cd649780fd3093deb3599c876c12abece6d20 +Author: Namdak Tonpa +Date: Fri Aug 11 05:38:44 2017 +0300 + + logout + +commit f9b428003fbb2a2a86ac076915df0130725f7cab +Author: Namdak Tonpa +Date: Fri Aug 11 05:28:13 2017 +0300 + + resend + +commit 0f905f41caabc3b07101bb4e90e533b1f2535ed8 +Author: Namdak Tonpa +Date: Fri Aug 11 05:14:59 2017 +0300 + + resend + +commit 45674fa70e2f721cdd25a36c7d17b39096ec9401 +Author: Namdak Tonpa +Date: Fri Aug 11 05:13:56 2017 +0300 + + resend + +commit 926678442397324e0fada0269eb70eb3a74eef09 +Author: Namdak Tonpa +Date: Fri Aug 11 04:47:02 2017 +0300 + + minimize reg clauses fro auth2 + +commit 8a26052f8c995f2a8f8a8060b70efa92d9fdb507 +Author: Namdak Tonpa +Date: Fri Aug 11 04:43:49 2017 +0300 + + minimize reg clauses fro auth2 + +commit 1a659e5f54e1ff71c3bbe3ed57cda668cfb09b0b +Author: Namdak Tonpa +Date: Fri Aug 11 04:40:17 2017 +0300 + + async SMS sending in auth2 + +commit 588c9c297e8c7ad7bd2d9a4c2af01c9d96511f84 +Author: Namdak Tonpa +Date: Fri Aug 11 04:36:00 2017 +0300 + + remove cycling dependency n2o <-> roster + +commit 441ef2f13c42a014d515b3b34f330e77047459c8 +Author: Namdak Tonpa +Date: Fri Aug 11 04:27:14 2017 +0300 + + minimize reg clauses fro auth2 + +commit 2aef3ec0b44abe5058c7c11fb6b29aded02d71cb +Author: Namdak Tonpa +Date: Fri Aug 11 04:15:07 2017 +0300 + + SMS and JWT sending + +commit 27e5e6b33921d97714d723ee96c7a9237feffeec +Author: Namdak Tonpa +Date: Fri Aug 11 02:48:24 2017 +0300 + + move presence broadcast to presence module + +commit a6061c8b52305fa56023d6dd0ff00076471e3fad +Author: Namdak Tonpa +Date: Fri Aug 11 02:41:06 2017 +0300 + + freeze + +commit 746962b1e70e1d68d1813d2a61c43a860f297a5a +Author: Namdak Tonpa +Date: Fri Aug 11 02:37:26 2017 +0300 + + freeze + +commit 534db0eec9054f4825eff2ba5316f6376041e527 +Author: Namdak Tonpa +Date: Fri Aug 11 02:24:20 2017 +0300 + + auth2 skeleton + +commit 8f309e3308b9d7d9aa61f2be47ca2a6197531d67 +Author: Namdak Tonpa +Date: Fri Aug 11 01:52:45 2017 +0300 + + auth2 skeleton + +commit 83317b2d9a62c84d189354540a3b14d995eb3b5a +Author: Namdak Tonpa +Date: Fri Aug 11 01:52:02 2017 +0300 + + auth2 skeleton + +commit 74bcc7d40f2668aa00f5a055896701ea8a0d4ca9 +Author: Namdak Tonpa +Date: Fri Aug 11 01:51:30 2017 +0300 + + auth2 skeleton + +commit db04e723a87acbc04ada7d270512a912207e563b +Author: Namdak Tonpa +Date: Fri Aug 11 01:49:50 2017 +0300 + + auth2 skeleton + +commit 977d62aa7b3091b22c7042311aa6f3516548ae95 +Author: Namdak Tonpa +Date: Fri Aug 11 01:48:20 2017 +0300 + + auth2 skeleton + +commit 19630db57d64d56dabcc436ad3351421417284b4 +Author: Namdak Tonpa +Date: Fri Aug 11 01:42:37 2017 +0300 + + cases structuring + +commit e162c55b4a381099f989bec794263437654fb905 +Author: Namdak Tonpa +Date: Fri Aug 11 01:41:39 2017 +0300 + + cases structuring + +commit 9ecca4205455ba8d7fbac79c7fe3a020d0382ff6 +Author: Namdak Tonpa +Date: Fri Aug 11 01:20:05 2017 +0300 + + auth2 skeleton for Team Review + +commit e75d676ca67a130187553dd9fe70df7525541c8f +Author: 5HT +Date: Thu Aug 10 19:09:38 2017 +0000 + + ATTENTION: revert this if any problems + +commit 42f54b017e76a5ce89df519f04a66c561f5b6b30 +Author: 5HT +Date: Thu Aug 10 18:59:52 2017 +0000 + + night + +commit b2f51baf270d1bdece9e6e9ebd148ad1386aaccc +Author: qomputer +Date: Thu Aug 10 19:43:19 2017 +0300 + + Fix on_auth_post + +commit 79f75365e6dad47d7c372b2a132a63120e000518 +Author: Namdak Tonpa +Date: Thu Aug 10 19:28:34 2017 +0300 + + fix VoxLogin + +commit d50c464f2fc9c664c10b296ae3fccb4902581f28 +Author: qomputer +Date: Thu Aug 10 19:03:05 2017 +0300 + + Fix on_auth_post + +commit 74ccffe33a9cf8cfb6a8984be48b4528c9145b31 +Author: ne-luboff +Date: Thu Aug 10 16:10:13 2017 +0300 + + Delete debyg vox test + +commit 882203e0c80b3dabdae4d4ee42103a1bcb32e1b4 +Merge: 17c2365 1834a3c +Author: ne-luboff +Date: Thu Aug 10 16:08:52 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voximplant_integration + +commit 1834a3c222c858aee294d44cab5d2b16636e3369 +Author: qomputer +Date: Thu Aug 10 15:51:25 2017 +0300 + + Fix set Roster + +commit 17c23658f6c5a667460df09eaaf12ecb36a46a75 +Author: ne-luboff +Date: Thu Aug 10 15:25:46 2017 +0300 + + Test function for vox user login + +commit 3415391f5e09a14ef837f6597fa3668087952de6 +Author: qomputer +Date: Thu Aug 10 14:24:41 2017 +0300 + + Fix add_contact + +commit 889c2fee2c01c4393efc05f91504bf46ab673d3b +Author: qomputer +Date: Thu Aug 10 14:14:30 2017 +0300 + + Fix for value person_id + +commit 5b842b62c4694288b66e2a080278c323e20aa065 +Author: qomputer +Date: Thu Aug 10 13:28:05 2017 +0300 + + Fix on_auth + +commit 213a9364c94416f3a17fa718331103bcc5552a6d +Author: qomputer +Date: Thu Aug 10 13:13:39 2017 +0300 + + Add fake_vox and fix p2p subscribe + +commit a6402c6f36c5a1620be9eae57430a8ec877cfb25 +Author: Namdak Tonpa +Date: Wed Aug 9 20:11:51 2017 +0300 + + Update roster_message.erl + +commit 0113b13686ebaeed3471ce82699b544102f8431d +Author: ne-luboff +Date: Wed Aug 9 19:13:54 2017 +0300 + + Remove debug code + +commit 7514303f9d2752e2f414ae0dc074eb1672086174 +Author: ne-luboff +Date: Wed Aug 9 19:13:07 2017 +0300 + + Replace io:format with LOG " + +commit a1f7fc5f8f83ab50791bf571172e80255386224a +Author: ne-luboff +Date: Wed Aug 9 19:11:04 2017 +0300 + + Remove debug code + +commit f3ea07c98cfaa689b2fb0e30c0eaa1446a93e6f1 +Author: ne-luboff +Date: Wed Aug 9 19:10:12 2017 +0300 + + Remove debug function + +commit 9d6b3814c0da9030ba6da43a2a19d55a2e0faa5d +Author: ne-luboff +Date: Wed Aug 9 19:09:13 2017 +0300 + + Merge new_roster function with master + +commit 3e3caee38ad8eea639a3668295014c980d2a365f +Author: ne-luboff +Date: Wed Aug 9 19:03:09 2017 +0300 + + Replace io:format with ?LOG + +commit 973f66f31b9dda96cfcb8e81a12fb45f9d4f0bf4 +Author: ne-luboff +Date: Wed Aug 9 18:59:28 2017 +0300 + + Delete debug logs + +commit 30e55f505741da1623681e25b8d22294524c840a +Merge: 5ba8ce9 5a4a18d +Author: ne-luboff +Date: Wed Aug 9 18:53:09 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voximplant_integration + +commit 5a4a18d71053423393a5f9080098ed7869e2b5da +Author: qomputer +Date: Wed Aug 9 18:42:08 2017 +0300 + + Fix fake account + +commit 8fc77244530128f1e83972420d29b40076606147 +Author: Namdak Tonpa +Date: Wed Aug 9 18:15:27 2017 +0300 + + person_id in self + +commit 6ca6af4db70f69a69a843c2cccf587041bb0bc15 +Author: Namdak Tonpa +Date: Wed Aug 9 18:09:41 2017 +0300 + + vox + +commit d683ff6907b6072c86a40e10bd2cd12aab9dfe1f +Author: Namdak Tonpa +Date: Wed Aug 9 18:04:33 2017 +0300 + + fix roster + +commit 91934d4d7cb6db2c283bbae6f0250608eff07601 +Merge: 0af3889 a16a5fe +Author: Namdak Tonpa +Date: Wed Aug 9 18:00:35 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 0af3889c1a44156bc33ac2025bbc1adee55183ea +Author: Namdak Tonpa +Date: Wed Aug 9 18:00:31 2017 +0300 + + roster + +commit a16a5fef7fede7318eb483573452886fafb57f90 +Author: 5HT +Date: Wed Aug 9 15:00:02 2017 +0000 + + io:format + +commit 81320eab2d06be886e02bbb2b04e7654f9c33000 +Author: Namdak Tonpa +Date: Wed Aug 9 17:22:25 2017 +0300 + + vox in contact + +commit 0ce2f22977e4870db351c84c23679a1ad6e96733 +Merge: bf345f8 6c6ade0 +Author: Namdak Tonpa +Date: Wed Aug 9 17:02:52 2017 +0300 + + roster fix + +commit 6c6ade0df3075d6841d864c24c9ce43a75548ec6 +Author: 5HT +Date: Wed Aug 9 14:02:30 2017 +0000 + + fix roster + +commit bf345f8c6258617d438f3aeab7744d8386ffd168 +Author: Namdak Tonpa +Date: Wed Aug 9 16:54:00 2017 +0300 + + fix crash + +commit 81f5e2d1e2cd3d3f3440f4410d795e2c28e84455 +Author: Namdak Tonpa +Date: Wed Aug 9 16:50:14 2017 +0300 + + Person + +commit 4da9a0100d7148d4e763ce1452726b8ec19ba88b +Author: 5HT +Date: Wed Aug 9 13:40:03 2017 +0000 + + Person + +commit 5ba8ce98fb97891df1962c713c30c851d1d593c4 +Author: ne-luboff +Date: Wed Aug 9 16:27:25 2017 +0300 + + Fix merge conflict + +commit 5e1899e0af9f8a686e32f39c8c22c87b928b7c53 +Author: Namdak Tonpa +Date: Wed Aug 9 16:24:28 2017 +0300 + + person topic + +commit 3661e848a56d3f96dc2df191726bbdaa83630bd7 +Author: ne-luboff +Date: Wed Aug 9 16:22:06 2017 +0300 + + Fix typo + +commit 47f9adfc01d0514dfede05dcc1cd5cc3ce8c2f3f +Merge: 5007506 9f1df17 +Author: ne-luboff +Date: Wed Aug 9 16:20:38 2017 +0300 + + Fix merge conflict + +commit 9f1df1707d7c5f8401d41b19f299748a98a8d171 +Merge: 0697b9c c934479 +Author: Namdak Tonpa +Date: Wed Aug 9 16:18:42 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 0697b9cbd5362d2eda3261adf38a6a6d02d39086 +Author: Namdak Tonpa +Date: Wed Aug 9 16:18:31 2017 +0300 + + vox + +commit c934479176e1b6b5d6d4fb84202e86a0900209b9 +Author: qomputer +Date: Wed Aug 9 15:57:34 2017 +0300 + + Fix roster_auth + +commit ea3b2eeb572c0a9aefc819b31f886d49cf1424f6 +Author: qomputer +Date: Wed Aug 9 15:53:40 2017 +0300 + + Fix to save confirm-messages + +commit 5007506ea5616a86c3612cfdadbd5e6374fc87f9 +Merge: 264534a fd4950e +Author: ne-luboff +Date: Wed Aug 9 15:43:12 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voximplant_integration + +commit 264534ad678b29ee62146210ad5ad0bda51e97b6 +Author: ne-luboff +Date: Wed Aug 9 15:42:10 2017 +0300 + + Debug. Work with spawned + +commit fd4950e86e0058e8fd590b4fbc45d0b874f1b3a5 +Author: qomputer +Date: Wed Aug 9 15:37:37 2017 +0300 + + Fix supscribe p2p in roster_auth + +commit 2e064c0db01c7c7ecb66ce4e15d29c0e388087de +Author: 5HT +Date: Wed Aug 9 12:16:33 2017 +0000 + + search srach fix + +commit 00c8c3d607e04ab1a813444ec5b3490c2358c190 +Author: Namdak Tonpa +Date: Wed Aug 9 15:13:45 2017 +0300 + + cleanup + +commit b0577f0f3a7b84d4ad4b5385428324cace6efe3e +Merge: a773f88 9b2a38f +Author: 5HT +Date: Wed Aug 9 12:12:33 2017 +0000 + + auth + +commit a773f88bf5463ab5f9f7f1f84c9be1e10ca4868e +Author: 5HT +Date: Wed Aug 9 12:11:52 2017 +0000 + + message + +commit 9b2a38f5cf818fa0da0e783728626a2b7102adc4 +Author: Namdak Tonpa +Date: Wed Aug 9 15:11:02 2017 +0300 + + cleanup + +commit 421f55a8e11ae33bf301d3ad3546ebcda58b9ae2 +Author: 5HT +Date: Wed Aug 9 11:32:41 2017 +0000 + + message + +commit 21e2619b8c0e5141d10df6658b8e27b883a8697f +Author: qomputer +Date: Wed Aug 9 14:15:55 2017 +0300 + + Fix statuses for friend + +commit 043ca5d8e1c5cd9a725ff14fb0f0152e9a9b3d38 +Author: qomputer +Date: Wed Aug 9 14:05:04 2017 +0300 + + Remove statuses patch and set + +commit 11c454cb61c094745c9b21719787ac14ee36028c +Merge: 3a35f4b 8ac9915 +Author: ne-luboff +Date: Wed Aug 9 13:51:17 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voximplant_integration + +commit 3a35f4b06d9e7193900fa8e7dc0670610ac05f5e +Author: ne-luboff +Date: Wed Aug 9 13:50:58 2017 +0300 + + Debug code + +commit 8ac99155236111354a21066a54309d94e8690af5 +Author: Namdak Tonpa +Date: Wed Aug 9 12:41:26 2017 +0300 + + message + +commit a4893840d925d1b8bb3d0c5fcfcc487bfac5b265 +Author: Namdak Tonpa +Date: Wed Aug 9 12:36:26 2017 +0300 + + back + +commit 6351fba30c6dd6e851121744ab1298b120231f7c +Author: Namdak Tonpa +Date: Wed Aug 9 12:30:29 2017 +0300 + + new Message protocol + +commit 3360e8905376964cc64d200c3b1322f06c0d0bf3 +Merge: d58df28 24e94f0 +Author: ne-luboff +Date: Wed Aug 9 11:58:38 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voximplant_integration + +commit 24e94f059216f710bbfc97e71ef127ebc5ad6547 +Author: Namdak Tonpa +Date: Wed Aug 9 11:58:23 2017 +0300 + + presence + +commit d58df28e1787b7745e80d0cc7b25ddaf88aaa936 +Merge: 4c81cdf b150ebb +Author: ne-luboff +Date: Wed Aug 9 11:54:21 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voximplant_integration + +commit b150ebb33050df1bc07e77af48232ed6ee33894e +Author: Namdak Tonpa +Date: Wed Aug 9 11:41:19 2017 +0300 + + crash fix + +commit d636d76beeba9495c59b18f34d13b8a24612f394 +Author: qomputer +Date: Wed Aug 9 11:36:32 2017 +0300 + + Fix subscribe_p2p + +commit 754a8ae4725806e9095e2f08c55db51d8216e85d +Author: Namdak Tonpa +Date: Wed Aug 9 02:39:29 2017 +0300 + + fix History model for iOS + +commit 96ab4481904e8f9d4b98d186e5ee86b0ef4a23f0 +Author: Namdak Tonpa +Date: Wed Aug 9 01:42:08 2017 +0300 + + don't use bullshit names like , /cc @cryoflamer NO MORE THAT ONE UNDERSCORE PER ATOM + +commit bc772031a6530162215b67a9ffc5f592371ca70a +Author: qomputer +Date: Wed Aug 9 01:32:27 2017 +0300 + + Update subscribe_p2p + +commit fc5bb3740b235370ab0567545c0a73c93c914c4f +Author: Namdak Tonpa +Date: Wed Aug 9 00:20:49 2017 +0300 + + retain + +commit c3c6197f253445fe7020f08858078673506783a0 +Author: Namdak Tonpa +Date: Tue Aug 8 23:56:42 2017 +0300 + + fix crasg + +commit 1e6015817bd0f85c8ffdbe23232fd580203cf31e +Author: Namdak Tonpa +Date: Tue Aug 8 21:50:37 2017 +0300 + + pretty + +commit ae146a22d0d5d019bd0f6b9120bbb159188083ef +Author: Namdak Tonpa +Date: Tue Aug 8 21:48:49 2017 +0300 + + fix double profile on init + +commit 2b8f2e28511be765f8ae72882a268d83165cd49e +Author: Namdak Tonpa +Date: Tue Aug 8 21:43:03 2017 +0300 + + profile on init should be sent once + +commit 4c81cdf4e829983ce029b150f39d3bb2aad04606 +Author: ne-luboff +Date: Tue Aug 8 21:33:33 2017 +0300 + + Add TODO for refactoring + +commit e2d864e8dab1b634dabe4be7f13d354aa9097bba +Author: Namdak Tonpa +Date: Tue Aug 8 21:18:12 2017 +0300 + + last message + +commit 61b2eb4fb5f57b2ea23ef33a4bea2a7df2df91e0 +Author: Namdak Tonpa +Date: Tue Aug 8 20:55:09 2017 +0300 + + set mime type for system message about friending + +commit 8a58a39dafc983b5b337a840d492026b6b799cd1 +Merge: 09a5b23 63e38f8 +Author: Namdak Tonpa +Date: Tue Aug 8 20:49:22 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 09a5b232e013ffeaeec04f5b11a9ef88c07ec2bd +Author: Namdak Tonpa +Date: Tue Aug 8 20:49:15 2017 +0300 + + remove comments + +commit 63e38f83471ff3252d1b56fe21a3e06a935035af +Merge: de5c43a 4998943 +Author: ne-luboff +Date: Tue Aug 8 20:27:25 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voximplant_integration + +commit de5c43a1aff819dc822aca18e2e959eec9fbb2e6 +Author: ne-luboff +Date: Tue Aug 8 20:27:10 2017 +0300 + + Add VoxImplant User Id to Roster Contact object + +commit 4998943dc60ed933032e555d58827913bd5787dd +Author: qomputer +Date: Tue Aug 8 19:44:28 2017 +0300 + + Fix on_auth and on+disconnect + +commit 527aef2d57be72d9745f8340b4e9213901c7deec +Author: Namdak Tonpa +Date: Tue Aug 8 18:20:37 2017 +0300 + + these LOG message are not working! attention + +commit 7790e331f809de56424d4483b5210dbdff53cd13 +Author: Namdak Tonpa +Date: Tue Aug 8 18:19:30 2017 +0300 + + fix + +commit 8066325c79225c5fb849b683f4bdfe67be7b685b +Author: qomputer +Date: Tue Aug 8 17:27:45 2017 +0300 + + Fix presense in Profile + +commit 62d611351c60cd3e141df4c3b10bd26cae63fc35 +Author: Namdak Tonpa +Date: Tue Aug 8 17:08:43 2017 +0300 + + p2p + +commit 68dab834beb62cd20659339f73cd795247c3d618 +Author: Namdak Tonpa +Date: Tue Aug 8 17:05:40 2017 +0300 + + feed_key + +commit 25d033401afb2168e3e001245135465f97b638e8 +Author: Namdak Tonpa +Date: Tue Aug 8 16:59:41 2017 +0300 + + payload in Desc + +commit 2f7281e0522486d7bad8ec2ffcd5c080d40476d1 +Author: Namdak Tonpa +Date: Tue Aug 8 16:56:06 2017 +0300 + + payload + +commit 6df781597d85e3c8dbead2edef88fcdb4cbe5759 +Merge: d20ca99 f237afc +Author: Namdak Tonpa +Date: Tue Aug 8 16:54:03 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit d20ca99a3ca482b5f9ab0f1530b64dfb70d75cec +Author: Namdak Tonpa +Date: Tue Aug 8 16:53:56 2017 +0300 + + cursor + +commit f237afc4d7b1be00439400df5a70b3bb68ef7013 +Merge: f006b4d 5b990ad +Author: ne-luboff +Date: Tue Aug 8 16:47:08 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit f006b4d2f2bb507e239a486100403eb42edf7182 +Author: ne-luboff +Date: Tue Aug 8 16:47:03 2017 +0300 + + Found error in send_to_session + +commit 5b990adb26c2e7f34a25fc621c3e3e0c056e95cb +Author: Namdak Tonpa +Date: Tue Aug 8 16:43:58 2017 +0300 + + parse trams + +commit 0704e9e75e0031a8a939eb3ba38b43879eeee4e6 +Merge: 0300f82 0306b30 +Author: ne-luboff +Date: Tue Aug 8 16:38:15 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit 0300f826ea7f9f13246c9dd8e8d6951482f124da +Author: ne-luboff +Date: Tue Aug 8 16:38:08 2017 +0300 + + Add space in verification code + +commit 0306b3020779c6d17ff3b947c9c58cf0e5f06c94 +Author: Namdak Tonpa +Date: Tue Aug 8 16:37:07 2017 +0300 + + new models + +commit 64ea1813dc30ace87b0a53836a9450482e3d2fdc +Author: Namdak Tonpa +Date: Tue Aug 8 16:21:55 2017 +0300 + + fix model + +commit 670ab5150273667db55c7ac923b295e87cac60b2 +Author: Namdak Tonpa +Date: Tue Aug 8 16:20:28 2017 +0300 + + remove sub/unsub on conn/disconn + +commit 9ac2d7e1afb82e0b07ea6765f3573742887ee3f1 +Merge: 2807b3c 44f52fa +Author: Namdak Tonpa +Date: Tue Aug 8 15:35:59 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 2807b3c9d5e10729c5d93285ad3dc74c8e323473 +Author: Namdak Tonpa +Date: Tue Aug 8 15:35:51 2017 +0300 + + parse trans + +commit 44f52fa52fa49f9a9a6b9166582cbf1db80853ae +Merge: a8a3a6c d865c98 +Author: ne-luboff +Date: Tue Aug 8 15:34:27 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit d865c986747411335e6cb42bc4a9641dbaa3a39b +Author: Namdak Tonpa +Date: Tue Aug 8 15:34:00 2017 +0300 + + fix auth + +commit a8a3a6c1135106089d4f4e99a270baeff9c6c044 +Merge: a0f7c05 a0551c1 +Author: ne-luboff +Date: Tue Aug 8 15:33:56 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voximplant_integration + +commit a0551c1fd602add34787029ddd9060c4185fd6e8 +Merge: 08faeee bba7988 +Author: Namdak Tonpa +Date: Tue Aug 8 14:58:57 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 08faeeec8eda2aa817c7ca3b199ee5f12c51875f +Author: Namdak Tonpa +Date: Tue Aug 8 14:58:49 2017 +0300 + + don't unsubscribe on disconnect + +commit a0f7c05078da85d33975c3df6b692d9c69fa16ee +Author: ne-luboff +Date: Tue Aug 8 14:56:25 2017 +0300 + + Add vox user creation and add it to Person object + +commit bba7988aeeb282687e33c550e22290961c9306cd +Merge: d9fd491 db5098a +Author: Anton Makarov +Date: Tue Aug 8 14:38:07 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit d9fd49126458e3dbb03de93353dc879b6f91cd82 +Author: Anton Makarov +Date: Tue Aug 8 14:37:58 2017 +0300 + + Updated TypeSpec: Int -> Int64 + +commit db5098a8c88ae435c256138fed189eaf1050907a +Merge: 3a74b72 c1f0a06 +Author: Namdak Tonpa +Date: Tue Aug 8 14:00:25 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 3a74b72f165467560d60f5566b923e900434350a +Author: Namdak Tonpa +Date: Tue Aug 8 14:00:06 2017 +0300 + + post + +commit 8839209ffa10393223086be84d226c3d1af4a645 +Author: ne-luboff +Date: Tue Aug 8 13:56:01 2017 +0300 + + Update voximplant user creation test + +commit 197d0cb1c3387359b4343f59d61de18bd40941dd +Merge: 7c68776 c1f0a06 +Author: ne-luboff +Date: Tue Aug 8 13:51:59 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voximplant_integration + +commit c1f0a0657f32f72cec58507f599557d0dfb429c2 +Merge: abf9479 e83374e +Author: ne-luboff +Date: Tue Aug 8 13:51:06 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit 7c68776a01b80c7632d2e045808a57d53adcc4b0 +Merge: abf9479 e83374e +Author: ne-luboff +Date: Tue Aug 8 13:49:49 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voximplant_integration + +commit abf9479557172e2e09a9e101fe8290cc6d692ff2 +Author: ne-luboff +Date: Tue Aug 8 13:48:55 2017 +0300 + + Add alphanumeric random data generation + +commit e83374e62b7461572030466f99e14000bc662eb6 +Author: Namdak Tonpa +Date: Tue Aug 8 13:43:02 2017 +0300 + + models + +commit 8dac02d69dc64821e752f851566f0d88fdf32830 +Merge: 6a60e4f 3d6eafa +Author: Namdak Tonpa +Date: Tue Aug 8 13:39:08 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 6a60e4fac6b5608e96063f1144baa42f0880a420 +Author: Namdak Tonpa +Date: Tue Aug 8 13:38:06 2017 +0300 + + wip #65 + +commit 1ba5bfc8ac46421f7f3764b14514c3abc58f4e2d +Author: ne-luboff +Date: Tue Aug 8 13:27:04 2017 +0300 + + Use LOG macros instead of io:format + +commit c6b3cbbccdc71e94a00a931d87a9e399de515aba +Author: ne-luboff +Date: Tue Aug 8 13:24:08 2017 +0300 + + Fix typo. Add example Vox response + +commit 2c83ed5ec99bb1334a6f9fb269a79e20d00450f3 +Author: ne-luboff +Date: Tue Aug 8 13:21:19 2017 +0300 + + Extend Person model (add vox cred fields) + +commit 3d6eafa8334ed79081e29d6cacc20bcd8257e860 +Author: ne-luboff +Date: Tue Aug 8 13:09:06 2017 +0300 + + Update bash script (for amazon connecting) + +commit 097529a1b7b4441e4bf5d07ffa238366e7e7e147 +Author: Namdak Tonpa +Date: Tue Aug 8 03:26:20 2017 +0300 + + online/offline through Contact message, send Profile with Presences and Unread fileds in Contacts on login + +commit 70b310f268e26830b9a90460ad0e40a268e201ac +Author: Namdak Tonpa +Date: Tue Aug 8 02:58:54 2017 +0300 + + presence prerequisites + +commit 7d218ee227e1639fb5908884547888096c6197e3 +Author: Namdak Tonpa +Date: Tue Aug 8 02:51:00 2017 +0300 + + presence + +commit 625d8d2e4c65e0c5f2686d0619d72140328ef7ce +Author: Namdak Tonpa +Date: Tue Aug 8 02:50:49 2017 +0300 + + presence + +commit 110cfb0eb00b99331dc0d0a6258e2f27af251ef4 +Author: Namdak Tonpa +Date: Tue Aug 8 00:17:46 2017 +0300 + + Int -> Int64 + +commit 5d9c83ae015180c8ed0f1e1be3b4d6e7a6aa8550 +Author: Namdak Tonpa +Date: Mon Aug 7 16:08:13 2017 +0300 + + admin + +commit e2afe96c97ba95166e677d289bf30fe03154ff49 +Author: qomputer +Date: Fri Aug 4 19:42:39 2017 +0300 + + Add trycatch for P2P subscribe + +commit 0c5b7ce97e93d9f7e6b03080b0d892f6c5733780 +Author: qomputer +Date: Fri Aug 4 19:23:46 2017 +0300 + + Fix request for Confirm + +commit 8fd112cd3ddff1586b877e2c9a6f92a85392c504 +Author: cryoflamer +Date: Fri Aug 4 19:13:39 2017 +0300 + + updated online/offline presence + +commit 5194b44a340052f9ede8d46d8edfd5b3c7611d53 +Author: cryoflamer +Date: Fri Aug 4 18:49:17 2017 +0300 + + fix auth + +commit db05ea7959f9c1a9d5c3cd349c72a5264a247403 +Author: qomputer +Date: Fri Aug 4 18:28:25 2017 +0300 + + Add Log for UNKNOWN + +commit 431f91dad11c5c8fb13e12cca1869d12a0c6c273 +Author: cryoflamer +Date: Fri Aug 4 18:19:58 2017 +0300 + + upd profile update request + +commit 473bc7e91e8993e7c50a993ded13d8cd69a7430b +Author: qomputer +Date: Fri Aug 4 17:51:15 2017 +0300 + + Update patch for Roster + +commit d9871350c1b71d2f43abb079e3a4f159cfbb8fe4 +Author: cryoflamer +Date: Fri Aug 4 17:07:11 2017 +0300 + + added profile update + +commit f7d27165b68ff35d16970d6d3c8600e53bce0572 +Merge: b75667c 98d0fd5 +Author: Namdak Tonpa +Date: Fri Aug 4 16:10:37 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit b75667c8fb60b3b7d0cb1932e355ca26de320d38 +Author: Namdak Tonpa +Date: Fri Aug 4 16:10:30 2017 +0300 + + new iOS model + +commit 98d0fd508141cdc431c57bed9c78183a0f05613c +Author: cryoflamer +Date: Fri Aug 4 16:07:33 2017 +0300 + + added TODO for profile send after {ok, login} + +commit 6b58a21e1ed1ed394e025fc236054707d6c243ae +Author: Namdak Tonpa +Date: Fri Aug 4 15:55:16 2017 +0300 + + Desc + +commit cd840386c9e2c756710a78d2faf71f6baea831ee +Author: cryoflamer +Date: Fri Aug 4 14:30:43 2017 +0300 + + amend fixed subscribes before {ok, login} + +commit 4c85257c0fe0dc587d0354f4ae957079420299ef +Author: cryoflamer +Date: Fri Aug 4 14:18:26 2017 +0300 + + fixed subscribes before {ok, login} + +commit c6f13e40edf7d5a40b5a80063317ba4a054a8dd5 +Author: qomputer +Date: Fri Aug 4 14:16:30 2017 +0300 + + Fix Profile removing + +commit a2529b348420adfb2602e4455cb688f6894413b0 +Author: qomputer +Date: Fri Aug 4 13:47:48 2017 +0300 + + Fix p2p-subscribe for Friendship protocol + +commit 9e714bc718ab100ce8d8409c82536c23df70d766 +Author: cryoflamer +Date: Fri Aug 4 13:25:17 2017 +0300 + + fixed roster:now_msec + +commit ddb34f1d3551555a8239fa385c26832f21fe24b9 +Author: qomputer +Date: Thu Aug 3 20:30:55 2017 +0300 + + Fix status in Contact for Search + +commit 5832127f7a4ce9056563fa7e25ca1e8adf6d563a +Author: cryoflamer +Date: Thu Aug 3 20:18:12 2017 +0300 + + fix presence on_auth/on_disconnect + +commit b63a4223c3914ddc5ddccfc213fd79f89fdc3b4d +Author: qomputer +Date: Thu Aug 3 20:10:31 2017 +0300 + + Add check type of phone in Search + +commit 08409ba8a974656fa6bc6e40ebd6897f1a577344 +Author: cryoflamer +Date: Thu Aug 3 20:07:46 2017 +0300 + + upd search specs + +commit c57a1dfadf9fb2ef6b7d8c0e5d98aff98db2576e +Author: cryoflamer +Date: Thu Aug 3 19:53:43 2017 +0300 + + added log to roster_auth + +commit 8fcf6202f32bd54f8bf7abbd07c5401960c5fd07 +Author: qomputer +Date: Thu Aug 3 19:44:59 2017 +0300 + + Update Search + +commit 15e1c95ccdee73b4d088c88050945615cb6f9f65 +Author: cryoflamer +Date: Thu Aug 3 19:18:35 2017 +0300 + + added log to p2p subscribe + +commit fadaad5b38602fbeed4546c6fa46c2a910a79dd3 +Author: cryoflamer +Date: Thu Aug 3 18:53:09 2017 +0300 + + added log to p2p sub/unsub + +commit 593d6d3d41849b73b599c22a527bda4a35f54cc3 +Author: cryoflamer +Date: Thu Aug 3 18:45:03 2017 +0300 + + added log to p2p internal + +commit 8f70fdfd9bf9967c4b1de3414d06c7151c5b58de +Author: cryoflamer +Date: Thu Aug 3 18:33:38 2017 +0300 + + returned get profile + +commit 7e081c94ee064ddb6c88d95b893d2f0165fbd938 +Author: cryoflamer +Date: Thu Aug 3 18:22:25 2017 +0300 + + fix ?LOG macros + +commit 6772cdfeb4a02e0ec69a3c799fd55e07cc56e8cd +Author: cryoflamer +Date: Thu Aug 3 18:22:01 2017 +0300 + + fixed parts_phone_id + +commit b632bbc63500b555b3a3fe0cb229e4f0ff54886d +Author: cryoflamer +Date: Thu Aug 3 17:39:42 2017 +0300 + + fix "actions" bug + +commit 4b6ed87791f11ba686c99d6617065bdf5aabb11e +Author: qomputer +Date: Thu Aug 3 17:00:22 2017 +0300 + + Add finction update_roster + +commit 5926fd06f5dacc4edf3e7088bc79fa3e45d92200 +Author: cryoflamer +Date: Thu Aug 3 15:39:27 2017 +0300 + + fix mismatch_user_data bug + +commit bee14fb8d4028639e07fe5b68a510f6393bf6eaa +Author: ne-luboff +Date: Thu Aug 3 14:28:36 2017 +0300 + + Add asserts (for wiki page) + +commit a03b81868fbb82963d6d40c6be4a5d12707f054e +Author: cryoflamer +Date: Thu Aug 3 13:56:16 2017 +0300 + + added "edit" p2p message + +commit b75cdf3de3276a5b55059ff9df3e51efd7a7aa5e +Author: cryoflamer +Date: Thu Aug 3 13:42:13 2017 +0300 + + added id to answer for sent p2p message + +commit 653aa28e9ac1f9d0bbe30eaeedd5f855d94bca34 +Author: cryoflamer +Date: Wed Aug 2 19:32:22 2017 +0300 + + added roster:update_last_unread_contact/2 + +commit ee60ef786be6c632c4115c817ead540f12abc700 +Author: cryoflamer +Date: Wed Aug 2 19:01:04 2017 +0300 + + fix 'History' spec + +commit 2f3e77b999aeb333ea915bcb58f6e1b69b8e35ad +Author: qomputer +Date: Wed Aug 2 18:36:54 2017 +0300 + + Fix unchanging of last_msg and unread in Contact + +commit 8ea6990312e4076574a1609833abd77ca2c0f222 +Author: qomputer +Date: Wed Aug 2 18:25:52 2017 +0300 + + Fix update contacts + +commit 88ef623b991dc90b0164e75cfa773ad586b114dc +Author: qomputer +Date: Wed Aug 2 17:12:13 2017 +0300 + + Update request set for Roster + +commit b84231d4b03a0e3dc47aaf74bab2698b5e68d9fb +Author: cryoflamer +Date: Wed Aug 2 16:16:21 2017 +0300 + + upd get_contacts + +commit 23ce0fb007e672dbbbbeb59f6014c8204ac91a6e +Author: cryoflamer +Date: Wed Aug 2 16:15:20 2017 +0300 + + upd get_contacts + +commit 9d1e664cc9c12eb10e76cff39c638f7b957ab226 +Author: cryoflamer +Date: Wed Aug 2 16:13:42 2017 +0300 + + updated roster:get_contacts + +commit 695af85645e735628c82cca435084aa592a2358c +Author: cryoflamer +Date: Wed Aug 2 15:37:48 2017 +0300 + + added update profile to on_auth + +commit 752ed346fdcc6f5bca1e7ea1d9ea3fae499cc07d +Author: cryoflamer +Date: Tue Aug 1 19:32:47 2017 +0300 + + added update field to Profile + +commit 299fc6930befdc561625e4f32d49fd4b147fa548 +Author: qomputer +Date: Wed Aug 2 15:21:14 2017 +0300 + + Update messages for friends + +commit fc71536dbaf304ea47525902fc0fd40e25477815 +Author: qomputer +Date: Tue Aug 1 19:22:06 2017 +0300 + + Fix Confirm + +commit 0807758dab41e48bb2711b1f186ab9267233b4e0 +Author: cryoflamer +Date: Tue Aug 1 19:05:44 2017 +0300 + + added "update" field to Profile + +commit c06eecc516f8b76f41d91901f4bb9d1f1d360926 +Author: cryoflamer +Date: Tue Aug 1 18:06:33 2017 +0300 + + added NewLastLoadedMsgId + +commit c8b2bd02ba103cab03efa0a6ec06a63b70211cc0 +Author: cryoflamer +Date: Tue Aug 1 18:00:05 2017 +0300 + + added `History` update + +commit 8447728acd5048f449f927291bc1f2462b24c735 +Author: cryoflamer +Date: Tue Aug 1 17:02:02 2017 +0300 + + commented "-compile({parse_transform, roster_swift})." + +commit 7230d3701f7a39afd5a74c42fc97fb2ae1e5c8db +Merge: 1491606 1363699 +Author: ne-luboff +Date: Tue Aug 1 16:53:30 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit 1363699107c82a93ee48f6bbc2e3fa47bc4b8b2f +Author: Namdak Tonpa +Date: Tue Aug 1 16:52:59 2017 +0300 + + fix + +commit 5512e54a1c50d49f664d96c677d8c4a0cb31416a +Merge: a1fb5d0 69816b7 +Author: Namdak Tonpa +Date: Tue Aug 1 16:51:52 2017 +0300 + + fix + +commit a1fb5d014a10204151531895f5d94402b31a895f +Author: Namdak Tonpa +Date: Tue Aug 1 16:50:54 2017 +0300 + + fix + +commit 69816b76b3c07bfbd1633530276fa2bf53745c9d +Author: Anton Makarov +Date: Tue Aug 1 16:50:48 2017 +0300 + + Updated Model for test profile + +commit 149160687d6108045c174e3e8b025758a854aab5 +Merge: 33f3f4d f3f2e92 +Author: ne-luboff +Date: Tue Aug 1 16:48:49 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into logging + +commit 33f3f4d41e828b4370015ed637594f9e52cd86aa +Author: ne-luboff +Date: Tue Aug 1 16:48:36 2017 +0300 + + Update logs in roster_message + +commit f3f2e92903da16af03ff22b2aab773c29bcc6a55 +Author: Anton Makarov +Date: Tue Aug 1 16:41:48 2017 +0300 + + Fixed + +commit 071c259cbf2c49addb1115955f5c4bf3d7d00a83 +Author: Namdak Tonpa +Date: Tue Aug 1 16:37:48 2017 +0300 + + new model + +commit 6972cc8061de0ca3828cdf589f3a946c14834786 +Author: ne-luboff +Date: Tue Aug 1 16:33:23 2017 +0300 + + Add logs in roster_search + +commit 51480476962d78f36f47cc4a5c85fc71c9986ede +Author: ne-luboff +Date: Tue Aug 1 16:29:20 2017 +0300 + + Update logs in roster_roster + +commit 40420439d17375115627164dd8b759d3fe037019 +Author: ne-luboff +Date: Tue Aug 1 16:17:37 2017 +0300 + + Replace io:format with LOG in roster_proto + +commit 2f702ffc3b2ea5bd8c46124886ed93dabdebcbf7 +Merge: a089379 c31d382 +Author: ne-luboff +Date: Tue Aug 1 16:06:02 2017 +0300 + + Fix merge conflict in roster_auth + +commit a089379b6b7ecbed204ed64530755f9de76615fc +Author: ne-luboff +Date: Tue Aug 1 16:03:04 2017 +0300 + + Update logs in roster_person + +commit c31d382992a960be0c45975f43ccf6beb9f9fe29 +Author: cryoflamer +Date: Tue Aug 1 16:00:16 2017 +0300 + + added "created" and "last_online" fields to auth + +commit da755ce1a59c9bf4297953f051c8fc5abc8e0e16 +Author: ne-luboff +Date: Tue Aug 1 15:58:59 2017 +0300 + + Add logs in roster_profile + +commit 598198e336a41c6e2691c2dd3d40fbbe283a53f1 +Merge: 22c80d2 e7db0cb +Author: ne-luboff +Date: Tue Aug 1 15:31:54 2017 +0300 + + Fix merge conflict + +commit 22c80d2fb8aef16ec504da653060e316b62745d9 +Author: ne-luboff +Date: Tue Aug 1 15:24:52 2017 +0300 + + Add logging to roster_friend + +commit e7db0cb21c15a3dba01f8689be617d11dd2a6979 +Author: cryoflamer +Date: Tue Aug 1 15:02:16 2017 +0300 + + added unsubscribe p2p to on_auth + +commit 92ef6d294aca3520639cf166a52d27644b778e67 +Author: cryoflamer +Date: Tue Aug 1 14:43:57 2017 +0300 + + update roster_test + +commit a574257c14b3fc104446814071c9afd19829fd63 +Author: cryoflamer +Date: Tue Aug 1 14:38:18 2017 +0300 + + updated roster_test + +commit a53de5599a2b12878479385d40676f2a50d157d3 +Author: cryoflamer +Date: Tue Aug 1 14:25:11 2017 +0300 + + upd roster_test + +commit c37af2b3b8c046bbc4d292cf2252d28de36be096 +Author: cryoflamer +Date: Tue Aug 1 14:24:26 2017 +0300 + + added last_read message + +commit 754490d82432dbe08b67d47b026755a5a0847f2a +Author: qomputer +Date: Tue Aug 1 14:06:40 2017 +0300 + + Add search for phone + +commit 4400f5c5505bfd6ceb2c589864829e3c5d2d0aa9 +Author: qomputer +Date: Tue Aug 1 14:01:43 2017 +0300 + + Add Search + +commit 24563e1b7371aa4cc721ee44c3ed5ca6ad9a84c9 +Author: cryoflamer +Date: Tue Aug 1 13:49:03 2017 +0300 + + updated p2p + +commit 95ec352a235787cefe40195e2166ca596242d5a2 +Author: ne-luboff +Date: Tue Aug 1 13:33:55 2017 +0300 + + Update rister_friend file formatting + +commit fde246af27db37153500f4d00e6da8250ce31674 +Merge: ceee824 1c316ab +Author: ne-luboff +Date: Tue Aug 1 12:44:33 2017 +0300 + + Fix merge conflict with master branch (1c316ab) + +commit 1c316ab94e08236f499f66ef2c701493950fb448 +Author: cryoflamer +Date: Mon Jul 31 21:30:21 2017 +0300 + + added p2p subscribe to on_auth + +commit 76de7d7b3f34fa6cca454b3f1abeb03769f045fd +Author: qomputer +Date: Mon Jul 31 19:37:14 2017 +0300 + + Fix Roster and Friend request + +commit ea108976080baa3067e44b9ac9c4ac2d98854a2b +Author: qomputer +Date: Mon Jul 31 19:35:16 2017 +0300 + + Update subscribe_p2p etc + +commit 9776680f5e154866ee8eb083e3f6cff0400e6b33 +Author: cryoflamer +Date: Mon Jul 31 19:05:56 2017 +0300 + + added last_msg to p2p + +commit 9648d050bcfe321194af89393109c2457bfbcad7 +Author: qomputer +Date: Mon Jul 31 16:59:43 2017 +0300 + + Update statuses for Friendship protocol + +commit 7c235cafe8505cce3ac6c15244239e625e7a0db4 +Author: cryoflamer +Date: Mon Jul 31 15:26:26 2017 +0300 + + updated roster models + +commit ceee82484af7bad03ef268524c375a503873868a +Author: ne-luboff +Date: Mon Jul 31 15:23:23 2017 +0300 + + Add logs to Auth methods + +commit 5c42399ef66d7492ccf442911d080818c0e5b61d +Merge: 2ccfdfb e48a640 +Author: Namdak Tonpa +Date: Mon Jul 31 14:12:14 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 2ccfdfbe3a602bf1bb6d8dda33014c8be4b04b10 +Author: Namdak Tonpa +Date: Mon Jul 31 14:12:05 2017 +0300 + + search + +commit e48a64062116db9fe821e358653a322ed5d901e2 +Author: cryoflamer +Date: Mon Jul 31 13:53:24 2017 +0300 + + added jwt tests + +commit b625f0ee9e070dafa3c471c2f619ceaf3f7acef9 +Author: cryoflamer +Date: Mon Jul 31 13:06:20 2017 +0300 + + fixed "jwt" bug + +commit 3c9905df7faba34cec5210e1fd1482231c82410c +Author: cryoflamer +Date: Fri Jul 28 18:10:21 2017 +0300 + + added roster:send_action_phone/3 + +commit 898e649877c09d7bb41f65e672a39931d57af212 +Author: cryoflamer +Date: Fri Jul 28 18:02:45 2017 +0300 + + added subscribe to `actions/1/api/phone/:phone` + +commit 3f03b3ecc7f5b51aadcae9a7d93e3ba87fe0102e +Author: cryoflamer +Date: Fri Jul 28 17:00:30 2017 +0300 + + addd roster:now_msec/0 + +commit 62a8d22df59e9554ca86f0a2f00f671944fc29b0 +Author: qomputer +Date: Fri Jul 28 16:48:31 2017 +0300 + + Fix time for messages + +commit e78353ba2ef69d91ba541e77f1fb66422cc915bf +Author: cryoflamer +Date: Fri Jul 28 16:45:34 2017 +0300 + + updated retreive p2p history + +commit f3b60c647a204f505816e5e5e1cb9dbaa92d4d71 +Author: cryoflamer +Date: Fri Jul 28 16:15:26 2017 +0300 + + amend updated roster models + +commit e44314f5fd81e10540b029f7eea9f0cdb0f09dcb +Author: ne-luboff +Date: Fri Jul 28 13:52:25 2017 +0300 + + Delete debug logs + +commit 4ed143a89e989d98b6a2ca3eaa6e33ab9586bd50 +Merge: a7552c0 11c1c7e +Author: ne-luboff +Date: Thu Jul 27 16:13:06 2017 +0300 + + Fix merge conflict + +commit a7552c0c4e292c47ad6152f05a5c13a2a6a908c9 +Author: ne-luboff +Date: Thu Jul 27 16:11:19 2017 +0300 + + Add extra logs (issue #59) + +commit 11c1c7ed02d11b5117dc1212f4400553eafdba3d +Author: cryoflamer +Date: Thu Jul 27 15:20:56 2017 +0300 + + amend added remove session log + +commit d582e954e5fcb1f3360d6e383fd0ee31fa41bace +Author: cryoflamer +Date: Thu Jul 27 15:20:16 2017 +0300 + + added remove session log + +commit bec9cfd921324aa7b4ad726c6f4ad0f71a8e8e6b +Merge: bd64221 2b81006 +Author: ne-luboff +Date: Thu Jul 27 15:11:13 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into offline_messages + +commit 2b81006f0ef87bfc38c3c4b30518f0b8121b4de2 +Author: cryoflamer +Date: Wed Jul 26 17:51:57 2017 +0300 + + removed subscribe to p2p/+/Id + +commit bd6422155851888985923f1494ab23acc08b82cf +Author: ne-luboff +Date: Wed Jul 26 12:42:46 2017 +0300 + + Add TODO to offline messages test + +commit beede8064a7f8bcc179147c43d47cdcdc6b52468 +Author: ne-luboff +Date: Wed Jul 26 12:42:21 2017 +0300 + + Add TODO to offline messages test + +commit 597392742f3c52b321e20512eb05b7bd26662620 +Author: ne-luboff +Date: Wed Jul 26 12:40:37 2017 +0300 + + Start offline-messages test + +commit fe2570a69444b94e9659c18aee46b3acb8f89be0 +Author: qomputer +Date: Tue Jul 25 18:42:38 2017 +0300 + + Fix double replais + +commit 188e77d2eb75ce28861a3e54535972c38ad3396f +Author: ne-luboff +Date: Tue Jul 25 17:43:34 2017 +0300 + + Update server info (readme file) + +commit 79bdca07c4550afc34181f1ad5ae34df4e36954b +Author: qomputer +Date: Tue Jul 25 15:09:09 2017 +0300 + + Add sending back of added Contact with status=not_confirm + +commit 3491df5223187e19837c03483577fdb7dd319cae +Author: qomputer +Date: Tue Jul 25 14:19:01 2017 +0300 + + Fix Confirm Request + +commit efdc6d7cc61d8b638f262046b970c7e056b5dbfb +Author: qomputer +Date: Mon Jul 24 19:52:35 2017 +0300 + + Fix adding roster + +commit ca8e83cd4a6397016977ffb0519a0f337e45fd2b +Author: qomputer +Date: Mon Jul 24 19:32:38 2017 +0300 + + Fix Contact's status + +commit 9641c5c3cf47cfa1a35b036bee54d22e1bc59269 +Author: cryoflamer +Date: Mon Jul 24 19:22:42 2017 +0300 + + added log to Friend get + +commit a20f51a9948238254dfa2d428e4f033a3d9446fd +Author: qomputer +Date: Mon Jul 24 19:05:33 2017 +0300 + + Add request for getting of contact + +commit e50c87ad2ee93ec9352b3dea3f5f570df75d9112 +Author: cryoflamer +Date: Mon Jul 24 17:49:20 2017 +0300 + + added log to roster_friend + +commit 69b3bc875ad5ab07ff57b8cec7674d1f70172113 +Author: qomputer +Date: Mon Jul 24 15:15:56 2017 +0300 + + Fix for Friend Request in case self with oneself + +commit 76d5bc7c4669f33d3f7ab6f4b5dbc79853fa5e8c +Author: cryoflamer +Date: Mon Jul 24 14:59:18 2017 +0300 + + added session not found log + +commit a873320825543f926c48b9419101ac5c563bffd8 +Author: qomputer +Date: Mon Jul 24 14:01:12 2017 +0300 + + Fix io for Friend + +commit a16076bfd0aca478dccd4ea96e7a9bae04d88155 +Author: cryoflamer +Date: Mon Jul 24 13:18:25 2017 +0300 + + added unsubscribe to on_disconnect + +commit e1ed7c2f281d49ad7fa8e91564dadc2c82f8653a +Author: qomputer +Date: Sun Jul 23 17:54:57 2017 +0300 + + Update getting friend's contact + +commit cb8336e845963c2f2b5d8ad1c7a6647681b9c8ad +Author: ne-luboff +Date: Fri Jul 21 19:36:24 2017 +0300 + + Update Readme (server addresses) + +commit eecb4895867ee7203bf3fb02744e12b035267be3 +Author: cryoflamer +Date: Fri Jul 21 18:23:52 2017 +0300 + + fix crash binary_to_term + +commit 2c1b1c1cc65dfc133bcacd775c03dd82eb5589f1 +Author: cryoflamer +Date: Fri Jul 21 18:12:07 2017 +0300 + + added atoms() (fix binary_to_term(... [safe]) + +commit 74188681d1c173a97255400fc7f797c538c93d51 +Author: qomputer +Date: Fri Jul 21 18:04:45 2017 +0300 + + Fix functions for Friend and Contact + +commit d482eb22a1f7d23b4efad03934e9583ca7e36bbd +Author: cryoflamer +Date: Fri Jul 21 17:30:09 2017 +0300 + + removed delete_user from roster_auth + +commit 1e1e0ff976be65d50f985d302dd0136c80775be3 +Author: qomputer +Date: Fri Jul 21 16:56:10 2017 +0300 + + Add sending Contact into ConterPart actions + +commit 40a7e588ef85c723f372a085b81fff6c3330ff81 +Author: cryoflamer +Date: Fri Jul 21 15:44:11 2017 +0300 + + added binaty to "services" + +commit 5ab863952ac0e7a9b62a2ee3a88ca792e4cee852 +Author: ne-luboff +Date: Fri Jul 21 13:32:44 2017 +0300 + + Trying to add device type atom + +commit 8e5f9a9d5bca082c232bd9d8e9382b85eb318ed8 +Author: ne-luboff +Date: Fri Jul 21 13:12:26 2017 +0300 + + Delete debug code (from voice_call method) + +commit 55581c1e59afe0941bb6a9563fb40efb17e0e702 +Merge: 160fe9f 025327c +Author: ne-luboff +Date: Fri Jul 21 13:11:30 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voice_call_request + +commit 160fe9f518f0e87b780a96345cd41ff7bea7e8fd +Author: ne-luboff +Date: Fri Jul 21 13:10:52 2017 +0300 + + Delete spawned call + +commit 025327c7c0140f88b9aba2e1d3c0032bc1dd6ae2 +Author: Namdak Tonpa +Date: Fri Jul 21 11:58:15 2017 +0300 + + Update README.md + +commit 1c48a76ee77e20151422b53b69eaa7c4d50b37a8 +Author: Namdak Tonpa +Date: Thu Jul 20 21:47:26 2017 +0300 + + handle atom constants in specs + +commit 399d1590ed8c8f3d32f12ca03e1011f9ef4be801 +Author: qomputer +Date: Thu Jul 20 19:38:35 2017 +0300 + + Update roster.erl. roster.hrl , roster_friend + +commit b0c8d34e7872496526bdbb9a858bb4be7621106d +Author: cryoflamer +Date: Thu Jul 20 17:59:24 2017 +0300 + + added get_profile to test + +commit 4c1ed0822151bae4dd904e7bf3572664234debb7 +Author: cryoflamer +Date: Thu Jul 20 17:24:08 2017 +0300 + + added publish p2p/From/To + +commit 0364f8554a8a67f40365a478162a86ce73c10b49 +Merge: 31f9846 581c417 +Author: ne-luboff +Date: Thu Jul 20 16:58:25 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voice_call_request + +commit 31f984615888b87908c8556d8666e8c6718c01fd +Author: ne-luboff +Date: Thu Jul 20 16:58:12 2017 +0300 + + Updated request voice call function. Now it works with language param in list + +commit 581c417903cdb8caf5fd246e6db2751bae053ee5 +Author: cryoflamer +Date: Thu Jul 20 16:14:48 2017 +0300 + + fix roster_auth + +commit 58a1a9b8a2a067ee4e5d28ff88cdeb47eac37440 +Author: qomputer +Date: Thu Jul 20 14:09:13 2017 +0300 + + Update roster for set and roster.hrl + +commit 1e01a483ffccf662b076c8ece64062f433836d94 +Author: cryoflamer +Date: Thu Jul 20 13:32:22 2017 +0300 + + replaced tuples io/ok by #io/#ok in auth + +commit 9fbb612728af83d5dc01b955ed5390fe047cacce +Author: Namdak Tonpa +Date: Thu Jul 20 00:43:33 2017 +0300 + + fix Message + +commit 5a9bdef7fa6f9cdfa33e678b1015993eb9cc124c +Author: Namdak Tonpa +Date: Wed Jul 19 23:10:04 2017 +0300 + + disable parse trans + +commit 46049f12660a8b556a66bcf1fe58b73ccc27da95 +Author: Namdak Tonpa +Date: Wed Jul 19 23:09:49 2017 +0300 + + rename tree + +commit cd0e35a54005b56a4d146b09d1011a8d9b2d387d +Author: Anton Makarov +Date: Wed Jul 19 22:04:18 2017 +0300 + + Serializer + +commit 2e5f8f34b3502b8964bb7d49dc83bdb8d166b203 +Author: cryoflamer +Date: Wed Jul 19 18:42:40 2017 +0300 + + added jwt to "services" field + +commit 0138bcbcac0d40dc5852049c76a8ab05b36fb0f3 +Author: cryoflamer +Date: Wed Jul 19 18:20:56 2017 +0300 + + returned login + +commit 1e21a9bee27dba97bb73b6b87668a7eb636091a9 +Author: cryoflamer +Date: Wed Jul 19 18:06:22 2017 +0300 + + added "registered" status + +commit 735980c05de584098c386eb0f1cfabc4c7501544 +Author: Namdak Tonpa +Date: Wed Jul 19 17:33:44 2017 +0300 + + disable parse trans + +commit 5dfaeb43cd888e7cdd8a8c9d1bb6047f97b294d4 +Author: Namdak Tonpa +Date: Wed Jul 19 17:33:21 2017 +0300 + + serializer errors + +commit bd481adb81bb567f3580e5a739f1c08de0c76780 +Author: Anton Makarov +Date: Wed Jul 19 17:29:44 2017 +0300 + + StringAtom + +commit c597364b98e3ff42a3f2d4bf8fbb1f675d57ccf8 +Author: Anton Makarov +Date: Wed Jul 19 17:19:31 2017 +0300 + + StringAtom + +commit c4562ac9e8fa8091cb88bcd069eacdb0c06ddac2 +Merge: 2661616 41fabcc +Author: Namdak Tonpa +Date: Wed Jul 19 17:16:40 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 2661616aecbbd855542cdccc9bca735354273d7e +Author: Namdak Tonpa +Date: Wed Jul 19 17:16:26 2017 +0300 + + disable parse trans + +commit 41fabcca8837e8a0df2106561088d21ea8de8052 +Author: qomputer +Date: Wed Jul 19 17:14:04 2017 +0300 + + Fix get contact + +commit 7f1ba58d63b78bd50cdfdb60378dbdb26d2961f7 +Author: qomputer +Date: Wed Jul 19 17:01:00 2017 +0300 + + Update Person, Friend, Confirm + +commit c5ac75deafccfe3b0d9ff896b2f4be1848a53ab8 +Author: cryoflamer +Date: Wed Jul 19 16:55:22 2017 +0300 + + added auth_case_test2 + +commit 2f9af872e7842f2ef7639b9f3a8b06362abe6f54 +Author: Anton Makarov +Date: Wed Jul 19 16:45:00 2017 +0300 + + Parser List + +commit 04844bb166e83a0f4caabd5a8725ead6067bbb5b +Merge: 0675ac9 55bb4fc +Author: Namdak Tonpa +Date: Wed Jul 19 16:31:34 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 0675ac92a9604242863b06cffc3ad9b55f699409 +Author: Namdak Tonpa +Date: Wed Jul 19 16:31:27 2017 +0300 + + fix build + +commit 55bb4fcc761534e1200c75058f6b62ca37da3701 +Author: cryoflamer +Date: Wed Jul 19 16:30:34 2017 +0300 + + fix roster_auth + +commit dc7f0c8a3da4e0ac6f0dd7df2f92d688108c0024 +Author: Namdak Tonpa +Date: Wed Jul 19 16:25:47 2017 +0300 + + chain on unions + +commit a15cd2bfa83548b3507c6e6734de5660ee6f0690 +Author: Namdak Tonpa +Date: Wed Jul 19 15:36:54 2017 +0300 + + simplify generator + +commit c2f4a63049fc2d6ca0f022bc3b44687d6103c632 +Merge: c9c960a d4ca300 +Author: Namdak Tonpa +Date: Wed Jul 19 15:33:46 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit c9c960ad262afe18f992c67120aa9fbed80bf665 +Author: Namdak Tonpa +Date: Wed Jul 19 15:33:26 2017 +0300 + + index, rec + +commit d4ca300919dd200272dc5f8cee5d95fcd37035ee +Author: Namdak Tonpa +Date: Wed Jul 19 14:42:47 2017 +0300 + + Update README.md + +commit 21e5c55aa3a185036424ad8e7f822b3d9570c5a1 +Author: Namdak Tonpa +Date: Wed Jul 19 14:06:56 2017 +0300 + + disable parse transform + +commit 7cbc6f7c65b196ce3522ae2fc2c4e11313a76e9b +Author: cryoflamer +Date: Wed Jul 19 13:06:39 2017 +0300 + + reordered fields in ok2 and error2 + +commit 71fa531399de0cbd99d2321e7b08d6133ac44bfa +Merge: b3e21f7 af48e04 +Author: ne-luboff +Date: Wed Jul 19 12:43:48 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into amazon_upload_api + +commit af48e046a7a65facad4289eef4178a966da602db +Author: qomputer +Date: Wed Jul 19 12:18:34 2017 +0300 + + Add system messages for friends + +commit b3e21f7168891685d8880992c5a88a3af233cf26 +Merge: 49b1171 f8de9bf +Author: ne-luboff +Date: Wed Jul 19 11:53:41 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into amazon_upload_api + +commit f8de9bf65779e0ca9c5a33b17ac9eb4a1c598a2e +Author: Anton Makarov +Date: Wed Jul 19 06:28:09 2017 +0300 + + Namdak, pls notify me, when you will see this commit + +commit 020bdad7150ad311292b4d41c046a9258ac916ed +Author: Namdak Tonpa +Date: Wed Jul 19 04:45:39 2017 +0300 + + rec models + +commit 0adc29ef9ceccee8c8a48d0db50a7c868d2d80fd +Author: Namdak Tonpa +Date: Wed Jul 19 04:36:47 2017 +0300 + + typing lists + +commit 84f9f452eadfac3ceb0f301c2072db459976cc8b +Author: Namdak Tonpa +Date: Wed Jul 19 03:50:39 2017 +0300 + + pretty + +commit 400cef0758679a8058c805d1e4ccae8a92e6a14f +Author: Namdak Tonpa +Date: Wed Jul 19 03:46:22 2017 +0300 + + formatter + +commit 2863bf86c5813ca547e10217393cd96be47692e7 +Merge: d380448 3d329e8 +Author: Namdak Tonpa +Date: Wed Jul 19 03:29:58 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit d380448146e26a2706bf7f6973bef88ef28a0f81 +Author: Namdak Tonpa +Date: Wed Jul 19 03:29:51 2017 +0300 + + profile + +commit 3d329e807c963b083f7a7ba4de61e5581c291701 +Author: Namdak Tonpa +Date: Wed Jul 19 03:15:02 2017 +0300 + + Update Parser.swift + +commit dd6aa33cbb3e571b2fb6b4efca82b44e39577fea +Author: Namdak Tonpa +Date: Wed Jul 19 02:55:05 2017 +0300 + + typed lists + +commit 18ba4326c1b8bb37c32a10568a8debb76b33d183 +Author: Namdak Tonpa +Date: Wed Jul 19 02:35:45 2017 +0300 + + list -> [AnyObject] + +commit 10eed01432e8da828631b717491f5c491c2c20f9 +Author: Namdak Tonpa +Date: Wed Jul 19 02:05:10 2017 +0300 + + activator + +commit e56b17cf8cba6be0b38547a89d28c28987badcc2 +Author: Namdak Tonpa +Date: Wed Jul 19 01:50:49 2017 +0300 + + Selector.swift + +commit 8044aca3ee5bdb1454dadd2e89f5e4dbb5c8652f +Author: Namdak Tonpa +Date: Wed Jul 19 00:23:46 2017 +0300 + + comment parse_transform, issue in mad + +commit f1e19e3a1d8c4f8b266c1b48942b2f6183e2c2c6 +Author: Namdak Tonpa +Date: Wed Jul 19 00:15:05 2017 +0300 + + prettify codebase + +commit fe29d9cba88841a6654a3664ea299fa6b15127b9 +Author: Namdak Tonpa +Date: Tue Jul 18 23:56:14 2017 +0300 + + pretty print + +commit 6ca275c9dcc71a3bff4cc8bdd7b71caa1e24bea5 +Author: Namdak Tonpa +Date: Tue Jul 18 23:17:33 2017 +0300 + + ** BUILD SUCCEEDED ** + +commit af9880fd743ff2eaa2b01df438e51e7f29767894 +Author: Anton Makarov +Date: Tue Jul 18 23:06:44 2017 +0300 + + List[AnyObject] + +commit ef251a1593e4088a98e9f819cc10b9bba3cf46b9 +Author: Anton Makarov +Date: Tue Jul 18 23:04:20 2017 +0300 + + Tuple() + +commit f39dbd088d8729a991da996b45a63d3ad9e21196 +Merge: d504faf 271fc46 +Author: Anton Makarov +Date: Tue Jul 18 22:40:10 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + + # Conflicts: + # apps/roster/priv/macbert/Source/Parser.swift + +commit d504faf77e4e9efb22f7547e70283d1e7f537402 +Author: Anton Makarov +Date: Tue Jul 18 22:33:23 2017 +0300 + + parseObject + +commit 271fc46ca90b64c5cbc1c68a6cb25fa71fb99b6a +Author: Namdak Tonpa +Date: Tue Jul 18 22:14:17 2017 +0300 + + wip + +commit b4980ec773b53bfc4913413a6ccbcfc493420c4e +Author: Anton Makarov +Date: Tue Jul 18 22:02:06 2017 +0300 + + parser updated to typed lists + +commit f972af1f2cba5f4b617426a605c717f2656b2649 +Author: Anton Makarov +Date: Tue Jul 18 21:57:25 2017 +0300 + + parser updated + +commit 0bd55ffd2dfa1373b82fdfc783af8738aa468612 +Author: Namdak Tonpa +Date: Tue Jul 18 21:54:28 2017 +0300 + + main + +commit 99c3a2abe6545f2d6727afe790f289d7ac1d2b84 +Author: Namdak Tonpa +Date: Tue Jul 18 21:52:31 2017 +0300 + + lists + +commit ed8b2f45a2d159685da897600e1c8a9fcd596439 +Author: Namdak Tonpa +Date: Tue Jul 18 21:36:30 2017 +0300 + + remove spec and model + +commit ca1e2c36970d93c3d816c1e7396b11d05ccbe09d +Author: Namdak Tonpa +Date: Tue Jul 18 21:23:49 2017 +0300 + + project + +commit c3f6883f7011a8801c96328aa6c48fe1f2078710 +Author: qomputer +Date: Tue Jul 18 19:53:43 2017 +0300 + + Add message for friend + +commit 49b117158dd662ac5dfd05b5f0c900543280024e +Merge: f631ba4 6190a0c +Author: ne-luboff +Date: Tue Jul 18 19:17:35 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into amazon_upload_api + +commit f631ba48df2825adf20ac89bdcea8f756742cf53 +Author: ne-luboff +Date: Tue Jul 18 19:17:12 2017 +0300 + + Replaced with method + +commit 6190a0c00ba3a6a88b0c099fd383d07d1748b604 +Author: cryoflamer +Date: Tue Jul 18 19:15:12 2017 +0300 + + updated session_not_found + +commit ba15f079b7976690f17c793745c541d9028cb201 +Author: cryoflamer +Date: Tue Jul 18 19:12:33 2017 +0300 + + fixed auth + +commit 3b290bb209e95a9855eec5b74740a0e8b5bac85a +Author: cryoflamer +Date: Tue Jul 18 19:09:48 2017 +0300 + + fixed session_not_found + +commit 5845ccffa8be4a4fe82f9ab79243bba4f841a7e7 +Merge: 87adff4 27dc641 +Author: ne-luboff +Date: Tue Jul 18 19:08:25 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into amazon_upload_api + +commit 87adff4a364e79645e0a6b97602d9dbc2fd7ed23 +Author: ne-luboff +Date: Tue Jul 18 19:08:13 2017 +0300 + + Back to ftp record (instead of xftp) + +commit 27dc6412e616f81e8248721841eb54cd44d89bb8 +Author: cryoflamer +Date: Tue Jul 18 18:46:36 2017 +0300 + + added jwt code autoverify + +commit 8e22a3ce57a3eb19c66b8f19b354fa7dd6f89ecb +Author: cryoflamer +Date: Tue Jul 18 18:43:32 2017 +0300 + + added export_all + +commit fa44d8e130a8024d3535ed6cf5d5336e5910dc13 +Author: cryoflamer +Date: Tue Jul 18 18:14:27 2017 +0300 + + fix parse_transform + +commit cea5a4b31d8c0dc1137288cb10d3643bd1e2b96d +Merge: e32e5f4 38eee9b +Author: ne-luboff +Date: Tue Jul 18 17:57:35 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into amazon_upload_api + +commit e32e5f4989a7905825bbd5dc057c5748d92a7a22 +Author: ne-luboff +Date: Tue Jul 18 17:57:21 2017 +0300 + + intermediate ftp commit. TODO - back to #ftp-record (instead of #xftp) + +commit 38eee9b356a04291e53253b571791c5e508f3aaf +Author: Namdak Tonpa +Date: Tue Jul 18 16:57:45 2017 +0300 + + error2 ok2 + +commit 35a90e9bff5392aed232a530a7a72cc1f271861d +Author: Namdak Tonpa +Date: Tue Jul 18 16:44:18 2017 +0300 + + macbert + +commit eb73c09bd080e34aacca0181e7eb3a3343f18c74 +Merge: 9e777f0 4875163 +Author: Namdak Tonpa +Date: Tue Jul 18 16:19:33 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 9e777f007efbd27547ccf16475b77bc8ff69ec11 +Author: Namdak Tonpa +Date: Tue Jul 18 16:19:26 2017 +0300 + + tree of macbert + +commit 48751631b0c70c3bc01fa18da7bb2a2c2ec0f7d0 +Author: cryoflamer +Date: Tue Jul 18 16:11:58 2017 +0300 + + updated "ok" record + +commit 39006cca43e2dd6fe2004bf3da7ca217a7a5404e +Author: ne-luboff +Date: Tue Jul 18 14:09:17 2017 +0300 + + Updated request voice call method + +commit 879af7ccdb486d72eb3e3b3c2bcc5f71c50e3b64 +Author: ne-luboff +Date: Tue Jul 18 13:32:36 2017 +0300 + + Added spawned method to call telesign_voice_call function + +commit 5820bad5cf6dc5acc426c2ae2360c685ff245657 +Author: ne-luboff +Date: Tue Jul 18 13:27:35 2017 +0300 + + Added validate_language function using in voice_verify method + +commit 70e5ecd0506ea24fdba2471d87610fa63508f6de +Author: ne-luboff +Date: Tue Jul 18 13:21:50 2017 +0300 + + Fixed typo in verify_language function name. Updated export functions list + +commit 80aa29cfb81a5807a1184b7834454d0a694708d4 +Merge: a6835af 10993e7 +Author: ne-luboff +Date: Tue Jul 18 13:19:05 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voice_call_request + +commit a6835af4d05dd45a6c891f02f2bc33f01af9d890 +Author: ne-luboff +Date: Tue Jul 18 13:18:45 2017 +0300 + + Added verify_language method to telesign helpers (#48) + +commit 10993e779726d68aeaa385eff82a8f535c7835b5 +Author: qomputer +Date: Tue Jul 18 12:59:36 2017 +0300 + + Fix friend handlers and tests + +commit 5aeac26af8106f1add8cd8ea2b2989eab736861c +Author: ne-luboff +Date: Tue Jul 18 12:58:01 2017 +0300 + + Made TTSMessage optional parameter in voice_vefiry method + +commit eb5a5a35b6b45b5511f4c2c3a2c39bbf31334660 +Merge: 7344940 68300ff +Author: ne-luboff +Date: Tue Jul 18 12:05:53 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voice_call_request + +commit 734494004bbf312ca290fcd893bb30f014b28a68 +Author: ne-luboff +Date: Tue Jul 18 12:05:37 2017 +0300 + + Added supported by telesign languages for speech (#48) + +commit 68300ff0212fb787a7c4bf3ee8ddf326e85fbbd7 +Author: Anton Makarov +Date: Tue Jul 18 05:11:59 2017 +0300 + + Spec: IO + +commit 6ed2498b5f45ec72a1070396c3423a5af57d759c +Author: Anton Makarov +Date: Tue Jul 18 04:44:28 2017 +0300 + + Spec: Updated IO model + +commit 9240133d9f642449e04ce6c42b9b9e9a832429e4 +Author: Anton Makarov +Date: Tue Jul 18 03:36:08 2017 +0300 + + Spec updated + +commit da0ef3c5ce859148c7dbc35bc530d4f984769ac8 +Author: Anton Makarov +Date: Tue Jul 18 02:31:00 2017 +0300 + + Parser:updated tuple + +commit 97b23d7ef0f0ed8ef5e6d4d4fba4e2861d24a9bf +Merge: 8a6337d d3d615d +Author: Anton Makarov +Date: Tue Jul 18 01:45:39 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit 8a6337d8bf057754e2032ceeab9aa98fca4da63e +Author: Anton Makarov +Date: Tue Jul 18 01:45:31 2017 +0300 + + NynjaParser update + +commit 20979916ce4da7798dbe508212404baeb5fa8a7d +Author: ne-luboff +Date: Mon Jul 17 20:20:49 2017 +0300 + + Updated test_voice_call (found 5digits limitation) #48 + +commit a6c50ef18876038ce64b494e849048f446c93930 +Merge: a434b88 d3d615d +Author: ne-luboff +Date: Mon Jul 17 19:36:17 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into voice_call_request + +commit a434b8869dee50fd73e0ffb4844bca2aacf15cfa +Author: ne-luboff +Date: Mon Jul 17 19:35:55 2017 +0300 + + Started request for voice call (#48) + +commit d3d615d6bb28dcf5cd33b7b458185f39ca262522 +Author: cryoflamer +Date: Mon Jul 17 18:44:16 2017 +0300 + + updated on_auth + +commit e391ed0e4a56e540c4f4a2c5ae861ab38ebd6834 +Merge: 198e96b 32c9e85 +Author: ne-luboff +Date: Mon Jul 17 18:15:35 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into amazon_upload_api + +commit 198e96bbb4d9f281a98b05be1c9a956c3f61e71f +Author: ne-luboff +Date: Mon Jul 17 18:15:21 2017 +0300 + + Thoughts about new ftp protocol + +commit 32c9e8531436ca2a2e82f9c950952a3cb225591b +Author: cryoflamer +Date: Mon Jul 17 18:13:19 2017 +0300 + + added online/offline presence messages + +commit c5ee914ace3e57c4ccd76d332110dbcc812ede8f +Author: cryoflamer +Date: Mon Jul 17 18:03:57 2017 +0300 + + moved on_disconnected to roster_auth + +commit 738100a9c35986adedbaff72337c7d0cb9770e07 +Author: cryoflamer +Date: Mon Jul 17 18:02:21 2017 +0300 + + fix add_fake_contact + +commit 5b6148d186e419a4ce1bd8c77965113a78d1493d +Author: qomputer +Date: Mon Jul 17 17:49:50 2017 +0300 + + Add request for contact + +commit 650028dee07034a5951ab7f786cfe46fb51db5f9 +Author: ne-luboff +Date: Mon Jul 17 17:07:01 2017 +0300 + + Updated rebar.config. Deleted comment + +commit b1e8c119977a74e3237207603ba56bc16531e03e +Author: ne-luboff +Date: Mon Jul 17 16:14:02 2017 +0300 + + Updated export telesign_api. + Deleted debug TODO comment + +commit a79338980f5b0f7f0c72d4b10b7c37009089e523 +Author: ne-luboff +Date: Mon Jul 17 16:07:16 2017 +0300 + + Deleted excess variable definition: + +commit 94d200dc9bc7f4cccf5100671761426c83c3c1ea +Author: ne-luboff +Date: Mon Jul 17 16:05:49 2017 +0300 + + Set JWT_VALID_DURATION to 90 seconds + +commit 6f24fa9059fd2b9113acda124b09a73fb93a5ed0 +Author: ne-luboff +Date: Mon Jul 17 16:03:31 2017 +0300 + + Updated decode_jwt function + +commit 2a71ff1b2fe1b954bd9891bb60906d2cd45be7c5 +Author: ne-luboff +Date: Mon Jul 17 15:59:17 2017 +0300 + + Added comments to Auto Verify Tests + +commit b9cba641a1323dabaa4f890f09c6729780a4f0b9 +Author: ne-luboff +Date: Mon Jul 17 15:52:39 2017 +0300 + + TeleSign Auto Verify Tests Reordering + +commit 26c3ed8b2ef11998c27a1146799472b09bb068d0 +Author: ne-luboff +Date: Mon Jul 17 15:51:18 2017 +0300 + + deleted debug function (test_auto_verify_status) + +commit b4245ae16a6b167ff6b03fdf7e956b5194e444b5 +Author: ne-luboff +Date: Mon Jul 17 15:50:04 2017 +0300 + + Deleted debug logs + +commit 41f31f504877de9a8ba43813d4c727e9d2334c72 +Author: ne-luboff +Date: Mon Jul 17 15:45:18 2017 +0300 + + Added one more negative telesign auto verify test + +commit b6117acf49bdf2ef822492823e1dfe962e90de05 +Merge: 98a4e72 8e9da5e +Author: ne-luboff +Date: Mon Jul 17 15:39:34 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into telesign_autoverify_api + +commit 98a4e725bcf45e4330ba941e76101dc03e0ee740 +Author: ne-luboff +Date: Mon Jul 17 15:39:18 2017 +0300 + + Updated negative test. Deleted hardcode + +commit 8e9da5e86f0e1b6a916f15322b2b5b3f3d4d5129 +Author: cryoflamer +Date: Mon Jul 17 15:32:57 2017 +0300 + + updated spec of 'Profile' record + +commit 20c8fd5b20bf5993959deb37344ee1b7f613ee6f +Author: ne-luboff +Date: Mon Jul 17 15:27:18 2017 +0300 + + Added negative test for JWT decoding + +commit 9dcb9024f7f0f586bbe91b493cb218fab5c5c851 +Author: ne-luboff +Date: Mon Jul 17 15:21:31 2017 +0300 + + Added auto verify postitive test + +commit 25c1285d88eb54d646de2d8dfff371e90d85a95b +Author: ne-luboff +Date: Mon Jul 17 15:11:28 2017 +0300 + + Replaced parse telesign response function to helpers' section + +commit 7c457bf306fca6bdf2eb94396109a4217e31207f +Author: ne-luboff +Date: Mon Jul 17 15:08:14 2017 +0300 + + Finished telesign get autoverify status function + +commit ba4a4e6f51c77e18a288e9b2af8a46453356dfb4 +Author: ne-luboff +Date: Mon Jul 17 14:47:30 2017 +0300 + + Added comments to telesign auto verify test + +commit 2c47b3cd58aa73df3da919545f87a595bbc03ff7 +Merge: 2e2ce12 53b59b6 +Author: ne-luboff +Date: Mon Jul 17 14:43:57 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into telesign_autoverify_api + +commit 2e2ce128922e442671173734ceed6818f5d975bb +Author: ne-luboff +Date: Mon Jul 17 14:43:08 2017 +0300 + + Intermediate commit + +commit 53b59b62c3ac882152c91dc297eda32a40bc888f +Author: cryoflamer +Date: Mon Jul 17 14:27:28 2017 +0300 + + added sms_code_text to send_sms + +commit f4454858e5388ae618ede3b616d17df94e4d3a7f +Author: ne-luboff +Date: Mon Jul 17 13:51:40 2017 +0300 + + Fixed typo in function name + +commit ad74336f4c2c0cce79bfadc903c554fb85b930d4 +Author: ne-luboff +Date: Mon Jul 17 13:50:44 2017 +0300 + + Updated parse telesign response function (added bad input data scenarios) + +commit e7eda2c180882485d8548f97d64c1e4eeafb27a9 +Author: ne-luboff +Date: Mon Jul 17 13:44:01 2017 +0300 + + Separate telesing response parsing in function + +commit ca67f4845c028e3592cbf75009500d96950cefde +Author: ne-luboff +Date: Mon Jul 17 13:22:39 2017 +0300 + + Added getting telesign response code + +commit 4908b3066b6582dbfdf034bd7d275c106fad4620 +Author: ne-luboff +Date: Mon Jul 17 12:47:40 2017 +0300 + + Updated telesign_auto_verify_get_status_by_xid function + +commit 6bfaea24082a233eeae06d28f8679828477a8fac +Author: ne-luboff +Date: Mon Jul 17 12:39:31 2017 +0300 + + Updated get telesign status by xid method + +commit 2caa6267c32b4ec7b40f8391bf780174b267c47d +Author: ne-luboff +Date: Mon Jul 17 12:28:47 2017 +0300 + + Updated decode_jwt method responses + +commit cf5f8921dd9e3d0fb2a0c0d8e8d0b4a5506b3aaa +Author: ne-luboff +Date: Mon Jul 17 12:11:14 2017 +0300 + + Updated decode_jwt method (considering badmatch error) + +commit 8a9699ece554fc81cf9e78e7fbabed5094925f45 +Author: ne-luboff +Date: Mon Jul 17 12:04:29 2017 +0300 + + Added automatic JWT generation to decode jwt test + +commit 1afde7a21e8ae15a7f7b45a9f0d9d5d986f213cb +Author: ne-luboff +Date: Mon Jul 17 11:44:24 2017 +0300 + + Updated decode JWT method (considering decoding error) + +commit f401ac934a98b2ed63565a47d33cd91160b16874 +Author: Namdak Tonpa +Date: Sat Jul 15 01:18:47 2017 +0300 + + patch API test + +commit e022ce80339c00702d270e40028696670a8ac630 +Author: Namdak Tonpa +Date: Sat Jul 15 00:07:49 2017 +0300 + + fix test + +commit 694190aad6326d69eda653378661cb583374a633 +Merge: 6e225d2 aedf066 +Author: Namdak Tonpa +Date: Fri Jul 14 23:58:55 2017 +0300 + + roster + +commit 6e225d2416f0c07af5b94abcf221e1793cb1dfc5 +Author: Namdak Tonpa +Date: Fri Jul 14 23:58:15 2017 +0300 + + patch API reqested by @motorbit + +commit aedf0664f00446b1e054488e541b7b32947f3476 +Merge: f35b4cb c803ebd +Author: ne-luboff +Date: Fri Jul 14 18:05:59 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into telesign_autoverify_api + +commit f35b4cbcc2ae6895f518aef80710ff0495dabe65 +Author: ne-luboff +Date: Fri Jul 14 18:05:45 2017 +0300 + + Added XID retriving from JWT + +commit c803ebd2423029408c17534ab52d7a8f4a309353 +Author: cryoflamer +Date: Fri Jul 14 18:01:43 2017 +0300 + + temporary replaced send_verify for send_sms + +commit 0e28374847d564be8ea2f13108de27abbb9d81fa +Author: qomputer +Date: Fri Jul 14 17:58:26 2017 +0300 + + Update friend and confirm + +commit 589feedae1e410ebe59b584d8f7c7ca6bf2c9f78 +Merge: bc1c813 dbbaab6 +Author: ne-luboff +Date: Fri Jul 14 17:56:40 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into telesign_autoverify_api + +commit bc1c813cd763ba22b2a85e84c001c0979c4bc0d8 +Author: ne-luboff +Date: Fri Jul 14 17:56:24 2017 +0300 + + Started JWT decoding function updating + +commit dbbaab6e442d55c379f7bedaa5c3000141bc1176 +Author: cryoflamer +Date: Fri Jul 14 17:48:20 2017 +0300 + + added multisession verification + +commit 94dde8e7f9991f3e0dfb8e378602d6c4751d4154 +Author: cryoflamer +Date: Fri Jul 14 14:44:06 2017 +0300 + + added send_to_session + +commit d11475b7d9e07e85c28c5615cf84572b77983181 +Author: ne-luboff +Date: Fri Jul 14 17:24:10 2017 +0300 + + Finished JWT generation + +commit a7b6fdad684a33627de54bdbc9fbc7feb5a590bf +Merge: 87255f8 6b77fab +Author: ne-luboff +Date: Fri Jul 14 17:05:23 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into telesign_autoverify_api + +commit 87255f8f70b4222a5ed2a066e2a39c0a1fa56c16 +Author: ne-luboff +Date: Fri Jul 14 17:05:03 2017 +0300 + + Victory. I got valid JWT + +commit 6b77faba17a81cd7c6429f8fde81bdc70ccb09d1 +Author: cryoflamer +Date: Fri Jul 14 15:48:10 2017 +0300 + + added auth_case_resend_test + +commit 63672ebb40048cc96bbf84e65fb4477ee32e7240 +Author: ne-luboff +Date: Fri Jul 14 15:22:10 2017 +0300 + + Trying with another JWT lib + +commit 1f89e3216938d601537ab8f3bd9f34a10ba5b1da +Author: ne-luboff +Date: Fri Jul 14 14:10:06 2017 +0300 + + Added bta to JWT payload + +commit cc8fccaacbcbe47f7386118d00887e48fb2d4c31 +Author: ne-luboff +Date: Fri Jul 14 13:50:19 2017 +0300 + + Updated get verification status function + +commit e0da45a7a8315bc5db17248499d2e26f1ace6cec +Author: ne-luboff +Date: Fri Jul 14 13:03:36 2017 +0300 + + Decoded JWT claims + +commit 2c2a9470a2b186ef5b866db619249c9598bbe89c +Merge: a105cc3 35e3fe3 +Author: ne-luboff +Date: Fri Jul 14 12:42:43 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into telesign_autoverify_api + +commit 35e3fe36ee5fab8e27502786587c7257f360c23d +Author: qomputer +Date: Fri Jul 14 12:22:42 2017 +0300 + + Fix roster_swift + +commit b49d00fd3f854c42fbdacdaaaad77423e6acd2a9 +Author: Namdak Tonpa +Date: Fri Jul 14 05:45:20 2017 +0300 + + line up + +commit e083162f1f3de762a9faa1487d6966b1593a693a +Author: Namdak Tonpa +Date: Fri Jul 14 05:43:00 2017 +0300 + + roster.swift generated from Erlang + +commit c3bd07fd95a4706ca0b9ec78aef1372161b4d3cb +Author: Namdak Tonpa +Date: Fri Jul 14 04:35:43 2017 +0300 + + generation + +commit c81d86c864774728e9a30c53434d823adc70cb2e +Author: Namdak Tonpa +Date: Fri Jul 14 04:33:41 2017 +0300 + + generation + +commit a2a9653d0a2c0782545dc07c9bfef7531df118c0 +Merge: 3225791 5af82d6 +Author: Namdak Tonpa +Date: Fri Jul 14 03:33:50 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 3225791930fe2544e01c7650c17c0a224e903c58 +Author: Namdak Tonpa +Date: Fri Jul 14 03:33:43 2017 +0300 + + fix tests + +commit 5af82d6a803b845efa0850b18f2ee34f7f24776c +Author: Namdak Tonpa +Date: Fri Jul 14 01:28:53 2017 +0300 + + Update roster.hrl + +commit 7653a621c8766debf76bdab305966750587fd586 +Author: Namdak Tonpa +Date: Fri Jul 14 01:27:17 2017 +0300 + + Update PROJECT.md + +commit 69b4bd3aafc3d6bd0778f42c726d9be5a0463376 +Author: Namdak Tonpa +Date: Fri Jul 14 01:26:53 2017 +0300 + + Update PROJECT.md + +commit 548338d1a50ab022be29ae2449bdaba0fff49270 +Author: Namdak Tonpa +Date: Fri Jul 14 01:06:01 2017 +0300 + + Update PROJECT.md + +commit 612d0e17953e53ea8000ca03f493e02594c8f9c5 +Author: Namdak Tonpa +Date: Fri Jul 14 01:05:26 2017 +0300 + + Update PROJECT.md + +commit 4b6e002b47ec62dfff16aaea5ca3340cc25dfc03 +Author: Namdak Tonpa +Date: Fri Jul 14 01:04:09 2017 +0300 + + Update PROJECT.md + +commit 6db6e76211a2922de1168efe183f7fa347cef5c8 +Author: Namdak Tonpa +Date: Fri Jul 14 01:03:23 2017 +0300 + + Create roster_presense.erl + +commit 0d7af78e1c935e401314d745f12f9b60eb056728 +Author: Namdak Tonpa +Date: Fri Jul 14 01:02:30 2017 +0300 + + Update roster_message.erl + +commit 54ba5de1f58f3b238b5d4514e0d39db50c8f5e9e +Author: Namdak Tonpa +Date: Fri Jul 14 01:02:12 2017 +0300 + + Update PROJECT.md + +commit 9b7264d4c292664887452b900ddbef97cccc7e41 +Author: Namdak Tonpa +Date: Fri Jul 14 00:56:47 2017 +0300 + + Update roster_auth.erl + +commit 86c63df5b3a6090ef8955df0f198a0d24cf6f613 +Author: Namdak Tonpa +Date: Fri Jul 14 00:55:42 2017 +0300 + + Update PROJECT.md + +commit 7c00fbc6983dde0a9d33f267511d43d63cb4ce4a +Author: Namdak Tonpa +Date: Fri Jul 14 00:55:02 2017 +0300 + + Update PROJECT.md + +commit 44a7d69f655caec06a533f76afd585896d63e40e +Author: Namdak Tonpa +Date: Fri Jul 14 00:49:31 2017 +0300 + + Update PROJECT.md + +commit 6551ac5e0ccc6f121b85c996e25dc8e88742d15b +Author: Namdak Tonpa +Date: Fri Jul 14 00:48:48 2017 +0300 + + Update PROJECT.md + +commit 98f38aba9238ec3058c6c2d19160380338cf89a7 +Author: Namdak Tonpa +Date: Fri Jul 14 00:48:23 2017 +0300 + + Create PROJECT.md + +commit 455fdbb5eaafa54d3801e2039bfbfdee76a90685 +Author: Namdak Tonpa +Date: Fri Jul 14 00:24:48 2017 +0300 + + fix #40 + +commit c040fa113ac006582a6cb71c6b31365a0ab94cf6 +Author: Namdak Tonpa +Date: Fri Jul 14 00:07:07 2017 +0300 + + fix #39 + +commit a105cc393d55269f25134f05a92e01c049a4681e +Author: ne-luboff +Date: Thu Jul 13 19:32:09 2017 +0300 + + Test phone number in separate variable + +commit a8b0a5abf8537b18f97ee51c0bddbbbc8ecb8153 +Author: ne-luboff +Date: Thu Jul 13 19:30:04 2017 +0300 + + Started JWT decoding function + +commit a5eea5022b5dbbff4138fd70524bba209430cd44 +Author: ne-luboff +Date: Thu Jul 13 19:10:16 2017 +0300 + + Added telesign endpoint for mobile verification + +commit feced46669b313db749387fc2fc570e83ef978d1 +Author: ne-luboff +Date: Thu Jul 13 19:06:09 2017 +0300 + + Started auto verify status + +commit e1c123edb8b29fc1e2db589119864e2ed1b9acb7 +Author: ne-luboff +Date: Thu Jul 13 18:55:35 2017 +0300 + + Deleted excess code + +commit 4fde07d21847669c90e040280fc1a15f393812b0 +Merge: d77a144 fea141a +Author: ne-luboff +Date: Thu Jul 13 18:52:58 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into telesign_autoverify_api + +commit d77a144b5f010464cf4c0bb637a1fe55233b5c27 +Author: ne-luboff +Date: Thu Jul 13 18:52:42 2017 +0300 + + Added more logs + +commit fea141a15f3f201bf237e1b99af8218a9e924751 +Author: qomputer +Date: Thu Jul 13 18:35:18 2017 +0300 + + Update roster_test + +commit 0be7cf21903c6ee4123612e56e9796162b16224f +Merge: 550e45a bcf2bf3 +Author: cryoflamer +Date: Thu Jul 13 18:32:07 2017 +0300 + + Merge branch 'temp' + +commit bcf2bf34dd09ae94762b4fcd25eb76a733df2eb5 +Author: cryoflamer +Date: Thu Jul 13 18:31:48 2017 +0300 + + added multisession_test + +commit 550e45aa9842d43c5a2ec7331ec516d6fb97af82 +Merge: 61ac37e 892618a +Author: ne-luboff +Date: Thu Jul 13 18:23:20 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into telesign_autoverify_api + +commit 61ac37e2dd79f38ac01ac391677df45862b01faa +Author: ne-luboff +Date: Thu Jul 13 18:03:57 2017 +0300 + + Updated test_auto_verify + +commit f764776b59643fdd4f8e4b5c827230f0649b3266 +Author: ne-luboff +Date: Thu Jul 13 17:59:58 2017 +0300 + + Fixed typo in test name + +commit b7a5c45b7e2a5d1af700c682f46efe247755dd58 +Author: ne-luboff +Date: Thu Jul 13 17:57:10 2017 +0300 + + Added JWT generation + +commit fe26d825a43a0a4cdf65c3b54c498e0f674de502 +Author: ne-luboff +Date: Thu Jul 13 17:30:52 2017 +0300 + + Added JWT lib to project + +commit 892618a5e2629c8d8225fa796dbecb5221053d49 +Author: cryoflamer +Date: Thu Jul 13 16:58:30 2017 +0300 + + tuneup + +commit d266007dc84904f037fc36c11bd899108f9bbb34 +Author: cryoflamer +Date: Thu Jul 13 16:41:50 2017 +0300 + + fix + +commit 3c2d938f3bb629151946ed747717ffca20b2f995 +Author: cryoflamer +Date: Thu Jul 13 16:30:47 2017 +0300 + + fix session_not_found + +commit 5de3a653331decc7119d4b60fba353e2fa2def6d +Author: qomputer +Date: Thu Jul 13 16:08:18 2017 +0300 + + Fix for get profile + +commit 1db78f548204b440a3cd362805840d4e5c5a633e +Author: ne-luboff +Date: Thu Jul 13 16:01:44 2017 +0300 + + Updated existing telesign tests + +commit 723acd8790f1bd6216aeb486692c18f8e1f6807d +Author: ne-luboff +Date: Thu Jul 13 15:53:53 2017 +0300 + + Separated Customer_key decod (in single function) + +commit 6192839d362c95facc22d0de3cb39b0a34dcdcc4 +Author: ne-luboff +Date: Thu Jul 13 15:46:52 2017 +0300 + + Started Telesign Auto Verify Handler. Updated unique generator + +commit be1062bf0e157a431b31aa477f465469b271ddd6 +Author: cryoflamer +Date: Thu Jul 13 15:14:28 2017 +0300 + + fix create_profile + +commit da22603d745a861f463e5b90aac9fa9a38281c73 +Author: cryoflamer +Date: Thu Jul 13 14:31:58 2017 +0300 + + fix roster_test + +commit f9319047d1377584c532f475ac003ef116a86d31 +Author: cryoflamer +Date: Thu Jul 13 14:25:51 2017 +0300 + + added reg_case_test + +commit bae9ee95c38b8331a8eb3d1ef57d1503ad52d541 +Merge: 0a990cd 2ea5381 +Author: ne-luboff +Date: Thu Jul 13 13:53:52 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into amazon_upload_api + +commit 0a990cd7320588eba7d7955254d03680781c7899 +Author: ne-luboff +Date: Thu Jul 13 13:53:14 2017 +0300 + + Updated amazon_api file formating + +commit 41319b41652ad0ec0cad855399b7f2b0c1617885 +Author: ne-luboff +Date: Thu Jul 13 13:52:12 2017 +0300 + + Updated export (amazon_api) + +commit 390cd82b02cc93059d9600a72b1303a55a66e74d +Author: ne-luboff +Date: Thu Jul 13 13:50:19 2017 +0300 + + Added unique key processing to AWS upload function + +commit 697aebcc02fafd3874e1f0eae8fc0e1d9906053d +Author: ne-luboff +Date: Thu Jul 13 13:32:51 2017 +0300 + + Added function for unique filename + +commit db7233ad97da86adb996ee8cd7afc38c9a4c1598 +Author: ne-luboff +Date: Thu Jul 13 13:12:23 2017 +0300 + + returned n2o_ftp protocol to sys.config file + +commit e496e2cddfd2e3722c6b3564f80fe31cb7111dcc +Author: ne-luboff +Date: Thu Jul 13 13:11:18 2017 +0300 + + Replaced ftp record with xftp record + +commit 2ea53819885ad00bf43f857264fc37f2c151ee1c +Author: Namdak Tonpa +Date: Thu Jul 13 13:07:34 2017 +0300 + + nameless tuple + +commit d97ef914d51d208052fa5a4b4d2e0c52c182c3a5 +Merge: 23e6285 539cda1 +Author: Anton Makarov +Date: Thu Jul 13 12:48:37 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit 23e6285ed8fb94150ec8455324f61bc1df14ba76 +Author: Anton Makarov +Date: Thu Jul 13 12:48:24 2017 +0300 + + wip + +commit 539cda19d198e4d4b004eb60e08b4f0098806b46 +Author: 5HT +Date: Thu Jul 13 00:53:02 2017 +0300 + + profile status get + +commit 78c7187cd875e2b7a71a5abe98c5dd19d870e3be +Author: Anton Makarov +Date: Wed Jul 12 22:03:38 2017 +0300 + + Nynja Parser + +commit 6a223cc07b1630459585c4445d7e7aa9547fb533 +Author: Namdak Tonpa +Date: Wed Jul 12 21:52:56 2017 +0300 + + Binary -> String + +commit 8f575bd3efbcf71a17c2e491a1df70bcce00fecc +Author: Namdak Tonpa +Date: Wed Jul 12 21:49:14 2017 +0300 + + parser.swift + +commit 81126f7e1f8f2bd9d0e729740cd085ba8924b6d5 +Author: Namdak Tonpa +Date: Wed Jul 12 20:42:40 2017 +0300 + + swift + +commit b2e86822ec9ca0ee8ce806532e661b9a8c17049c +Merge: 30e061e 7236578 +Author: Namdak Tonpa +Date: Wed Jul 12 20:21:30 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 30e061eb75575ec5fdbda6379c1d7d371b925cca +Author: Namdak Tonpa +Date: Wed Jul 12 20:21:23 2017 +0300 + + swift parser + +commit 72365781256744fc4cee2c2086266826e14fec93 +Author: qomputer +Date: Wed Jul 12 20:16:24 2017 +0300 + + Fix tests + +commit 808b3bd802dcb993cab32b4225bf04a583e0aac8 +Author: cryoflamer +Date: Wed Jul 12 20:02:55 2017 +0300 + + added session_not_found to auth_case_test + +commit 5767e7178710dc5ce276e87026f5547b1b1d7cc3 +Author: ne-luboff +Date: Wed Jul 12 19:57:30 2017 +0300 + + Defined exchanged FTP protocol. TODO - update record fields and processing + +commit 0539cb57bfee4420ee7fa18aec578ddd6710d858 +Author: qomputer +Date: Wed Jul 12 19:54:45 2017 +0300 + + Fix contact add + +commit 9f704c2d9ebe06bf8138787f3e0521ab1a501b6a +Merge: b2fb93c 633b725 +Author: Namdak Tonpa +Date: Wed Jul 12 19:26:39 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit b2fb93c7cea9c28a0216e917bdac438ea37e3236 +Author: Namdak Tonpa +Date: Wed Jul 12 19:26:32 2017 +0300 + + fix + +commit 87f1657ba92ad6d2398810b5e4d5afa148b913e3 +Author: ne-luboff +Date: Wed Jul 12 17:27:19 2017 +0300 + + Added uploading to S3 in ftp protocol + +commit 831277feaab0c5a86f025f5dccbbbe04e3493af6 +Author: ne-luboff +Date: Wed Jul 12 16:53:13 2017 +0300 + + Updated FTP protocol. Deleted excess tabs (~n) + +commit 6b40eafbe9f157102a8261c4600b9705f688319c +Author: ne-luboff +Date: Wed Jul 12 16:49:35 2017 +0300 + + Updated FTP protocol, replaced io:format with ?LOG + +commit 848a6c8a5bdb7ed1f2397c9360a3ec2f363016fb +Author: ne-luboff +Date: Wed Jul 12 16:35:13 2017 +0300 + + Updated ftp protocol file formating + +commit ca80bfefbcb8adf69c5b695f5c94576c401f609e +Author: ne-luboff +Date: Wed Jul 12 16:29:07 2017 +0300 + + Renamed file roster_n2o_ftp.erl -> roster_ftp.erl + +commit b241ccef305417e55777017e0bb21826dabe4d01 +Author: ne-luboff +Date: Wed Jul 12 16:25:55 2017 +0300 + + Added new ftp protocol (replaced n2o_ftp with roster_n2o_ftp). Updated roster upload settings + +commit 633b7256e90488d79612a76241d134deb8fbfa41 +Author: cryoflamer +Date: Wed Jul 12 16:02:07 2017 +0300 + + updated auth_case_test + +commit 74086a2c0f42440d2542d4e44f18fe6d9078a1a4 +Author: Namdak Tonpa +Date: Wed Jul 12 15:33:55 2017 +0300 + + roster api + +commit c325c8ad022a2926e5e35b68ffaed78c8f42ea3e +Merge: 69ad344 5a3fde8 +Author: Namdak Tonpa +Date: Wed Jul 12 14:59:54 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 69ad3446820c065eadc4f750d4c343d38467e32c +Author: Namdak Tonpa +Date: Wed Jul 12 14:59:46 2017 +0300 + + contact.avatar + +commit 5a3fde803ffb84b838f4d601b61071ae265ca05e +Author: qomputer +Date: Wed Jul 12 13:58:10 2017 +0300 + + Update behavior on disconnect + +commit 2335a22bdd55d7483e7fee13d9aaf3b5f04e2359 +Author: Namdak Tonpa +Date: Wed Jul 12 03:40:59 2017 +0300 + + io,ok|error + +commit e42b4b6aceec9a1b9865c9b28eaca165c8dba947 +Author: Namdak Tonpa +Date: Wed Jul 12 03:31:47 2017 +0300 + + io protocol + +commit a6680044aea40d82a8a12ba5a00b1c5cc5b447d1 +Author: Namdak Tonpa +Date: Tue Jul 11 23:41:50 2017 +0300 + + add Token to already_registered + +commit 232bd8616006d555000576c173093826df4ce50f +Author: Namdak Tonpa +Date: Tue Jul 11 18:04:48 2017 +0300 + + actions/vsn/.. events/vsn/// + +commit 63c912d3e51946e4545de4f7fb6ad18d75a1c6cc +Author: Namdak Tonpa +Date: Tue Jul 11 17:59:21 2017 +0300 + + actions/1/... + +commit d097158662e3a15f3a03b7fd29bc248f2b67f509 +Author: Namdak Tonpa +Date: Tue Jul 11 17:25:10 2017 +0300 + + profile methods is public + +commit 87bf1223e5475370438705806ed24e68afb8a14d +Author: qomputer +Date: Tue Jul 11 15:54:22 2017 +0300 + + Fix roster:authorized + +commit fc97783fb60344bdcbcc9093bce8025306b6b3f4 +Author: qomputer +Date: Tue Jul 11 14:56:57 2017 +0300 + + Fix my merge + +commit 55b3a97971e16805767c72f6566aa822f215c0da +Author: qomputer +Date: Tue Jul 11 14:48:37 2017 +0300 + + Fix session_not_found + +commit bce82608ef10502a4df4d57c7df5c8d60735df3e +Merge: 6f15281 7148522 +Author: 5HT +Date: Tue Jul 11 12:39:36 2017 +0300 + + fix merge + +commit 6f152811aeef2a74eaaf535f6ee531e89feb3b6e +Author: 5HT +Date: Tue Jul 11 12:35:51 2017 +0300 + + fix kvs:index for ClientId + +commit 7148522d13b2a21a8d14778a08d5c0d68b9183a8 +Author: Namdak Tonpa +Date: Tue Jul 11 03:50:23 2017 +0300 + + remove macros + +commit 36bec7a121199e9df2a6d0e7abe4f28d91ec0ff2 +Author: Namdak Tonpa +Date: Tue Jul 11 01:39:46 2017 +0300 + + review AUTH + +commit eb3d0c40b0035506a9dcb45e9084a0322d5b0e9c +Author: Namdak Tonpa +Date: Mon Jul 10 20:15:12 2017 +0300 + + fix + +commit ce3a74fa1180109389c3a45bfd33829995017c4b +Author: 5HT +Date: Mon Jul 10 20:13:56 2017 +0300 + + server + +commit abbd861dc0ff49aea8ac59b547de4edb6205acd0 +Author: Namdak Tonpa +Date: Mon Jul 10 19:29:29 2017 +0300 + + don't check auth on remove roster + +commit ec73fe4b5b703f527f9b09c4c004074a95e48431 +Author: Namdak Tonpa +Date: Mon Jul 10 19:24:02 2017 +0300 + + don't check auth on remove roster + +commit 5d36a540adc5442adb0d5c2acb3cb4fd7398a402 +Author: Namdak Tonpa +Date: Mon Jul 10 18:42:48 2017 +0300 + + fix test + +commit 2369eed78f9b2ef91354bec2874337c27f5cbc25 +Merge: ef86757 44ba6c6 +Author: Namdak Tonpa +Date: Mon Jul 10 18:41:56 2017 +0300 + + test + +commit ef867571b4ed0d3801a84a92692cab274a852e0d +Author: Namdak Tonpa +Date: Mon Jul 10 18:41:20 2017 +0300 + + merge + +commit 44ba6c6e8cf2562e0657419eb7f496afce9a85f0 +Author: qomputer +Date: Mon Jul 10 18:11:38 2017 +0300 + + Fix tests + +commit 5fbed51fbdab779413437842bc6949a84e5b4acf +Author: Namdak Tonpa +Date: Mon Jul 10 17:52:15 2017 +0300 + + sleep fix + +commit 238684330b9e4616daf393713a12c43bbdc4e293 +Merge: f2523fe 10dca63 +Author: Namdak Tonpa +Date: Mon Jul 10 17:34:10 2017 +0300 + + merge, fixbui;d + +commit f2523febfb163be30e59ef1e2d5c24e82fd7d7ad +Author: Namdak Tonpa +Date: Mon Jul 10 17:32:52 2017 +0300 + + retrieve nested profile + +commit 10dca63696ce317a3ef3c1366978407a99553fb4 +Author: cryoflamer +Date: Sun Jul 9 18:16:52 2017 +0300 + + updated roster_test:auth_case_test + +commit 26e310151061527f636ebefe1a2a108222d6d6f5 +Author: cryoflamer +Date: Sun Jul 9 16:50:27 2017 +0300 + + moved roster_auth:start() to send_sms + +commit eb447978d8f747a0bd3438349cd598f94a8bbb9e +Author: qomputer +Date: Sat Jul 8 19:33:52 2017 +0300 + + Update create_profile, fix test_roster + +commit a85c49d3a16a6189ae6169a8f20dbf2207732ea2 +Author: Namdak Tonpa +Date: Sat Jul 8 18:45:56 2017 +0300 + + todo + +commit 02b6fb84db4bdeba10f5c283620ad882b5b683b5 +Author: Namdak Tonpa +Date: Sat Jul 8 13:20:58 2017 +0300 + + cleanup logs + +commit d1719a5e779b74e72e7bd1f9746516d25c6171e8 +Author: Namdak Tonpa +Date: Sat Jul 8 05:04:50 2017 +0300 + + friend authorized + +commit e714766a2f8297adf3c19898cac812941fc3793e +Author: qomputer +Date: Fri Jul 7 18:20:24 2017 +0300 + + Fix misc_test_roster. + +commit 0de3e7fa56daf17feeb65b129f05cb72d7ade2da +Author: cryoflamer +Date: Fri Jul 7 17:59:46 2017 +0300 + + removed delete_user + +commit a88e59cf66534aecc1ea8fdc8c4b54e054b829ee +Author: qomputer +Date: Fri Jul 7 17:53:07 2017 +0300 + + Fix purge_user. + +commit f42102bb54e6f898a3c301df93f5d2ef95b23f48 +Merge: 73d9941 cda2ebc +Author: qomputer +Date: Fri Jul 7 17:31:09 2017 +0300 + + Fix misc_test_roster. + +commit 73d99413177852d7545f43cb427b665b81fbd3d1 +Author: qomputer +Date: Fri Jul 7 17:15:49 2017 +0300 + + Add handlers to roster for UNK + +commit cda2ebccf13d95e18e609654f7937e8bec97078c +Author: qomputer +Date: Fri Jul 7 17:15:49 2017 +0300 + + Add handlers to roster for UNK + +commit 8e0f2e540b039c461693144b990c2e15bdd9159d +Author: cryoflamer +Date: Fri Jul 7 17:14:44 2017 +0300 + + added log to test_roster + +commit f141323e6bd2ad7cce1cef574d2b6480c97d43c0 +Author: cryoflamer +Date: Fri Jul 7 17:03:02 2017 +0300 + + updated test_auth + +commit 14c02344dec8c21a62f35a716a6d357b5d391410 +Author: cryoflamer +Date: Fri Jul 7 17:00:42 2017 +0300 + + fixed delete_user + +commit 805bba02ebb9d37321fdaf1871919ae01dc7365b +Author: qomputer +Date: Fri Jul 7 16:21:53 2017 +0300 + + Fix purge_user and remove_roster + +commit b0916a36ee2061293eea9fe8b28b1891dd4b8a3a +Author: cryoflamer +Date: Fri Jul 7 15:50:12 2017 +0300 + + added delete_user to roster_auth:info + +commit 32a8c21bf6d7fa21867aa180e0f6e3ee81104f9c +Author: cryoflamer +Date: Fri Jul 7 15:45:55 2017 +0300 + + fixed purge_user + +commit e8f604b60d04d7deeea5cfc95b962a81b8ccbb14 +Author: cryoflamer +Date: Fri Jul 7 14:46:46 2017 +0300 + + fixed roster_auth + +commit 576ac2871fc836c54a8f589dbc340b69831121cf +Author: qomputer +Date: Fri Jul 7 13:36:23 2017 +0300 + + Fix handlers and tests for roster + +commit 35b31985ba81164727376769bdf7aa40f29f59ba +Author: cryoflamer +Date: Fri Jul 7 13:19:01 2017 +0300 + + fixed roster_test + +commit ac42ffbbe0453f010063e1e642933e89543872f1 +Author: cryoflamer +Date: Fri Jul 7 12:55:05 2017 +0300 + + removed flood logs + +commit 0729113997297a2d8800ea52643ef54a1c78878b +Author: cryoflamer +Date: Thu Jul 6 19:05:24 2017 +0300 + + set dev_key as first index + +commit 5ee1069713c4d6caa3fbbe8696cef65bb68c346f +Author: qomputer +Date: Fri Jul 7 12:06:53 2017 +0300 + + Add general_test_roster + +commit 7f5f941d9a69c89d4b37aea9b0c43f54aecef4b7 +Author: cryoflamer +Date: Thu Jul 6 18:06:01 2017 +0300 + + updated roster:send_event for new "evens//..." + +commit 1eb78ee9af82f6abf3e02128206210c3046a55cb +Author: cryoflamer +Date: Thu Jul 6 16:34:31 2017 +0300 + + fixed session_not_found + +commit 73b8494dd09cfd4ec84afb96978bcac6025794fa +Author: qomputer +Date: Thu Jul 6 14:11:49 2017 +0300 + + Fix tests of Roster + +commit 38e60a1c89029c82940f5e8504c9f6bf5be252dd +Author: cryoflamer +Date: Thu Jul 6 13:33:04 2017 +0300 + + moved resend to info + +commit bd6efdf8e2b24f3c2d467786556cce8e52cf1b42 +Author: cryoflamer +Date: Thu Jul 6 13:24:55 2017 +0300 + + applied async sms send + +commit a6c3a70e05501d9f5ebd1c2e56fabca32735a980 +Author: qomputer +Date: Wed Jul 5 23:53:46 2017 +0300 + + Add test_del_contacts() and unsubsribe p2p, fix test_roster and delete contacts + +commit fe384b8ad3613c3fab6a3ce8b9ccb317d1d391f1 +Author: cryoflamer +Date: Wed Jul 5 18:36:03 2017 +0300 + + moved verify fun to info + +commit 084af963985145c0fcb3b0735a7034f0e9dbeb7a +Author: cryoflamer +Date: Wed Jul 5 18:21:07 2017 +0300 + + removed #auth_state + +commit 8fad93e7fa4f734cd94f92b8afdc99d3cc124dc3 +Author: cryoflamer +Date: Wed Jul 5 16:43:50 2017 +0300 + + added helper n2o_async for telesign sms sending + +commit c032495fae6a080526df01fc2a3f520df80f7df0 +Author: Namdak Tonpa +Date: Wed Jul 5 16:04:40 2017 +0300 + + enable INGLIGHT logs + +commit 9b39844c62c241d5a5fa5c29463afa4600fe0b87 +Author: cryoflamer +Date: Wed Jul 5 15:48:04 2017 +0300 + + changed answer for resend_sms + +commit 11a08799244734e17798a1253ba0bab328b372f9 +Author: cryoflamer +Date: Wed Jul 5 15:43:56 2017 +0300 + + merged session_not_found and verify_session_not_found + +commit ccdaf8be1a186b8437c724e4596d2a1c37618b07 +Author: cryoflamer +Date: Wed Jul 5 15:43:13 2017 +0300 + + updated purge_user + +commit e8fc8157ef92b85c1665b80bdd3e644abb8d268c +Author: cryoflamer +Date: Wed Jul 5 14:53:55 2017 +0300 + + merged verify_session_found and session_found + +commit 67c2baf9493e7914b1258c525fa22281896ebca4 +Author: cryoflamer +Date: Wed Jul 5 14:04:48 2017 +0300 + + replaced verify and resend_sms for #'Auth'{type=verify/resend_sms} + +commit 36ed441b86c8dd71a826e384fd7c0f5d3f5e3331 +Author: Namdak Tonpa +Date: Wed Jul 5 05:18:25 2017 +0300 + + cleanup test + +commit e45a51f870d0f9dc9cd22bb2039aabc262a3298b +Author: Namdak Tonpa +Date: Wed Jul 5 05:09:00 2017 +0300 + + cleanup test + +commit c6822b9c5cce446fbed7703fb470d12b7657584b +Author: Namdak Tonpa +Date: Wed Jul 5 05:05:46 2017 +0300 + + test offline message delivery + +commit 1830931496ad77973ba507b6cbef3c19e3826170 +Merge: ea3c4ad 42ad99a +Author: Namdak Tonpa +Date: Wed Jul 5 02:39:58 2017 +0300 + + respect io protocol + +commit ea3c4ad9ee725a38dbd403bce780a93f2cd99e74 +Author: Namdak Tonpa +Date: Wed Jul 5 02:39:12 2017 +0300 + + respect io protocol + +commit 42ad99a4f1e7c57cc93afe11acfe7a02c73b28f5 +Author: qomputer +Date: Wed Jul 5 02:21:21 2017 +0300 + + Fix subscribe_p2p + +commit 2f063530e36375bc40d97c7781e1b92e661fd643 +Author: Namdak Tonpa +Date: Tue Jul 4 21:28:12 2017 +0300 + + offline messages test + +commit ba75e50183de22650eab57274c9959aea4456f79 +Author: cryoflamer +Date: Tue Jul 4 20:10:19 2017 +0300 + + updated io answers + +commit 10d232d144279386f0b7aecba1bdd09658f76d03 +Author: qomputer +Date: Tue Jul 4 19:25:18 2017 +0300 + + Fix Friend->Roster + +commit 9e37e89f708fd3e4ef4c97148b2a7fe071df2a87 +Author: cryoflamer +Date: Tue Jul 4 19:07:24 2017 +0300 + + fixed send_verify + +commit 7cdd634f8f581f911c57464494da8a8839da65d4 +Author: cryoflamer +Date: Tue Jul 4 18:46:32 2017 +0300 + + added auth for register fake phones + +commit 10e7da1bfd5d401e0fd1cb3b2348c394fc72b7fd +Author: cryoflamer +Date: Tue Jul 4 18:00:39 2017 +0300 + + fix delete_sessions + +commit f76fa6cc53f89836538d0cda37f59574f328ca91 +Author: cryoflamer +Date: Tue Jul 4 17:57:37 2017 +0300 + + added purge_user + +commit 32dd74687af5dec4f7b4e78037f8817dcfe255ba +Author: Namdak Tonpa +Date: Tue Jul 4 17:53:51 2017 +0300 + + cleanup + +commit 0e0bb7b2e066476168c3da85b139d9c04c0fcb26 +Author: Namdak Tonpa +Date: Tue Jul 4 17:52:57 2017 +0300 + + cleanup + +commit 4a052171ffc3fc563f31461e7f247516bfc94569 +Author: Namdak Tonpa +Date: Tue Jul 4 17:42:48 2017 +0300 + + remove init + +commit 431ab49a0f62ab124a555cbf88bfb7722e54a797 +Author: Namdak Tonpa +Date: Tue Jul 4 17:34:12 2017 +0300 + + Contact.status + +commit 6ae2698251f00ed611239adaffa43306c8b97743 +Author: Namdak Tonpa +Date: Tue Jul 4 17:26:37 2017 +0300 + + WE WILL USE OUR OWN VALIDATION FUNCTION NOT EMQ ACLs + +commit 171427a512aa57bb8f712bdc79d9384f7756809b +Author: Namdak Tonpa +Date: Tue Jul 4 17:21:15 2017 +0300 + + PERSON API + +commit a793c2103354942c9d873a6dc24f4bc7a1cbd86c +Merge: 3e94ed7 cb37bbf +Author: Namdak Tonpa +Date: Tue Jul 4 17:07:45 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 3e94ed78a65cb8cc093412b8958bdd9d11f33860 +Author: Namdak Tonpa +Date: Tue Jul 4 17:07:35 2017 +0300 + + Profile Code Review + +commit cb37bbf59cce3530878d96423fefc406cb042546 +Merge: 969b4e2 c44ca19 +Author: ne-luboff +Date: Tue Jul 4 16:49:45 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into amazon_upload_api + +commit c44ca1900cd2501fcba8341362d287c854b89401 +Author: Namdak Tonpa +Date: Tue Jul 4 16:43:45 2017 +0300 + + REMOVE + +commit 969b4e233aad483ac1e0d28d12d86a8ebe8262a8 +Author: ne-luboff +Date: Tue Jul 4 16:24:04 2017 +0300 + + Changed Amazon S3 buckets + +commit 63aaae9a8c5a02740b3cdaaec9bddbb855dec45b +Author: Namdak Tonpa +Date: Tue Jul 4 15:58:19 2017 +0300 + + list rosters + +commit 4ba6a79bfa307201fd90285f0ce8055815389d37 +Merge: 4b13a8b 2e536b6 +Author: Namdak Tonpa +Date: Tue Jul 4 15:55:06 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 4b13a8b4fa229e9cd1fb108d45ebdd671ccc860c +Author: Namdak Tonpa +Date: Tue Jul 4 15:54:51 2017 +0300 + + Reviewed ROSTER API + +commit 2e536b64a6101fc2ca14aa2a01af53540a43ee08 +Author: cryoflamer +Date: Tue Jul 4 15:43:53 2017 +0300 + + added delete_sessions + +commit 1791e46a983fbcb8cc96d543f17eba25bd8bb9cd +Author: Namdak Tonpa +Date: Tue Jul 4 15:37:17 2017 +0300 + + logs + +commit 0647b4831826ff2a2311ffd68329caae3ee516ef +Author: ne-luboff +Date: Tue Jul 4 15:35:23 2017 +0300 + + Deleted excess code + +commit be44c4c3705e353fb07e0cfed4d0b3d8eafa1cec +Author: Namdak Tonpa +Date: Tue Jul 4 15:34:38 2017 +0300 + + person logs + +commit b793670ecccff4ae49be6a0c9e9d07112296027b +Author: Namdak Tonpa +Date: Tue Jul 4 15:33:19 2017 +0300 + + wip + +commit 4d7a0df8c6e0be20de4573ccac02cdb5db5bf957 +Author: ne-luboff +Date: Tue Jul 4 15:31:32 2017 +0300 + + Finally removed ercloud lib. Refactored existing amazon api helper and it test + +commit 1f29a3c44dab35d04321021f2b898a2e7b058549 +Author: Namdak Tonpa +Date: Tue Jul 4 15:30:52 2017 +0300 + + proper log message + +commit 4bd2de7e9bef5d6deb97a78dbc0314c44cf56d3b +Author: Namdak Tonpa +Date: Tue Jul 4 15:28:12 2017 +0300 + + switch protocol + +commit c99e0bfc85c1cd485b3fc857039aa86830d23459 +Author: Namdak Tonpa +Date: Tue Jul 4 15:10:37 2017 +0300 + + cleanup roster API + +commit 962805876c9e3f2a7273a99ab20ea60944f710cc +Author: Namdak Tonpa +Date: Tue Jul 4 15:09:43 2017 +0300 + + cleanup roster API + +commit c5c6f5bac0a77123ef5e4952df14987478a402d6 +Author: Namdak Tonpa +Date: Tue Jul 4 14:10:22 2017 +0300 + + remove Roster.user_id + +commit 7b63cdd805f03fceb6d18723c4ef489a9af5c2bd +Author: Namdak Tonpa +Date: Tue Jul 4 13:58:34 2017 +0300 + + authorized Roster by Token + +commit 910e622fc4e3d11e71af1b82ad2e30354ef7f57d +Author: Namdak Tonpa +Date: Tue Jul 4 13:33:22 2017 +0300 + + more strict impl (let it crash on error) + +commit acd49215c3a35815a85862bc7396346745fecddb +Author: Namdak Tonpa +Date: Tue Jul 4 13:31:19 2017 +0300 + + extend test + +commit 8e238315dc813d3440827f154bcbcf5c3f4e1562 +Author: Namdak Tonpa +Date: Tue Jul 4 13:28:29 2017 +0300 + + multiple contacts roster handling + +commit 4c14668f290eae6448994c5face36111cd3c2c78 +Author: Namdak Tonpa +Date: Tue Jul 4 13:10:25 2017 +0300 + + remove_contacts + +commit 8e68a729466295188b9840b9a2c78f9b0c45f5dd +Author: Namdak Tonpa +Date: Tue Jul 4 12:44:17 2017 +0300 + + #Roster.subscribe = true (default) + +commit 663df28d2e93d9c7cb5c94b212c66c135b68e7a9 +Author: Namdak Tonpa +Date: Tue Jul 4 11:58:14 2017 +0300 + + remove iterator from Contact + +commit a492190d59021f6b70b4f9d80c64ec21f6ca3703 +Author: Namdak Tonpa +Date: Tue Jul 4 07:27:12 2017 +0300 + + cleanup + +commit 006823986b1dc8264870bc10be8d3a70f5834c83 +Author: Namdak Tonpa +Date: Tue Jul 4 07:22:35 2017 +0300 + + refactoring AUTH + +commit c14e1019dac4a27b59ced0948b402ed1019faff0 +Author: Namdak Tonpa +Date: Tue Jul 4 07:02:37 2017 +0300 + + refactor AUTH + +commit ad4fc37b44280a870b5e1f1f84ab66df38b8d5d9 +Author: Namdak Tonpa +Date: Tue Jul 4 06:09:53 2017 +0300 + + TOTAL ROSTER CLEANUP + +commit 8e3e7dc3c5b229644d01d95cdb0cb56b56b6f2a1 +Author: Namdak Tonpa +Date: Tue Jul 4 05:46:05 2017 +0300 + + change roster:add_user to roster:create_profile (new API) + +commit d227d5b757235c9a3c27c549b88e37481d614b26 +Author: Namdak Tonpa +Date: Tue Jul 4 05:34:17 2017 +0300 + + fix tests + +commit 10d3589a2546c82fdea1d07d05d12ca6e990a8a1 +Author: Namdak Tonpa +Date: Tue Jul 4 03:54:16 2017 +0300 + + roster api test + +commit 44e23f5a1e76274175bb4d0668bc3903a0bf20bd +Author: Namdak Tonpa +Date: Tue Jul 4 03:50:48 2017 +0300 + + roster test + +commit c0fc4f6005321f1e66441eee934709592265fc87 +Author: Namdak Tonpa +Date: Tue Jul 4 03:39:29 2017 +0300 + + ROSTER API TESTS + +commit 04dec7f6b2b6b9c1100ec4923d8491ec76027ec3 +Author: Namdak Tonpa +Date: Tue Jul 4 02:44:24 2017 +0300 + + NEW ROSTER API by 5HT drop in replacement + +commit 2c61f1467cf79514397e8f1dd9dc1d552ea927ee +Author: Namdak Tonpa +Date: Tue Jul 4 01:51:54 2017 +0300 + + TOTAL CLEANUP + +commit 400ed0f543fbddff9760a00b89ca5852f9c1f558 +Author: Namdak Tonpa +Date: Tue Jul 4 01:47:43 2017 +0300 + + cleanup + +commit 00b6cfbe6259f99f4d48dd8a77086c2e1239464a +Author: Namdak Tonpa +Date: Tue Jul 4 01:33:34 2017 +0300 + + fix test + +commit c344179bdd38e7e3626e9868752e31dbcd6c5c25 +Author: ne-luboff +Date: Mon Jul 3 23:36:14 2017 +0300 + + changed aws s3 lib (ercloud -> mini_s3) + +commit 13cea532c8ac15b2a0091c676e50df79a4c7847f +Author: Namdak Tonpa +Date: Mon Jul 3 23:34:33 2017 +0300 + + names surname in roster + +commit 5a6e32b5de495627c7dfafeef4c278fbceb056fe +Author: Namdak Tonpa +Date: Mon Jul 3 22:58:44 2017 +0300 + + move docs to protocol + +commit f9b08b0dd358daed88f9df3b646101e1f334ba13 +Author: Namdak Tonpa +Date: Mon Jul 3 22:43:34 2017 +0300 + + remove orphan code + +commit 01472b34c34840e3d936a3d67e184d3927f1cf48 +Merge: 8280740 c1312f5 +Author: Namdak Tonpa +Date: Mon Jul 3 22:34:37 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 828074001c52a5c53e9398320952d040f803062e +Author: Namdak Tonpa +Date: Mon Jul 3 22:34:22 2017 +0300 + + fix verified + +commit c1312f58508cc9362996878b142011933ac9e34f +Author: qomputer +Date: Mon Jul 3 20:05:28 2017 +0300 + + Add variant 'roster_unconditional' and fix test_roster + +commit f0d04adf7a5e4e3a03c4518d1f6262beb816dbaf +Author: cryoflamer +Date: Mon Jul 3 19:56:41 2017 +0300 + + added auth_case_test2 + +commit b08ebac66c05f1fe767f8f416846feaeea4f4542 +Author: cryoflamer +Date: Mon Jul 3 17:30:58 2017 +0300 + + added default handler for proc({publish..., and simple_p2p_test + +commit 18e0ef696cf8f41f425185ac1cef55f8a982d355 +Author: qomputer +Date: Mon Jul 3 16:34:32 2017 +0300 + + Fix roster_test + +commit 1bd87859dd7a22af3c05ee75fef67bdf89c28590 +Author: Namdak Tonpa +Date: Mon Jul 3 16:21:28 2017 +0300 + + add History to test + +commit e35810c8a38cbb5fee756a50ec644fe8cbf443cd +Author: Namdak Tonpa +Date: Mon Jul 3 16:19:32 2017 +0300 + + be sync + +commit cecad560aeb428e73fe34d8cc2f70e5de7092f2d +Author: Namdak Tonpa +Date: Mon Jul 3 15:31:07 2017 +0300 + + history + +commit 2001c6799b32d6ae52f5e3975be215996e4df159 +Author: Namdak Tonpa +Date: Mon Jul 3 15:16:08 2017 +0300 + + remove unused files + +commit 5608511f3c88eca32dd4b3d62387a6329899c36c +Author: Namdak Tonpa +Date: Mon Jul 3 14:46:41 2017 +0300 + + chain + +commit a05fc1cc931f0477ac9a9170b8679c798d9ac15f +Author: Namdak Tonpa +Date: Mon Jul 3 14:38:38 2017 +0300 + + roster test fixed + +commit d9187c9b3ee675918b803621ac3c91dc98e6db52 +Author: Namdak Tonpa +Date: Mon Jul 3 14:32:02 2017 +0300 + + WRONG API NOTES + +commit 8747bc3f19c580dc19b59ac4cb2607de83435208 +Author: Namdak Tonpa +Date: Mon Jul 3 14:31:20 2017 +0300 + + fix WRING friend API + +commit 15ab1e1a667f65d59a31cdc5dfc38eb59ac35958 +Author: Namdak Tonpa +Date: Mon Jul 3 14:26:09 2017 +0300 + + fix crash + +commit 78d77244b563817124ec6963713ff59212b64f7f +Author: Namdak Tonpa +Date: Mon Jul 3 14:24:56 2017 +0300 + + disable message hooks + +commit f46f774a36387de13a6f510a1aac1d0bb23c8698 +Author: Namdak Tonpa +Date: Mon Jul 3 14:19:38 2017 +0300 + + test + +commit 59e8aff1a6770c9365e78c9e5975aeea0da9fcf3 +Author: Namdak Tonpa +Date: Mon Jul 3 14:17:11 2017 +0300 + + test + +commit 0cba46dd5a830643aeeb6692ad8f13d62a9faf7a +Author: cryoflamer +Date: Mon Jul 3 14:11:07 2017 +0300 + + added on_auth call for fake and verified requests + +commit 0b425f4492134018ca7a54a094125ff60e6a9241 +Author: Namdak Tonpa +Date: Mon Jul 3 13:27:27 2017 +0300 + + Correct Friend Test + +commit 5d7efffb593c591274735075783af3e05c592835 +Author: Namdak Tonpa +Date: Mon Jul 3 12:39:19 2017 +0300 + + P2PINVITE + +commit 6c227ae7c89f1addba0862f60063fd94397f8f04 +Author: Namdak Tonpa +Date: Mon Jul 3 12:36:14 2017 +0300 + + P2P+ is never called + +commit ecbd69cc13c777f71260893ce4f4faa4a451f01a +Author: Namdak Tonpa +Date: Mon Jul 3 12:08:03 2017 +0300 + + remove {init} as it no longer part of protocol + +commit a2b2e6267b8dbacfbfc72c37d7af640f6b90bb08 +Author: Namdak Tonpa +Date: Mon Jul 3 11:57:46 2017 +0300 + + apply requests from @5HT to tests + +commit 13aa04025a548e70396c7c8d743d37b61648b19a +Author: Namdak Tonpa +Date: Mon Jul 3 11:27:30 2017 +0300 + + accept string sms code + +commit 8bea6fd0dc2bfb34416c2510ce4157c9a1ce4253 +Author: Namdak Tonpa +Date: Mon Jul 3 11:15:46 2017 +0300 + + fix start with fresh database + +commit 34e5a913a3e8e4d9d67b150ea45010e666fdfaf5 +Author: cryoflamer +Date: Sat Jul 1 18:06:22 2017 +0300 + + updated AUTH.md + +commit 424fdc33c28fae8ea11abe1f4c5e96c482c8b3ea +Author: cryoflamer +Date: Sat Jul 1 16:39:49 2017 +0300 + + added fake phone register + +commit bbf1bd1be4c83da7008b670ce2c2d92667e3c707 +Author: qomputer +Date: Sat Jul 1 15:34:05 2017 +0300 + + Add test and fix functions for Roster,Friend and P2P + +commit 3a19641e6cba6f128f1174497c82696dba8409fe +Author: cryoflamer +Date: Fri Jun 30 19:23:55 2017 +0300 + + added fun roster_test:p2p_test/2 + +commit 96f46a40ad4a64e0669ccc91d9f2f57c866bd3b1 +Author: qomputer +Date: Fri Jun 30 18:37:42 2017 +0300 + + Update test_roster() + +commit bfad357c4bdec8eac15c33b94fefaf8d2a4ba99d +Author: cryoflamer +Date: Fri Jun 30 17:04:47 2017 +0300 + + added resend test + +commit f28dfe4fe1c0dbc496e8fe2bdb2c6b73a8002f72 +Author: cryoflamer +Date: Fri Jun 30 16:11:25 2017 +0300 + + fixed test_proto:session_found + +commit 5fff2f6c38ff075224dff6e9c86a107039fb852e +Author: cryoflamer +Date: Fri Jun 30 15:37:12 2017 +0300 + + added roster_test:test_verify + +commit 0c2e57cce3a56fe2aa97aca7801f44b4bb6efd8d +Author: cryoflamer +Date: Fri Jun 30 15:36:58 2017 +0300 + + added roster_test:test_verify + +commit 78fb8829d078cc13beb8bbd4d08721544c9f0446 +Author: ne-luboff +Date: Fri Jun 30 14:18:44 2017 +0300 + + Updated erlcloud lib, working on upload to S3 function + +commit 604bad002a872d9f404b841cc222bea993d39182 +Author: Namdak Tonpa +Date: Fri Jun 30 11:32:12 2017 +0300 + + {ok,sms_send} + +commit 7bddaf046eabb1a5fa53965880350548258b7eca +Author: Namdak Tonpa +Date: Fri Jun 30 10:54:08 2017 +0300 + + AUTH token + +commit 36ddce0913552c2f394a244214cc99da51363c6a +Author: Namdak Tonpa +Date: Fri Jun 30 10:43:20 2017 +0300 + + token + +commit c70a7e35651e465e4f1cd3a267573b9c9e16d17d +Author: Namdak Tonpa +Date: Fri Jun 30 10:41:00 2017 +0300 + + Tests: Put Token inside Client State + +commit 23914f13e1e760a30cdfdba78317512ea91b38e2 +Author: Namdak Tonpa +Date: Fri Jun 30 10:21:28 2017 +0300 + + init protocol + +commit 6f1d35053a3e50a2185504f82832cc52370f2808 +Author: Namdak Tonpa +Date: Fri Jun 30 10:16:19 2017 +0300 + + add async init + +commit f3c03e2e2c8c899847056fc1a94e93fd11610185 +Author: Namdak Tonpa +Date: Fri Jun 30 01:58:26 2017 +0300 + + Tests + +commit b8977d38c83fcbffb0b7a00e3893cc6f7c377b4e +Merge: 4ad4a9d 84129ab +Author: cryoflamer +Date: Fri Jun 30 00:40:24 2017 +0300 + + Merge branch 'async_test' + + # Conflicts: + # apps/roster/src/roster_test.erl + +commit 4ad4a9d22d68fc1dddce496cbe3c4ae67702931b +Author: cryoflamer +Date: Fri Jun 30 00:37:33 2017 +0300 + + updete proc(Unknown + +commit b53debb08757cbd38c086fc0a4363329e9389240 +Author: cryoflamer +Date: Fri Jun 30 00:36:46 2017 +0300 + + added auth_start2 test fun + +commit 84129ab286b462326338379e5f73de8748ae7f24 +Author: cryoflamer +Date: Fri Jun 30 00:25:29 2017 +0300 + + added auth_start2 test fun + +commit 3e6b35a5f6e4d07cdff2f4c9c81a698ab6dcf589 +Author: Namdak Tonpa +Date: Thu Jun 29 23:25:20 2017 +0300 + + auth + +commit a3d361b583aa81b4536d26c952dcf2bc82f0cf0a +Author: Namdak Tonpa +Date: Thu Jun 29 22:43:48 2017 +0300 + + test + +commit 76555486e245df578a9d77da79c15267ff6510fb +Author: cryoflamer +Date: Thu Jun 29 22:29:40 2017 +0300 + + added roster_test:start_auth2 + +commit f83d73c0f49cfd621f10816b9a468fafa6752e2c +Author: qomputer +Date: Thu Jun 29 20:35:30 2017 +0300 + + Update test_roster etc + +commit b24771426bc5359a055e359dc3d026aef4fcabac +Author: ne-luboff +Date: Thu Jun 29 18:05:16 2017 +0300 + + Started upload file to amazon feature. Find 3rd part library (erlcloud). TODO - use only Simple Storage Service Helper from 3rd part library (instead of all > package) + +commit 5916d74fcf787da3bdaab100c330051418577764 +Merge: c873196 bc0d99a +Author: Namdak Tonpa +Date: Thu Jun 29 16:07:40 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit c8731967749be2eb454583ed74f6ba6e7c9d7ac2 +Author: Namdak Tonpa +Date: Thu Jun 29 16:07:34 2017 +0300 + + Multiple Clients in Tests: Template for Future Tests + +commit 105662520b10f5854be980531c935e623d4b7b94 +Author: ne-luboff +Date: Thu Jun 29 16:03:00 2017 +0300 + + Added datetime info to log row + +commit bc0d99ab7a20e53921296ea6ed01eed8c3afbf27 +Author: cryoflamer +Date: Thu Jun 29 15:36:07 2017 +0300 + + updated AUTH.md + +commit de5593d8acda5a7a38d4cd41709888b09b6e058b +Author: Namdak Tonpa +Date: Thu Jun 29 11:33:04 2017 +0300 + + Test Examples + +commit d47b30e84133407d7a6ef580dc22f44776eb826d +Author: Namdak Tonpa +Date: Thu Jun 29 11:19:21 2017 +0300 + + Message API JS example + +commit f29f975868b86064ab59adcd1327999ad267b4f8 +Author: Namdak Tonpa +Date: Thu Jun 29 11:16:36 2017 +0300 + + initial message API + +commit f6d6b1f9b16d786d2f878be1f97205e4aec258ae +Merge: 30f21f7 4b29a50 +Author: cryoflamer +Date: Wed Jun 28 04:12:01 2017 +0300 + + Merge branch 'login_feature_test' + +commit 4b29a501635ac17057a3facf82d469af0bec277f +Author: cryoflamer +Date: Wed Jun 28 04:11:31 2017 +0300 + + fixed send_verify and test + +commit 17ca983c400586bac02a9323288d6e80f801122a +Author: cryoflamer +Date: Tue Jun 27 19:47:28 2017 +0300 + + update positive_send_verify + +commit c81283fdd1cadf7eb3c94c1bb5d0bd03fa03bb5b +Merge: 29af77f 30f21f7 +Author: cryoflamer +Date: Tue Jun 27 19:08:05 2017 +0300 + + Merge branch 'master' into login_feature_test + +commit 29af77fbb18a627a7341c0b924c7337f576b767d +Author: ne-luboff +Date: Tue Jun 27 19:02:27 2017 +0300 + + Updated test for issue #36 + +commit 30f21f745ccd13c5bd425dca8ff1527c44e5ff48 +Author: cryoflamer +Date: Tue Jun 27 18:37:38 2017 +0300 + + updated p2p test + +commit d8359b8d14e8a8ca1cf53db60a11392155aed52c +Author: ne-luboff +Date: Tue Jun 27 18:29:09 2017 +0300 + + Updated send_verify function. Started test for it (issue #36) + +commit 9eb2c84548bc00d9c54f3866a62cb3a0d2047c9f +Author: cryoflamer +Date: Tue Jun 27 16:08:06 2017 +0300 + + added check for vnodes + +commit 8edbbfac878858c761c67e94f93edead5f33abf3 +Author: cryoflamer +Date: Mon Jun 26 18:57:45 2017 +0300 + + updated PRESENCE.md and fixed presence + +commit 65ab051c154a836cf7e18c8a94a1e02e392bdca0 +Author: cryoflamer +Date: Mon Jun 26 18:27:13 2017 +0300 + + online/offline presence only for fist/last session + +commit eec532c26380296329498f610e8ac8c80800c813 +Author: cryoflamer +Date: Mon Jun 26 17:55:08 2017 +0300 + + added retain online/offline presence + +commit 9d063724aeca828ceec7b80677d6d6530bd30149 +Author: qomputer +Date: Mon Jun 26 14:17:29 2017 +0300 + + Fix update_roster and del_user + +commit 2e3d2386239df4ac098c9d776751d9303d27754b +Author: cryoflamer +Date: Mon Jun 26 13:31:01 2017 +0300 + + added offline presence + +commit 8df5e813f2c1216eaa4f80d221e131bc00073d20 +Author: cryoflamer +Date: Mon Jun 26 13:29:24 2017 +0300 + + amend: fix: removed find_active_client field from #auth_state + +commit 8334f60355b0e420d624f2d203cde27ad6c9b0cc +Author: cryoflamer +Date: Mon Jun 26 13:13:18 2017 +0300 + + fix: removed find_active_client field from #auth_state + +commit be4273dbef0cd138a7581fa5abc3743a18a0329a +Author: cryoflamer +Date: Mon Jun 26 12:59:51 2017 +0300 + + fixed send_sms in roster_proto:auth + +commit 91dee65c8d1ea6181aeace235b572d48ededba89 +Author: cryoflamer +Date: Sun Jun 25 18:07:08 2017 +0300 + + fixed online/offline presence + +commit 0931c4e6fe8f84a94b1dc8e09d8eaef6066341fe +Author: qomputer +Date: Sun Jun 25 00:40:26 2017 +0300 + + Fix doc/ROSTER.md + +commit dba08cb0dcb2f59a360d987813f9a3de63cb344b +Author: qomputer +Date: Sun Jun 25 00:30:30 2017 +0300 + + Update doc/ROSTER.md + +commit 407dedfd9151c00130716d8e6cb9edcaf5eb4be0 +Author: qomputer +Date: Sat Jun 24 18:42:38 2017 +0300 + + Update tests for queries + +commit 995c8b2a9335a15bc48ef0523a8f415842919271 +Author: cryoflamer +Date: Fri Jun 23 19:10:40 2017 +0300 + + added on_auth func for pesence + +commit 6695209023c8c85354958177505453972afbd996 +Author: cryoflamer +Date: Fri Jun 23 17:16:58 2017 +0300 + + upd gen_sms_code fun + +commit 73aeb70ab9fdf96cdb721dba50240b465d352b76 +Merge: 91d4a11 1d3182a +Author: cryoflamer +Date: Fri Jun 23 16:53:46 2017 +0300 + + Merge branch 'login_feature' + +commit 1d3182a56f09208dbd5d90823cfa6530356103b3 +Author: cryoflamer +Date: Fri Jun 23 16:50:33 2017 +0300 + + fixed send verify to live session + +commit 91d4a11ebf6fc78a3a0d33e12586abbaba11616a +Author: cryoflamer +Date: Fri Jun 23 16:35:01 2017 +0300 + + updated 'Friend' record and table + +commit 2931458c7b26c5aebad852da1a23aad4cfb5ee1b +Author: cryoflamer +Date: Fri Jun 23 15:53:34 2017 +0300 + + added roster:update_roster(add, {phone, _Phone}, ... + +commit d8e5031883265f178edb94906994026d592af602 +Author: ne-luboff +Date: Fri Jun 23 15:52:51 2017 +0300 + + Updated login-code-in-app logic + +commit b701e0df5fce13da7b5271d970a52ba12cbd8d8b +Author: cryoflamer +Date: Fri Jun 23 15:14:02 2017 +0300 + + updated update_roster + +commit a79facd50dde119d032269ee519976274ac76755 +Author: cryoflamer +Date: Fri Jun 23 15:04:01 2017 +0300 + + fix roster_proto + +commit abaede48c8b2d35430ce54fa208e8227d01d6dba +Author: cryoflamer +Date: Fri Jun 23 14:14:44 2017 +0300 + + fixed roster:neew_contacts + +commit c6060b0bce5e99238569a7d240676faf15d52918 +Author: ne-luboff +Date: Fri Jun 23 13:33:47 2017 +0300 + + Updated telesign_api export functions list + +commit 1b311a4b4f6fc7bc59d3f97d054189a4b4717c91 +Author: cryoflamer +Date: Fri Jun 23 12:55:05 2017 +0300 + + updated p2p ping-pong test + +commit 9a5a94a982859c2a2832e80f9bc1ff2d3debe13f +Author: cryoflamer +Date: Fri Jun 23 12:33:15 2017 +0300 + + updated INIT.md + +commit cb487b58e4c5ee312f2d5d30f0ffa26fd4efcce9 +Author: qomputer +Date: Thu Jun 22 19:03:37 2017 +0300 + + Fix function query_case_test + +commit c5877f91641599127451415cb453a7289a76ddaf +Author: cryoflamer +Date: Thu Jun 22 17:55:09 2017 +0300 + + fixed roster_acl + +commit f13a1b5689237d42e132de5024f52b691493daba +Merge: b73f6ea 935c423 +Author: ne-luboff +Date: Thu Jun 22 17:54:31 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit b73f6ea9c237b210daa4c16e785d6b67149aa639 +Author: ne-luboff +Date: Thu Jun 22 17:54:25 2017 +0300 + + Added Voice Verify Service Implementation (#26) + +commit 935c4234b6aae0151f24bb325f08c6b120c84f2c +Author: cryoflamer +Date: Thu Jun 22 17:11:14 2017 +0300 + + added roster_acl module + +commit dc97958e4b6160b70034fba5d8446bb6c474c560 +Merge: 0521081 7f188d1 +Author: ne-luboff +Date: Thu Jun 22 14:12:16 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server + +commit 0521081ddf8d7c681002d9ecb74d40c8436e9b7b +Author: ne-luboff +Date: Thu Jun 22 14:12:01 2017 +0300 + + Added reporting to telesign (issue #28) + +commit 7f188d1241bdd4e6260f82dc4749459c1a11a4ee +Author: cryoflamer +Date: Thu Jun 22 13:55:54 2017 +0300 + + fixed roster_test + +commit 51068cf3b201743310821cb3ea4d800329a5c49d +Author: cryoflamer +Date: Thu Jun 22 13:42:44 2017 +0300 + + added ping-pong test + +commit c0ba36c4893624d4cb25fe27d1c95998ff54ed01 +Author: cryoflamer +Date: Thu Jun 22 13:09:59 2017 +0300 + + updated roster_test + +commit 1e5059bc074c4d786d92438434b61c4c0f92a800 +Author: cryoflamer +Date: Thu Jun 22 11:49:11 2017 +0300 + + removed fun receive_test/3 grom gen_test + +commit b2222423dd3cd52cb2a9ed70a4510243aec9487f +Author: ne-luboff +Date: Wed Jun 21 21:38:48 2017 +0300 + + Updated gen_sms_code function. Include find_existing_active_sessions to flow + +commit 7f13edb06fb3f6a0dbc8d3f5bd518263544a395d +Merge: c6225a5 b48fd35 +Author: ne-luboff +Date: Wed Jun 21 19:57:25 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into login_feature + +commit c6225a50b9e9e2a811e223a83464f2f3fd81388f +Author: ne-luboff +Date: Wed Jun 21 19:57:17 2017 +0300 + + small refactor in login feature + +commit b48fd351601695405225e1b2777351ba4e435b20 +Author: qomputer +Date: Wed Jun 21 18:42:01 2017 +0300 + + Update and fix functional for Person, Roster, Profile + +commit 9efc61b632055c18d6422dd5937f9ead6c4bd9ea +Author: cryoflamer +Date: Wed Jun 21 16:16:50 2017 +0300 + + update AUTH.md + +commit b7358a933669b468c8b99805eab227e1b7a5f9d5 +Author: cryoflamer +Date: Wed Jun 21 15:46:10 2017 +0300 + + changed auth "io" server answers + +commit 570fd61038caf01fd8744b25c73fa04b5a0e708f +Merge: 2efb5eb dbcbaef +Author: ne-luboff +Date: Wed Jun 21 13:41:20 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into login_feature + +commit 2efb5eb0ff704ebd4064a456c4d10579f7aab40a +Author: ne-luboff +Date: Wed Jun 21 13:40:49 2017 +0300 + + Started multiple device login feature + +commit dbcbaef24bee06776e84d350e6b9f39789dcfe47 +Author: qomputer +Date: Wed Jun 21 12:44:07 2017 +0300 + + Fix update_roster and add update_person + +commit 0a20cc27067d228b1114dc6e4e3b22ddf22fc612 +Author: qomputer +Date: Tue Jun 20 19:12:00 2017 +0300 + + Update handlers and tests for queries Profile, Roster, Person etc + +commit 302bad4f56bee40e9b6a453f759ee22c9a97a6e4 +Author: cryoflamer +Date: Tue Jun 20 16:49:03 2017 +0300 + + added p2p test ping + +commit 3ae8810f32c6250330dc5c11fd6c35bb159c32e2 +Author: cryoflamer +Date: Tue Jun 20 15:27:49 2017 +0300 + + added receive_fun field to #state + +commit 801b35ac5e5e58f63f823b4337c6eff1bbf0dbd3 +Author: cryoflamer +Date: Tue Jun 20 14:47:49 2017 +0300 + + tuned roster:del_user + +commit 824f78d39336ac519b80905a0147aa84efc1b424 +Author: qomputer +Date: Tue Jun 20 14:43:48 2017 +0300 + + Fix del_user + +commit 2e378a7ad4edea8d0a9d73619368570374a6fd38 +Author: cryoflamer +Date: Tue Jun 20 14:32:40 2017 +0300 + + updated roster:del_user + +commit 1003782358eb69bab6b813a07ff3791f9fd2bd84 +Author: Namdak Tonpa +Date: Tue Jun 20 06:24:40 2017 +0200 + + dataset + +commit 2e6725a92e36616f697a5198e8eb12a6d05b5db9 +Author: cryoflamer +Date: Mon Jun 19 23:27:46 2017 +0300 + + updated test generator + +commit 5da54ae8d3a5c85719ecc2680f62ce5b057a7350 +Author: cryoflamer +Date: Mon Jun 19 21:41:00 2017 +0300 + + fixed auth + +commit f4996932735ea0c7c2644f1336b0b048e5c28cb8 +Author: cryoflamer +Date: Mon Jun 19 19:53:23 2017 +0300 + + added igor changes + +commit d88d81fb85328100aa225eed404ea7cc0a792c9e +Author: cryoflamer +Date: Mon Jun 19 19:37:56 2017 +0300 + + updated test generator + +commit 2778cfae8f182d4443bc208d64c79dc1e0fc2142 +Author: qomputer +Date: Mon Jun 19 19:21:35 2017 +0300 + + Update test of Profile and some fix roster.erl + +commit 01b4473f23b24420e8d0aa8396a25b66cb8a0df5 +Author: cryoflamer +Date: Mon Jun 19 17:44:45 2017 +0300 + + added state to gen_test and receive_client + +commit 4bd70c7072c3189067dc096b7798b9b06eea8288 +Author: cryoflamer +Date: Mon Jun 19 16:55:45 2017 +0300 + + added subscribe for "p2p/+/Id" after login + +commit d07d20fd867ba0a03567d9268a4e90c00f38410f +Author: cryoflamer +Date: Fri Jun 16 23:03:41 2017 +0300 + + rempved received_verify + +commit 9e789edf14eaa4c377d5d4a96249a10dfe0c0642 +Author: cryoflamer +Date: Fri Jun 16 22:45:00 2017 +0300 + + updated tests for send and resend sms + +commit 342377c3526a34d273697cba1ba5cbd01a7374b0 +Author: cryoflamer +Date: Fri Jun 16 21:47:09 2017 +0300 + + removed ignore files + +commit 4c02e452369a4cb06e004cfb6f02a6800fea2737 +Author: cryoflamer +Date: Fri Jun 16 21:46:41 2017 +0300 + + added ignore files + +commit 479f1439ab1bf7f6c3b1963c73bc7fc17e590a63 +Merge: 8d83282 e634d86 +Author: cryoflamer +Date: Fri Jun 16 20:37:44 2017 +0300 + + Merge remote-tracking branch 'origin/master' + + # Conflicts: + # apps/roster/src/roster_proto.erl + +commit 8d83282dd608d2c629971df1c94ce7309bbeb089 +Author: qomputer +Date: Fri Jun 16 18:41:55 2017 +0300 + + Update functions for Roster,Person and Profile + +commit e725e91c5e0553b1feed53c2a2b38c83dd3daeb0 +Author: ne-luboff +Date: Fri Jun 16 19:10:20 2017 +0300 + + finished async sms sending + +commit 8bb4c1758ad158371ec4525f692229edd30afc89 +Author: cryoflamer +Date: Fri Jun 16 18:55:50 2017 +0300 + + added SendFun to send_sms + +commit e634d86905abea0a964e46b0659556060abe8f95 +Author: qomputer +Date: Fri Jun 16 18:41:55 2017 +0300 + + Update functions for Roster,Person and Profile + +commit 35352f07dfca05466d4122aca25dcc168754a2aa +Merge: c566a52 d3afdb4 +Author: cryoflamer +Date: Fri Jun 16 18:38:23 2017 +0300 + + remove double dummy_sms_send + +commit c566a5292e6515f818a67c8363e66dee9433569e +Author: cryoflamer +Date: Fri Jun 16 18:30:10 2017 +0300 + + updated send_sms_response + +commit 04331586ad79a8f149773f7acbbc3058a7aee14c +Merge: f95c01c d9a3daa +Author: ne-luboff +Date: Fri Jun 16 17:18:32 2017 +0300 + + Merged with master + +commit d3afdb401220b08371cf5d9d60985cdf50f950f6 +Author: cryoflamer +Date: Fri Jun 16 18:30:10 2017 +0300 + + updated send_sms_response + +commit d9a3daa23507bc434b6771ebd7ed0f67568b9044 +Author: cryoflamer +Date: Fri Jun 16 18:21:21 2017 +0300 + + fixed verify for signup + +commit d5e02be2e769938e2a79f54efdeb496aa014cd0c +Author: cryoflamer +Date: Fri Jun 16 17:40:46 2017 +0300 + + added full cicle test for signup + +commit 06ce3eecc635c771c262f6ac5a7dd6bbbf5cab63 +Author: cryoflamer +Date: Fri Jun 16 17:40:06 2017 +0300 + + fixed auth in roster_proto + +commit b2afa9aa7f814cccff13088d69377202279a88eb +Merge: f95c01c f90a853 +Author: ne-luboff +Date: Fri Jun 16 17:18:32 2017 +0300 + + Merged with master + +commit f95c01c9148b59bac854be7e323b7fd25a75c959 +Author: ne-luboff +Date: Fri Jun 16 17:16:21 2017 +0300 + + replaced emqttc:publish function with n2o_vnode:send + +commit 456faa2864b502569ea19eafd4a9868768e47e9a +Author: ne-luboff +Date: Fri Jun 16 16:58:05 2017 +0300 + + Merge with master + +commit e8a1bd4a2265ba764794a9304e5537d8e7ce4775 +Author: ne-luboff +Date: Fri Jun 16 16:45:42 2017 +0300 + + async sms-sending. v1 + +commit f90a853023b106a0927ad48c82a3c99e88960c18 +Author: cryoflamer +Date: Fri Jun 16 15:36:24 2017 +0300 + + added Resend to AUTH.md + +commit e777bb4fdc5d6a25cbd6f78f1e9f79e5283ce2bb +Author: cryoflamer +Date: Fri Jun 16 15:29:21 2017 +0300 + + updated roster proto:auth and tuned roster_test + +commit 36ee8bdd3bf27b9c62f046b727f1717d0f926d05 +Author: cryoflamer +Date: Fri Jun 16 14:13:38 2017 +0300 + + updated auth. Added #auth_state + +commit 14418a0fe8dab09d1d9b6129d38c99716a0f7976 +Author: cryoflamer +Date: Fri Jun 16 13:07:19 2017 +0300 + + changed answer for delete_user request + +commit 21dc370ef6b07ecea8d79f357562735999af7218 +Author: cryoflamer +Date: Fri Jun 16 12:09:56 2017 +0300 + + fixed roster:auth + +commit cff664c5526aa9ed12dd054832aeeede11674db5 +Author: qomputer +Date: Thu Jun 15 19:21:44 2017 +0300 + + Add function update_roster and update Roster's handler + +commit f906ea2f957303e500814613bfd8dae74fa9ba0d +Author: cryoflamer +Date: Thu Jun 15 19:17:34 2017 +0300 + + tuning positive_p2p + +commit 6c4d65c037119d365224cf52543c0164c2ed64e8 +Author: cryoflamer +Date: Thu Jun 15 19:03:22 2017 +0300 + + added positive_p2p test + +commit b10bb6e81091e6077d890c477d9fceab0b9d55f8 +Author: cryoflamer +Date: Thu Jun 15 15:08:49 2017 +0300 + + added roster:get_contact by phone + +commit f8a98b66c9fd67071e5f76d488044bb818d96cd9 +Author: cryoflamer +Date: Thu Jun 15 15:06:33 2017 +0300 + + added roster:get_rosters/1 + +commit 1b8be2d4f0bafbdc4a2702fa58c5b950570c4786 +Author: cryoflamer +Date: Thu Jun 15 14:25:46 2017 +0300 + + added emqtt hooks for p2p + +commit baf402de1ccf5b3b31a8e18880f7e8e0f7540bf8 +Author: cryoflamer +Date: Thu Jun 15 14:17:06 2017 +0300 + + new topic schema for p2p PRIVARE.md + +commit b0f620e428fd1d91837c8483a0e84f3f47f8c503 +Author: qomputer +Date: Thu Jun 15 01:39:46 2017 +0300 + + Fix handlers for Profile and Person + +commit a8f626979872f75be5e0380b2bf3e4149cccd56d +Author: cryoflamer +Date: Wed Jun 14 23:02:03 2017 +0300 + + added gen_test fun and LOG macros + +commit 65c69724a71cbf7b58df4d2ec82c0ed4fd21592a +Author: cryoflamer +Date: Wed Jun 14 21:10:54 2017 +0300 + + added test wrapper + +commit 63bc19db4cb0b7b9b31943f748e8ac72d0f6f730 +Author: ne-luboff +Date: Wed Jun 14 20:24:43 2017 +0300 + + Updated VoxImplant Create User Test + +commit 44c94e8037aecd9769d7c2f9a52afd6b229746df +Author: ne-luboff +Date: Wed Jun 14 20:19:58 2017 +0300 + + Updated telesign test. V2 + +commit 52918cc4d86c071924dff402df42b7147832bc48 +Author: ne-luboff +Date: Wed Jun 14 19:06:28 2017 +0300 + + Updated telesign test + +commit ea5429de18c87e3785cc63fdd398d902f161a46c +Merge: 1c17d19 b6413ca +Author: qomputer +Date: Wed Jun 14 18:43:32 2017 +0300 + + Fix roster_proto + +commit 1c17d19fe37da77bbbc496db27f49a8a701c5687 +Author: qomputer +Date: Wed Jun 14 18:26:04 2017 +0300 + + Add function for sending additional messages + +commit cd47253a08cb453dd9b37cdf989cf2e8a79fca6d +Author: qomputer +Date: Wed Jun 14 18:26:04 2017 +0300 + + Add function for sending additional messages + +commit b6413ca130cc4e48a54679a58dacf26d21125724 +Author: qomputer +Date: Wed Jun 14 18:26:04 2017 +0300 + + Add function for sending additional messages + +commit 0ff50590fa7a0583a9de1f76c3dd39b87b740776 +Author: cryoflamer +Date: Wed Jun 14 17:35:35 2017 +0300 + + updated tests for verify and resend + +commit bf59509da23b7d70297e711cf7e4fce4a724c9dc +Author: cryoflamer +Date: Wed Jun 14 17:32:55 2017 +0300 + + updated auth, verify, and resend_sms + +commit 7afb3118c1bd22dc664764f65b0c396de7ef2824 +Author: cryoflamer +Date: Wed Jun 14 17:30:24 2017 +0300 + + added session help funcs + +commit 4f38c15f35b2d752282d64655f3c81e3be248254 +Author: ne-luboff +Date: Wed Jun 14 15:26:15 2017 +0300 + + Updated VoxImplant helper. Added Bind user to App functionality + +commit 65814d361414053bc4f24985126ea12441fe51ae +Author: cryoflamer +Date: Wed Jun 14 15:03:29 2017 +0300 + + added 'Client' cache table and emqttd hooks to roster.erl + +commit 7a77e91f78a70489f39d517d16880411022041b3 +Author: cryoflamer +Date: Tue Jun 13 19:42:27 2017 +0300 + + removed debug_info from rebar.config + +commit c8bb983460f280351c7a5208e644b56d1fe05b4b +Author: cryoflamer +Date: Tue Jun 13 19:33:59 2017 +0300 + + updated docs and added resend_sms + +commit 28293b1b8395966ba4341e9d5b4fd697a5cc0031 +Author: ne-luboff +Date: Tue Jun 13 19:31:55 2017 +0300 + + Added Create VoxImplant User helper. TODO - add test + +commit 3e4fdcdf6c6d076ad68326af4855c4d4fdd63f3d +Author: qomputer +Date: Tue Jun 13 19:06:54 2017 +0300 + + Add test-function create_user and fix del_user + +commit c57eeb803c49816871be377d9f52bee74f296001 +Author: qomputer +Date: Tue Jun 13 13:32:03 2017 +0300 + + Fix del_user + +commit d3ed8226d3a01d50c41bfeba90b35107274f7974 +Author: qomputer +Date: Tue Jun 13 13:20:49 2017 +0300 + + Update ROSTER.md + +commit c19fd40ed28e4c627a038d6a738e933e72fe9741 +Author: cryoflamer +Date: Tue Jun 13 12:28:52 2017 +0300 + + update AUTH.md + +commit eb92ea2b2025396186c29a34a1531e3323914c1c +Author: cryoflamer +Date: Tue Jun 13 12:15:10 2017 +0300 + + update AUTH.md + +commit 5bffc8b4b487d0b06d2572dd8d5cc84f96793500 +Author: cryoflamer +Date: Tue Jun 13 12:14:49 2017 +0300 + + added add_user fun to auth + +commit 7cf4efd3732fa0c4760be0715b509523dd8c6ca3 +Author: qomputer +Date: Mon Jun 12 19:14:36 2017 +0300 + + Update handler for profile + +commit 97567f0bdb497c0c0eb76f31c7ec58fd753b4c99 +Author: cryoflamer +Date: Mon Jun 12 19:30:21 2017 +0300 + + added unifuncs for testing + +commit 26f77c6723ab7b1d7b21786e45e3beeafaefdef5 +Author: cryoflamer +Date: Mon Jun 12 19:07:07 2017 +0300 + + added start_client without gen_server + +commit 6a39b523e371f2bf40a6a525a473707b5e1d1e15 +Author: cryoflamer +Date: Mon Jun 12 19:06:35 2017 +0300 + + updated auth + +commit 112eec766f05a280fa1fa3db032bb0194fdafaeb +Author: cryoflamer +Date: Mon Jun 12 18:43:02 2017 +0300 + + added auth_positive and fixed bugs + +commit e5a333f24634b54ceebdb6c3ebe8db60b7c6a62a +Author: cryoflamer +Date: Mon Jun 12 16:38:15 2017 +0300 + + added delete_user to doc + +commit 633f0c48b4df1f923556e4dbd99d10c850f018b1 +Author: cryoflamer +Date: Mon Jun 12 16:07:19 2017 +0300 + + added delete_user from client. Only for development!!! + +commit 997191959cc4b10c882de33c1d40ae786388529f +Author: cryoflamer +Date: Mon Jun 12 15:02:06 2017 +0300 + + fixed send_sms + +commit 6b680ca2546daa02cf5134789a41f6104ebf849b +Author: cryoflamer +Date: Mon Jun 12 15:01:32 2017 +0300 + + added async send fun to send_sms + +commit 3815fb49922c03c5e04627c78b2d09aa28b36fd9 +Author: qomputer +Date: Mon Jun 12 14:21:23 2017 +0300 + + Update roster:add_user + +commit 5b6f3308aed8aba03efdd7fd871232d69f2a4d24 +Author: ne-luboff +Date: Mon Jun 12 14:18:30 2017 +0300 + + Added async TeleSign API call + +commit b126d33b53259a4973350d34ffeba8b52282cc29 +Author: cryoflamer +Date: Mon Jun 12 02:18:32 2017 +0300 + + updated sms_send + +commit b11c6fd1422fdc9911b5512a566be0169cd3c47d +Author: qomputer +Date: Mon Jun 12 00:40:00 2017 +0300 + + Add function add_user and fix roster_proto + +commit f6d658dc213b971207479b9cd5c958b5b594ca74 +Author: cryoflamer +Date: Sun Jun 11 21:13:48 2017 +0300 + + tuning for roster + +commit 9934138afb2f8c17b061f6075ade343c552c5dc7 +Author: cryoflamer +Date: Sun Jun 11 19:24:30 2017 +0300 + + fixed auth bugs + +commit d77f81a6dde7516091c6815792a35bb40fac5e11 +Author: cryoflamer +Date: Sun Jun 11 13:10:49 2017 +0300 + + updated auth and fixed some warnings + +commit d04667a72ea1b4742e74bc630dfdf51dc7e08105 +Author: cryoflamer +Date: Sun Jun 11 02:02:38 2017 +0300 + + fix auth bugs + +commit 3a0f88fb94fcff62e3b263312baed578f7282712 +Author: cryoflamer +Date: Sat Jun 10 20:50:02 2017 +0300 + + signup refactoring + +commit 38572bcba011ed8ac0017d43c8937af8eb8cc8a6 +Author: cryoflamer +Date: Fri Jun 9 19:52:18 2017 +0300 + + updated sms verify and auth + +commit 46be951f32625944135597dc639a3f57a84d3bb3 +Merge: fc6c78e 9253e22 +Author: qomputer +Date: Fri Jun 9 19:42:30 2017 +0300 + + Merge branch 'master' of ssh://github.com/NYNJA-MC/server + +commit fc6c78ed894ef2b76106d1d14443774d8ba47e22 +Author: Namdak Tonpa +Date: Fri Jun 9 19:20:57 2017 +0300 + + Create README.md + +commit f8b88941d16a1f9033c810fd7bf1841895158bb1 +Author: qomputer +Date: Fri Jun 9 19:38:41 2017 +0300 + + Update roster.hrl and some handlers + +commit 9253e22d6068d1852817140204f3f8a862aca6b8 +Author: Namdak Tonpa +Date: Fri Jun 9 19:20:57 2017 +0300 + + Create README.md + +commit 9734b22a68f9b9439a95379e76196413dbf70a05 +Author: qomputer +Date: Fri Jun 9 18:06:06 2017 +0300 + + Update roster_proto with Roster etc + +commit 6132fb0a42b99023e2023931261b4c77942ebc35 +Merge: 5c2e71d 81c1a7d +Author: Namdak Tonpa +Date: Fri Jun 9 18:36:46 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 5c2e71db34449176cc88f65d1763d53713f76690 +Author: Namdak Tonpa +Date: Fri Jun 9 18:36:35 2017 +0300 + + model + +commit 81c1a7dc997928e4188092b7aa46739f35f828a5 +Author: Namdak Tonpa +Date: Fri Jun 9 18:15:05 2017 +0300 + + Create PRESENCE.md + +commit 661d014da1b807d088e2e8f5bf844c0c611889af +Author: cryoflamer +Date: Fri Jun 9 18:13:26 2017 +0300 + + handled "invalid Token" in auth + +commit a8f57ab9ceb8f4d04c5ab8e8d94e6e3dea01a773 +Author: Namdak Tonpa +Date: Fri Jun 9 18:13:22 2017 +0300 + + Create ROSTER.md + +commit b259c3804ee17da6d6b775521032bc18499a5f85 +Author: Namdak Tonpa +Date: Fri Jun 9 18:12:40 2017 +0300 + + Create ROSTER.md + +commit 3b4863fe8497e6530fcbae945bd619243720deaa +Author: Namdak Tonpa +Date: Fri Jun 9 18:09:27 2017 +0300 + + Create ROSTER.md + +commit 4f2bf83e934d0ab0929bb93873c938d1ed2bd081 +Author: Namdak Tonpa +Date: Fri Jun 9 18:05:17 2017 +0300 + + Create PRIVATE.md + +commit 829927350b38c6bf7f02f420173e06e5a1326569 +Author: Namdak Tonpa +Date: Fri Jun 9 18:03:53 2017 +0300 + + Create PUBLIC.md + +commit 46b7f76252c9a1bc56e46c99c4c87b5f10593e4b +Author: Namdak Tonpa +Date: Fri Jun 9 17:39:43 2017 +0300 + + Create README.md + +commit 452a2e0656fbfd70fe5327122e3a656e76fe3fd5 +Author: Namdak Tonpa +Date: Fri Jun 9 17:18:44 2017 +0300 + + Create SPEC.md + +commit 749d98c43e7cbeb6bd2805975ae11cdc5539da34 +Author: Namdak Tonpa +Date: Fri Jun 9 17:11:28 2017 +0300 + + Create SPEC.md + +commit 5cfdc783ab31f4f7e248380fbdb0de11e6af7409 +Author: Namdak Tonpa +Date: Fri Jun 9 16:50:38 2017 +0300 + + Create ROSTER.md + +commit ae93038a7514bed3bab95b2437f85d256fce897f +Merge: d89b8a5 0b34b9f +Author: Namdak Tonpa +Date: Fri Jun 9 16:46:26 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit d89b8a54db93d4479d1ca6ddcfff4fe362bcddcf +Author: Namdak Tonpa +Date: Fri Jun 9 16:46:22 2017 +0300 + + person + +commit 0b34b9f6634c78863753c5afc5999a4098f76c57 +Author: Namdak Tonpa +Date: Fri Jun 9 16:20:56 2017 +0300 + + Create ROSTER.md + +commit efb6891c341b62ec6d3438d5da80b26361b67d99 +Author: Namdak Tonpa +Date: Fri Jun 9 16:17:33 2017 +0300 + + Create PUBLIC.md + +commit 9c711903444f5a3dce6aa32636cf41c73568cb88 +Author: Namdak Tonpa +Date: Fri Jun 9 16:16:07 2017 +0300 + + Create PRIVATE.md + +commit de8026c623fd66f09d33f13537196316e9228b02 +Author: cryoflamer +Date: Fri Jun 9 15:24:51 2017 +0300 + + commented create #msg table + +commit 184d6afe50424c785ae6b3dfe0f34a22ff23e6e1 +Author: Namdak Tonpa +Date: Fri Jun 9 14:47:20 2017 +0300 + + doc + +commit 6477455a50379c4a5cb0f464a6bceef83e28af79 +Merge: 363ff47 8a1a025 +Author: Namdak Tonpa +Date: Fri Jun 9 14:44:37 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 363ff47ca436a13b3b922e10570e01913b606788 +Author: Namdak Tonpa +Date: Fri Jun 9 14:44:28 2017 +0300 + + approve / revoke + +commit 8a1a0250518d70bac0d3be45a807cb220ae311ed +Author: ne-luboff +Date: Fri Jun 9 14:37:20 2017 +0300 + + Added telesign api helper (for sms sending) + +commit d4c3e0e15aa9e82ce0edf5673310d3e6c1e7f183 +Author: Namdak Tonpa +Date: Fri Jun 9 14:31:50 2017 +0300 + + Create SPEC.md + +commit e34193e7e0d134aaedd0d3c8b32573d2f6d25eae +Author: Namdak Tonpa +Date: Fri Jun 9 14:28:41 2017 +0300 + + fox + +commit 3d25b9ed7f68dadf8a205c51db882d90f8947485 +Author: Namdak Tonpa +Date: Fri Jun 9 14:23:40 2017 +0300 + + doc + +commit a15fb15599eebbaa8a5cd79665f72ca169d26538 +Author: Namdak Tonpa +Date: Fri Jun 9 14:22:21 2017 +0300 + + doc + +commit e3d402497086553ee837fb8d20f3beaf911eba02 +Author: Namdak Tonpa +Date: Fri Jun 9 14:09:37 2017 +0300 + + doc + +commit 048691681430da8840e669f5181034920623d3f0 +Author: Namdak Tonpa +Date: Fri Jun 9 14:09:11 2017 +0300 + + presence + +commit 79d7732e9d475da13b9446ace853cbb14b7cce20 +Author: Namdak Tonpa +Date: Fri Jun 9 14:03:37 2017 +0300 + + doc + +commit 38d2951f1e27079dde1e208f8af0d09c28134096 +Author: Namdak Tonpa +Date: Fri Jun 9 13:58:16 2017 +0300 + + doc + +commit b735bbbf26fa66d4842b44af81a5cfc690c6008d +Author: Namdak Tonpa +Date: Fri Jun 9 13:52:45 2017 +0300 + + Create PRIVATE.md + +commit 7f7692cff4436ca2a730627e72a7e4fdde937a4b +Author: Namdak Tonpa +Date: Fri Jun 9 13:52:00 2017 +0300 + + Create PUBLIC.md + +commit 0ab30757a9b3fcd2a7e26a0bc3dc13d5f599e522 +Author: Namdak Tonpa +Date: Fri Jun 9 13:21:12 2017 +0300 + + Create PUBLIC.md + +commit ce5bf6de16515463ba625d61f9c6b374afe22a04 +Author: Namdak Tonpa +Date: Fri Jun 9 13:00:56 2017 +0300 + + private and public messaging + +commit 3f6bbab0c6a0831a31545f2e7583c9f337910415 +Author: Namdak Tonpa +Date: Fri Jun 9 13:00:23 2017 +0300 + + private and public messaging + +commit 555b7516dc0fa55623eb90212bac431a9054a6a2 +Author: Namdak Tonpa +Date: Fri Jun 9 12:41:26 2017 +0300 + + Create INIT.md + +commit 346979a01a597256c8273522d76d67807a510c2e +Author: Namdak Tonpa +Date: Fri Jun 9 12:41:08 2017 +0300 + + Create FTP.md + +commit d164253d07c6290201c51143747116c6aed019d1 +Author: Namdak Tonpa +Date: Fri Jun 9 12:40:52 2017 +0300 + + Create AUTH.md + +commit f67b6890340e1f47c168a0588b6a5b2f2972e0e8 +Author: Namdak Tonpa +Date: Fri Jun 9 12:36:52 2017 +0300 + + doc + +commit b3a8126411a24c1b9b1d4af84a9557149bd74f10 +Author: Namdak Tonpa +Date: Fri Jun 9 12:36:34 2017 +0300 + + doc + +commit 5396ffd60c8c0aa4166b799410995475ceea5c1d +Author: Namdak Tonpa +Date: Fri Jun 9 12:35:45 2017 +0300 + + doc + +commit 1cbfb1c645b93e65d1672ab8324533fb3809b07d +Author: cryoflamer +Date: Fri Jun 9 00:18:35 2017 +0300 + + updated authenticate and test + +commit 349275713433f37700cc49795837961745542072 +Author: qomputer +Date: Fri Jun 9 00:13:09 2017 +0300 + + Add handler GetProfile + +commit d0f4f494fc40ce428f8d3f017a73a84abe25cb67 +Author: cryoflamer +Date: Thu Jun 8 22:19:42 2017 +0300 + + fixed Auth and sms verify + +commit b77005ef524d6e1f52203ec1002ff87b268766c7 +Author: qomputer +Date: Thu Jun 8 20:01:54 2017 +0300 + + Add handlers for requests + +commit 02d6a2c9cdf5b90bb45d1293858c00785ce695b7 +Author: cryoflamer +Date: Thu Jun 8 19:54:35 2017 +0300 + + added attempts to 'Auth' and auth test + +commit 7f1b6a1b87f085dcaac85047a60b6d301122cdc4 +Author: qomputer +Date: Thu Jun 8 18:21:03 2017 +0300 + + Update get_something + +commit ca8f9fcfcca070e514f8c0f7a6bee06f9717788b +Author: cryoflamer +Date: Thu Jun 8 18:10:25 2017 +0300 + + added sms_code field + +commit fd3d8916c6ea619857abf990fb2513662a1e2594 +Merge: ca4b784 59c7918 +Author: Namdak Tonpa +Date: Thu Jun 8 15:26:17 2017 +0300 + + maxim merge + +commit ca4b784eaeacd8aa42db40526ba16f70a96a694d +Author: Namdak Tonpa +Date: Thu Jun 8 15:25:35 2017 +0300 + + maxpacket, enable FILE proto + +commit 59c7918eb1bf817baa0e5142ce35bd8f43d990ad +Author: qomputer +Date: Thu Jun 8 15:06:09 2017 +0300 + + Fix get_something + +commit b85da50f21363b31c29b0c90d814519673bc545c +Author: cryoflamer +Date: Thu Jun 8 14:35:21 2017 +0300 + + updated info('Auth', ...) + +commit e697dfdb9636b8df81533d95dd665f0561fbb18e +Author: cryoflamer +Date: Thu Jun 8 14:34:37 2017 +0300 + + added user_id field to 'Auth' table + +commit 3b787135300d03e60af9f0f15d9d6b76ba571ba8 +Author: qomputer +Date: Thu Jun 8 00:02:30 2017 +0300 + + Add test and sample replay for any endpoints + +commit 0c6e1d133917d5e90bbdbcab6cca29187b896a5b +Author: cryoflamer +Date: Wed Jun 7 19:13:40 2017 +0300 + + updated info('Auth', ... + +commit 99595e578a3e499b9558d273463fa25f233c0dc9 +Author: cryoflamer +Date: Wed Jun 7 19:12:38 2017 +0300 + + added some new fields and indexes to roster tables + +commit a3dfebad02f849d9c215c983bd51b95f117ee884 +Author: cryoflamer +Date: Wed Jun 7 12:34:30 2017 +0300 + + added vnode_counter to Auth reply + +commit bb311168d3406132b2fd5f2e92bef4b702c8f820 +Author: cryoflamer +Date: Tue Jun 6 19:20:04 2017 +0300 + + added prototype auth + +commit 9d16c96672217908b12878556ba46b765a61feb6 +Author: Namdak Tonpa +Date: Tue Jun 6 18:40:16 2017 +0300 + + cleanup plugins + +commit fa4813d45e0f682be6810ff3824c55533ded4925 +Merge: 797acc6 246f29e +Author: 5HT +Date: Sun Jun 4 17:41:03 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 797acc6bccad3209e801c26ac14c42afc1794c55 +Author: 5HT +Date: Sun Jun 4 17:40:54 2017 +0300 + + disable FTP for now + +commit 246f29ee746fde6be697703b416a3db81b8b1e2e +Author: qomputer +Date: Fri Jun 2 01:20:47 2017 +0300 + + Fix function web_chat + +commit a0beb23d4ee765eee5cd464906d41026d9d4bb6c +Author: qomputer +Date: Thu Jun 1 19:32:00 2017 +0300 + + Call publish_init before web_chat + +commit df8e6d00b2f7144c9c6eb337654df22d755bfa88 +Author: qomputer +Date: Thu Jun 1 17:37:31 2017 +0300 + + Update roster_test + +commit ba6329c77daed23413ae62a9f19e7616f8ee4fff +Author: qomputer +Date: Thu Jun 1 15:33:10 2017 +0300 + + Add web chat test + +commit 19c2dbb5252921876393e28ae06174133304c699 +Author: cryoflamer +Date: Thu Jun 1 16:27:15 2017 +0300 + + added test_sup supervisor + +commit 2b8535baae3bf58576880e4581ba709872161460 +Author: cryoflamer +Date: Thu Jun 1 15:01:28 2017 +0300 + + added stored token to publish_init + +commit eac5f0d802dc00abfbc98c0df2fe1ca1ba2bca10 +Author: cryoflamer +Date: Thu Jun 1 13:59:37 2017 +0300 + + updated roster_test + +commit 01d227ea7b878af24f4a8980136cea2d05702976 +Author: Namdak Tonpa +Date: Wed May 31 23:03:57 2017 +0300 + + tuning + +commit 420a2edcc2ea160df4bc4efac52cdcd59daf1df5 +Author: qomputer +Date: Wed May 31 14:30:40 2017 +0300 + + Update test webchat + +commit a6302b3d1249e248154af37fa4f47bb64f5e1509 +Author: qomputer +Date: Wed May 31 01:24:43 2017 +0300 + + Update for test web chat + +commit a9de6f8e1cf3bf6eab3b9d71c14463d2ea916daf +Author: cryoflamer +Date: Tue May 30 16:33:06 2017 +0300 + + added Token to State context + +commit 6f41134d39f6d2269de20f65cea19cced29e1104 +Author: cryoflamer +Date: Tue May 30 14:55:48 2017 +0300 + + updated publish_init + +commit 63a35199955de0d12af3397d02a1bdeb9c2dc763 +Author: cryoflamer +Date: Tue May 30 13:41:10 2017 +0300 + + added sync start() function + +commit bf47a087d325a5b2ae9eee93cefac43faa36817a +Author: qomputer +Date: Tue May 30 13:35:50 2017 +0300 + + Add test for web chat + +commit 2e5187723839ca271c70ec4f184ed37ae8010be0 +Author: cryoflamer +Date: Tue May 30 13:26:40 2017 +0300 + + added receive for publish_init + +commit eb2292950e3a18060dc5b92b848d265a754a2ddd +Author: cryoflamer +Date: Mon May 29 22:22:11 2017 +0300 + + fixed subscribe and publish in roster_test + +commit a2926c4d244aefae4f9ef64a9be713b53459d381 +Author: cryoflamer +Date: Mon May 29 21:48:33 2017 +0300 + + added random number for events topic + +commit ebf029f5795c501fdff6d1497ab650b1b5a9d965 +Author: cryoflamer +Date: Mon May 29 19:14:35 2017 +0300 + + added publish_init function (sends {init,<<>>}) + +commit f59e9f00b9364427e83953d8cb4c52ef1a31491c +Author: qomputer +Date: Mon May 29 19:01:30 2017 +0300 + + Add unsubscribe + +commit 7d041d2b68f694a8811d874c074be38662f8e54f +Author: 5HT +Date: Mon May 29 18:24:51 2017 +0300 + + production configuration + +commit aca8b96cae5b2910ce430f3c608ea49d5043ccc9 +Merge: 2ba7674 2b55167 +Author: 5HT +Date: Mon May 29 18:07:52 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 2ba7674aeba5f78d1ad3e00358f5f2856b17b05a +Author: 5HT +Date: Mon May 29 18:07:44 2017 +0300 + + fix launch on Linux + +commit 2b55167b9a7785b13c932b629f1f90e880bc3406 +Author: qomputer +Date: Mon May 29 18:04:48 2017 +0300 + + Add handler for call(roster_test,{subscribe,<>}) + +commit 4110952cf758915dcd0d89e87ec1a46821bb69cf +Merge: a0c17ce 08a81da +Author: Namdak Tonpa +Date: Mon May 29 17:54:40 2017 +0300 + + Merge branch 'master' of github.com:nynja-mc/server + +commit a0c17cebe1db014676bfaa288fc7e46ebf611ac6 +Author: Namdak Tonpa +Date: Mon May 29 17:54:32 2017 +0300 + + EMQ 2.1.2 + +commit 08a81da75b4c9d26dec0f85a9adddab2f1363631 +Author: cryoflamer +Date: Mon May 29 17:25:00 2017 +0300 + + added Init connect for test_roster + +commit e3e36fed29091b6defb0577fabeb4cc4179337ce +Author: cryoflamer +Date: Mon May 29 15:26:48 2017 +0300 + + added roster_test mqttc gen_server + +commit 2132489991b5fe2d9fde06640b64fb4620526da1 +Merge: bdc8580 1dc9726 +Author: Namdak Tonpa +Date: Mon May 29 01:23:53 2017 +0300 + + Merge branch 'master' of github.com:nynja-mc/server + +commit bdc8580bbece0b67a6e8f666173f504907a7751f +Author: Namdak Tonpa +Date: Mon May 29 01:23:45 2017 +0300 + + fmt + +commit 1dc97264cb80fb2db1fdc23f2136b9a7226d97e8 +Author: Namdak Tonpa +Date: Mon May 29 01:16:48 2017 +0300 + + Update + +commit 30da5e302e7a21874c8d067f59e10afeae2d770d +Author: Namdak Tonpa +Date: Mon May 29 01:16:33 2017 +0300 + + Update SPEC-1.0.md + +commit 7458ba004f18a3ec6d8e7e01eb9f856bf4bd32ff +Author: Namdak Tonpa +Date: Mon May 29 01:00:26 2017 +0300 + + Update SPEC-1.0.md + +commit 247fee337f023370930c1b052114d5f6d5875a1b +Author: Namdak Tonpa +Date: Mon May 29 00:58:08 2017 +0300 + + Update SPEC-1.0.md + +commit 75b2edad86dc5abb12a50c000c2fa952efc8572e +Author: Namdak Tonpa +Date: Mon May 29 00:57:39 2017 +0300 + + Update SPEC-1.0.md + +commit 9f882e436b0926451569ad9978ea5e2899246d2f +Author: Namdak Tonpa +Date: Sun May 28 11:01:07 2017 +0300 + + message ordering + +commit 46dc58e23d2f21e8f491d67465a7c5c155c0af74 +Author: Namdak Tonpa +Date: Sun May 28 02:29:16 2017 +0300 + + nodes + +commit 0ac56cc3f4b4cba316603602a54b827a09f5775c +Author: Namdak Tonpa +Date: Sat May 27 21:27:56 2017 +0300 + + getting more robust + +commit b80eb1f0fe40bb91e7576a11e6b84606930d6645 +Author: Namdak Tonpa +Date: Sat May 27 12:26:40 2017 +0300 + + cleanup logs + +commit 34b739148fadce2954ffffbb72d9cfd4a4483e89 +Author: Namdak Tonpa +Date: Sat May 27 11:16:27 2017 +0300 + + remove modules + +commit 28e326c196bef5bd0e189f97a463b36321080f26 +Author: Namdak Tonpa +Date: Fri May 26 22:30:27 2017 +0300 + + svg title + +commit ed5ee58c5709954166248e0fb755565b1af7ace4 +Author: Namdak Tonpa +Date: Fri May 26 22:28:35 2017 +0300 + + cleanup + +commit e3de31c3cb743b5cd8e30239d695e4d8c43cbd03 +Author: Namdak Tonpa +Date: Fri May 26 21:00:08 2017 +0300 + + full functional sample + +commit 8e726eb9d9e6eaf4a7a11d4f02cc17064d000ead +Author: Namdak Tonpa +Date: Fri May 26 20:16:55 2017 +0300 + + broadcast message failed + +commit a4c94fb467456189d3b6dbcd4bd849635e8c453d +Author: Namdak Tonpa +Date: Thu May 25 20:10:03 2017 +0300 + + emqttc for testing + +commit c08942620c88faa09ec93767bf4e5c50066650a8 +Merge: 80bb14d c0416cc +Author: Namdak Tonpa +Date: Thu May 25 19:29:04 2017 +0300 + + Merge pull request #22 from NYNJA-MC/issue-13 + + Issue 13 + +commit c0416ccc0ab147095a85b8459d1e50d68d05dba1 +Author: ne-luboff +Date: Thu May 25 18:46:34 2017 +0300 + + Added protocol to token generation (issue #13) + +commit a30fc4313cf3c44449701d053fd051822840f76f +Author: ne-luboff +Date: Thu May 25 17:34:00 2017 +0300 + + started auth protocol implementation (#13) + +commit c1fea716f97689955872a1051bb7e6ce354cf305 +Merge: aa76aea 80bb14d +Author: ne-luboff +Date: Thu May 25 12:52:58 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into issue-13 + +commit aa76aea3414b630044a3f63e9dc62cec22514616 +Author: ne-luboff +Date: Thu May 25 12:41:11 2017 +0300 + + deleted unnecessary files and code (issue #13). + +commit 80bb14dc8415346d6c5b34c0febb446323d0939e +Author: Namdak Tonpa +Date: Wed May 24 17:18:04 2017 +0300 + + Update SPEC-1.0.md + +commit dbe1a36ca94dff41f9735f123599f0d5bc69ebca +Author: ne-luboff +Date: Wed May 24 11:51:03 2017 +0300 + + Started auth token implementation (Issue #13) + +commit 7467020fc34c26d5b9e083abb1fdcef5f7539017 +Author: Namdak Tonpa +Date: Tue May 23 15:18:13 2017 +0300 + + Update SPEC-1.0.md + +commit 792e2f409abbf2f59b75d8592d4d497b1073dc41 +Author: Namdak Tonpa +Date: Fri May 19 11:55:58 2017 +0300 + + Update SPEC-1.0.md + +commit 9bec47af7b30fbe9a2185016077e25fff486050f +Merge: b7e6763 c8b451d +Author: Namdak Tonpa +Date: Fri May 19 11:34:14 2017 +0300 + + Merge branch 'master' of github.com:nynja-mc/server + +commit b7e67633b62251f51395d455def1b5cc45064ed5 +Author: Namdak Tonpa +Date: Fri May 19 11:34:03 2017 +0300 + + readme #13 and #15 + +commit c8b451d674cf8699608bcea18093dab3a0698a9d +Author: Dmitriy Dovgiy +Date: Thu May 18 19:30:53 2017 +0300 + + removed .applist from git and added in gitignore + +commit 93c420bd03d00a47a6f094878df4f71edc7f16e3 +Merge: 9853374 cb8b406 +Author: Dmitriy Dovgiy +Date: Thu May 18 19:29:08 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 9853374977b4e6a6f09aef9516483c02955f6878 +Author: Dmitriy Dovgiy +Date: Thu May 18 19:28:54 2017 +0300 + + created spa and configed it like deps + +commit cb8b4063cfac6dc4248b29f9cbf7720ed65ff3b8 +Author: Namdak Tonpa +Date: Thu May 18 16:35:38 2017 +0300 + + fix + +commit 1822b662314a97855f579b41e950e943903c454d +Author: Namdak Tonpa +Date: Thu May 18 14:26:42 2017 +0300 + + roster + +commit acf3a0d8f8460d97c25c71c9e9185a1a0756514b +Author: Namdak Tonpa +Date: Thu May 18 10:51:19 2017 +0300 + + btstrp + +commit 6c9aae88df101d3f6bfd511a1f101758abf1fdd5 +Merge: 2c0d16c d452ec4 +Author: Namdak Tonpa +Date: Thu May 18 09:51:09 2017 +0300 + + Merge branch 'master' of github.com:nynja-mc/server + +commit 2c0d16c79d8d56026eb1715b94c718c4cec1a92a +Author: Namdak Tonpa +Date: Thu May 18 09:50:58 2017 +0300 + + move most static to CDN + +commit d452ec4104c8b61d27ecb6fdb19e0d2569750563 +Author: Namdak Tonpa +Date: Thu May 18 09:42:53 2017 +0300 + + Delete mqttws31.js + +commit 78f9dc728eaf0c9e5ee384a746a440c47e03bfcf +Author: Namdak Tonpa +Date: Wed May 17 15:40:49 2017 +0300 + + initial database + +commit 31902c51e9c50986028bc69e7d16878eebd4532c +Author: Namdak Tonpa +Date: Tue May 16 17:27:24 2017 +0300 + + host + +commit 4fc4a0b2f19b3f2d52705c7da121324ab646f84c +Merge: 6ad290b 6969a4c +Author: Namdak Tonpa +Date: Tue May 16 17:22:17 2017 +0300 + + Merge branch 'master' of github.com:nynja-mc/server + +commit 6ad290b9da207bd2f0862a41e428cd11c7abc8af +Author: Namdak Tonpa +Date: Tue May 16 17:22:09 2017 +0300 + + CDN MQTT + +commit 6969a4c2af5fff5e84962b0eeff6e02fd53e943d +Merge: 88779bb 5431809 +Author: Dmitriy Dovgiy +Date: Tue May 16 13:29:10 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit 543180937d164d49c518ffbcccd093be8b85f669 +Author: Namdak Tonpa +Date: Tue May 16 13:24:46 2017 +0300 + + remove syslog finally + +commit 88779bbde1c1e31c6ebce2fcb301b87c562f26be +Author: Dmitriy Dovgiy +Date: Tue May 16 13:24:02 2017 +0300 + + added .gitignore + +commit b4c7fa40e587a368c4e2a22c962023dcd0c3e9b0 +Merge: d9e1a81 168a8d0 +Author: Namdak Tonpa +Date: Tue May 16 13:18:28 2017 +0300 + + Merge branch 'master' of github.com:nynja-mc/server + +commit d9e1a81275bbfebb982c77eed14951619975eeba +Author: Namdak Tonpa +Date: Tue May 16 13:18:19 2017 +0300 + + remove syslog + +commit 168a8d05c26deb2db8fa2751ffd40a4df722d982 +Author: Namdak Tonpa +Date: Tue May 16 12:55:05 2017 +0300 + + otp.mk + +commit a1048ff6b2bceedf6f0803ecd7df4447f5e4c0cd +Merge: b5e585e 635d728 +Author: Namdak Tonpa +Date: Tue May 16 11:32:43 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit b5e585eadd132db6cd306c40c540d10583e66281 +Author: Namdak Tonpa +Date: Mon May 15 09:02:13 2017 +0300 + + make plugins cd /Users/maxim/depot/voxoz/n2o + +commit 635d7284f141a3035564ee14db62317a1832cbe7 +Author: Namdak Tonpa +Date: Sat May 13 05:27:30 2017 +0300 + + Update SPEC-1.0.md + +commit fa7bae11d4c83056c2b6079e07c8e040f5aefce0 +Author: Namdak Tonpa +Date: Sat May 13 03:17:10 2017 +0300 + + Update SPEC-1.0.md + +commit 6a79f2a42fadf10f806a73dc306952bc418d2584 +Author: Namdak Tonpa +Date: Sat May 13 03:15:23 2017 +0300 + + Update SPEC-1.0.md + +commit 86cdec56b2f42b4298d2b43f7e1ea59abc2657a3 +Author: Namdak Tonpa +Date: Sat May 13 03:11:31 2017 +0300 + + Update SPEC-1.0.md + +commit c55d19a6e7ce156425a87df8eb9ad8e0c53426f3 +Author: Namdak Tonpa +Date: Sat May 13 03:09:18 2017 +0300 + + Update SPEC-1.0.md + +commit 16e66f4dbe329d44ff54e91e487f323f3bb9aa62 +Author: Namdak Tonpa +Date: Sat May 13 03:07:35 2017 +0300 + + Update SPEC-1.0.md + +commit 4139b4db8c54a8432ae5449e718a74867c6568d5 +Author: Namdak Tonpa +Date: Sat May 13 03:03:43 2017 +0300 + + Rename SPEC-1.0.txt to SPEC-1.0.md + +commit f0e56f3fcce0a4b5e28e84e73218bc84a8d9fb66 +Author: Namdak Tonpa +Date: Sat May 13 03:03:11 2017 +0300 + + protocol + +commit e6452079796c65e1566dfba784f6ad9402e98b5e +Author: Namdak Tonpa +Date: Thu May 4 17:32:43 2017 +0300 + + hex.pm + +commit ad927335e8ed6b2cbee0ed2c4985f2d1cc39d381 +Author: Namdak Tonpa +Date: Thu May 4 15:23:53 2017 +0300 + + remove lager + +commit d869d8af161a903d4e6f6f1ca390ffbb2c2384cc +Author: Namdak Tonpa +Date: Thu May 4 15:16:37 2017 +0300 + + review + +commit 8a107281485044fde9c391edda3c79f8c3600f6a +Author: Namdak Tonpa +Date: Tue May 2 17:12:30 2017 +0300 + + syslog + +commit 32499315ddcc562855f75c226cd11435f83d83b7 +Author: Namdak Tonpa +Date: Tue May 2 17:00:21 2017 +0300 + + syslog + +commit 9f2ebd05d9fec5de1176cce6e29277de175a280c +Author: Namdak Tonpa +Date: Tue May 2 03:05:36 2017 +0300 + + readme + +commit cb771268ceb03781289222d5a86fff277a819125 +Author: Namdak Tonpa +Date: Tue May 2 03:04:16 2017 +0300 + + readme + +commit 1de1174d9b4d1579a98000cf4f7119858270d796 +Author: Namdak Tonpa +Date: Tue May 2 02:17:15 2017 +0300 + + supress logs + +commit bd556a8bff90242f09a0c6fa1de7bd689511c05e +Author: Namdak Tonpa +Date: Tue May 2 01:07:06 2017 +0300 + + fix + +commit e47c2d4ac848391f2e534c3e674b76930340d6fa +Author: Namdak Tonpa +Date: Tue May 2 01:04:38 2017 +0300 + + cong + +commit 22b11e309abda20ac73b9f90fbf18d1ecffe7c06 +Author: Namdak Tonpa +Date: Tue May 2 00:56:47 2017 +0300 + + nitro + +commit 0bbeb4e80a2c09454ec13d52d25617e6457fd19f +Author: Namdak Tonpa +Date: Tue May 2 00:54:23 2017 +0300 + + n2o 4.5 mqtt + +commit 982634b7a5d2182c71a812a4628bb36bd63669dd +Merge: f531a13 2e3e251 +Author: Namdak Tonpa +Date: Thu Apr 27 05:04:20 2017 +0300 + + Merge branch 'master' of https://github.com/voxoz/mqtt + +commit f531a13db91bd1439462d7febc906c52a05adf38 +Author: Namdak Tonpa +Date: Thu Apr 27 05:04:15 2017 +0300 + + proto + +commit 2e3e251b6af5cc954bba4e350d5c89828e9cc3b3 +Author: Namdak Tonpa +Date: Wed Apr 26 23:23:46 2017 +0300 + + Update README.md + +commit 1432abede42610af210b500190c29d3d398e1f31 +Author: Namdak Tonpa +Date: Wed Apr 26 22:14:03 2017 +0300 + + mqtt + +commit 9b3493484e8bf247caf562e832da7e58652fcd3f +Author: Namdak Tonpa +Date: Wed Apr 26 22:12:48 2017 +0300 + + sample app title + +commit 78c605c71f01ebb7dd9f183ad3ea0ddb507810fb +Author: Namdak Tonpa +Date: Wed Apr 26 22:11:28 2017 +0300 + + synrc neo + +commit 151812b27757c72831a868ae03186af0a96ceec5 +Author: Namdak Tonpa +Date: Wed Apr 26 22:01:55 2017 +0300 + + pretty logs + +commit 72d83469ff34091a791b9fc10769a0225b7d96fe +Author: Namdak Tonpa +Date: Wed Apr 26 20:17:04 2017 +0300 + + message + +commit c95af4676c67b53a48526cfa7ff2a14a2d1228b1 +Author: Namdak Tonpa +Date: Wed Apr 26 16:14:30 2017 +0300 + + send + +commit 7aecc7262dd9c5964e07e50d4a0eec58d92997ff +Author: Namdak Tonpa +Date: Wed Apr 26 16:12:28 2017 +0300 + + new commit + +commit 37239d2796c215abef2b85f7ca61e5c6d4db476d +Author: Namdak Tonpa +Date: Wed Apr 26 07:49:03 2017 +0300 + + readme + +commit 36981badc9096babdaf8b6a0303fc9691f5c910e +Author: Namdak Tonpa +Date: Wed Apr 26 07:40:49 2017 +0300 + + readme + +commit 907ea7367d628c72350a707acde8cf17e77201d0 +Author: Namdak Tonpa +Date: Wed Apr 26 07:37:19 2017 +0300 + + readme + +commit 8e3159ae85c237316b34e7d8f6d84d0d6b21f486 +Author: Namdak Tonpa +Date: Wed Apr 26 07:25:13 2017 +0300 + + readme + +commit d6d73cda4e1c26617e0b8dca80d987307430a8f6 +Author: Namdak Tonpa +Date: Wed Apr 26 07:24:39 2017 +0300 + + readme + +commit 54756368e42209085c0579fce624a72a678f3634 +Author: Namdak Tonpa +Date: Wed Apr 26 07:16:17 2017 +0300 + + readme + +commit 1f4dae475089c2f722b36558ec6d91e853446364 +Author: Namdak Tonpa +Date: Wed Apr 26 06:39:01 2017 +0300 + + cleanup + +commit 32f3129211840fcb1a5d47bddd09b0d68414982e +Author: Namdak Tonpa +Date: Wed Apr 26 06:20:19 2017 +0300 + + cleanup + +commit dd19915a1e5ac216b86bc2d3a5fcdd9743677634 +Author: Namdak Tonpa +Date: Wed Apr 26 06:03:54 2017 +0300 + + cleanup + +commit e095862d82a30d2a4a43d53d9b3935911c72f3dc +Author: Namdak Tonpa +Date: Wed Apr 26 05:55:01 2017 +0300 + + readme + +commit 3b7fad47f9e927154d60079bfdd5156c5c7698ab +Author: Namdak Tonpa +Date: Wed Apr 26 05:27:01 2017 +0300 + + EMQ N2O + +commit cd923986fe8711e7084bf795291574dd1a2e1cc4 +Author: Namdak Tonpa +Date: Wed Apr 26 05:25:08 2017 +0300 + + cleanup N2O MQTT SPA sample + +commit 3f45334f11c1b04032fd3f234a381c6eb784c9fd +Author: Namdak Tonpa +Date: Wed Apr 26 02:42:55 2017 +0300 + + remote chat + +commit 50cb5512315d247b984c7b8416d13a9c6a68d873 +Author: Namdak Tonpa +Date: Wed Apr 26 02:16:26 2017 +0300 + + working Review sample + +commit 5b40cc7aada37e3a8226b14bed686659184bcbfe +Author: Namdak Tonpa +Date: Tue Apr 25 21:44:37 2017 +0300 + + bridge + +commit d8a3887443e39ce3bab08407f997a51fdfd89ca3 +Author: Namdak Tonpa +Date: Tue Apr 25 16:54:01 2017 +0300 + + n2o + +commit 631213486a51caaa164e1c0835641616da45a1e3 +Merge: 9b51983 b28567a +Author: Namdak Tonpa +Date: Tue Apr 25 13:13:39 2017 +0300 + + Merge branch 'master' of https://github.com/voxoz/mqtt + +commit 9b5198358c320967548c96e81cd9795287828b14 +Author: Namdak Tonpa +Date: Tue Apr 25 13:13:33 2017 +0300 + + added n2o to the project + +commit b28567abc19c9487f40d789b654d9248da07868d +Author: Namdak Tonpa +Date: Mon Apr 24 10:50:54 2017 +0300 + + Update README.md + +commit 58eeea95ed5512b4987b837cd7dd1ff1c71e04df +Author: Namdak Tonpa +Date: Mon Apr 24 10:50:37 2017 +0300 + + Update README.md + +commit fe4b64de77a59865d950c0cf2f3f2db82d72e4b5 +Author: Namdak Tonpa +Date: Thu Apr 20 22:02:43 2017 +0300 + + app.src, readme + +commit c9f8e05a2e2567f967d7d565e738bca2d4ed66f5 +Author: Namdak Tonpa +Date: Thu Apr 20 21:37:45 2017 +0300 + + apply master + +commit afcc2ca2bc7631c711b9fe400f7957ac9781f8c8 +Merge: 1292b42 a0c2662 +Author: Namdak Tonpa +Date: Thu Apr 20 21:01:13 2017 +0300 + + Merge branch 'master' of https://github.com/voxoz/mqtt + +commit 1292b4272c50e2d5e5e6d30f7c89fca62a13a433 +Author: Namdak Tonpa +Date: Thu Apr 20 20:58:33 2017 +0300 + + 1883 default port + +commit a0c266202e7f1a839e3aa0d980d678fa785d0392 +Author: Namdak Tonpa +Date: Wed Apr 19 23:09:04 2017 +0300 + + Update README.md + +commit c080e76c05e2d6be78ed495471f05b80d6eed893 +Author: Namdak Tonpa +Date: Wed Apr 19 23:08:21 2017 +0300 + + readme + +commit cc61424e4c335e8afe8fe56bc22293985e9489b8 +Author: Namdak Tonpa +Date: Wed Apr 19 23:03:23 2017 +0300 + + readme + +commit 2c2d252186d472420e8091508898f32865e1a88e +Author: Namdak Tonpa +Date: Wed Apr 19 20:01:38 2017 +0300 + + otp.mk + +commit de0690a1ada52675348d23002c10f8979ffbd334 +Author: Namdak Tonpa +Date: Wed Apr 19 18:26:34 2017 +0300 + + applist + +commit 7001615f3d84cdb641b9eaf203778bbd80f4e131 +Author: Namdak Tonpa +Date: Wed Apr 19 18:20:59 2017 +0300 + + release + +commit 32b72346a6e87a4d5962eb43685222fc75efb7af +Author: Namdak Tonpa +Date: Wed Apr 19 18:20:20 2017 +0300 + + release + +commit 28dabe982e7d570de874f43e8172d11e777ada7b +Author: Namdak Tonpa +Date: Wed Apr 19 17:38:08 2017 +0300 + + user + +commit f45bc418e45f540d27021317bb9677e728a619cf +Author: Namdak Tonpa +Date: Wed Apr 19 17:36:55 2017 +0300 + + readme + +commit 6a3e5325536971aff3a966c7d8b00e5c2462bf1d +Author: Namdak Tonpa +Date: Wed Apr 19 12:18:38 2017 +0300 + + client + +commit e3652a154fd796fbe3d92acf6cc0aa4306d40c5c +Author: Namdak Tonpa +Date: Wed Apr 19 11:53:39 2017 +0300 + + otp.mk + +commit ed94d7d3cdfed0644ad55d3f510c814161ffcd65 +Author: Namdak Tonpa +Date: Wed Apr 19 11:39:19 2017 +0300 + + emq_persistence, fix plugins + +commit 33c9a56e60c7f37dfe4df02d04a85b690b3d9e87 +Merge: 84eac76 8207cd6 +Author: Namdak Tonpa +Date: Wed Apr 19 11:01:24 2017 +0300 + + Merge branch 'master' of https://github.com/voxoz/mqtt + +commit 84eac761d98248120db064c1c432f10d384f3e39 +Author: Namdak Tonpa +Date: Wed Apr 19 11:01:18 2017 +0300 + + fix emq_modules + +commit 8207cd6ba7a723c9c1fb7a7a9ef7fdf16d614ac7 +Author: Namdak Tonpa +Date: Wed Apr 19 09:58:23 2017 +0300 + + Update README.md + +commit b50ac40a4fdc7577af1e00ce4c8c033d61231183 +Merge: 2db3645 0863233 +Author: Namdak Tonpa +Date: Tue Apr 18 21:42:54 2017 +0300 + + Merge branch 'master' of https://github.com/voxoz/mqtt + +commit 2db364579c0f5dd69094f1cbfdce8dd68171d770 +Author: Namdak Tonpa +Date: Tue Apr 18 21:42:45 2017 +0300 + + mode change + +commit 0863233481cda0dcfbf4cf79f7101cb739356266 +Author: Namdak Tonpa +Date: Tue Apr 18 21:19:56 2017 +0300 + + Update otp.mk + +commit 16376617b72e5650aea896ff0946b174af674d63 +Author: Namdak Tonpa +Date: Tue Apr 18 21:10:46 2017 +0300 + + make console, mad rep + +commit 5aa73787991ce83d501e8c15ae056ca1267d830a +Author: Namdak Tonpa +Date: Tue Apr 18 20:59:24 2017 +0300 + + remove mad + +commit 7c903bbaff56898c4ee1a5a8fe07ce24209bddd5 +Author: Namdak Tonpa +Date: Tue Apr 18 20:52:57 2017 +0300 + + make console + +commit 616c2c801de1ecf97ea40b348894c1f16c29cc52 +Merge: 8da5f49 374e4c6 +Author: Namdak Tonpa +Date: Tue Apr 18 20:18:47 2017 +0300 + + Merge branch 'master' of https://github.com/voxoz/mqtt + +commit 8da5f49a9f874a3d12aa5d93c98229a437121b1d +Author: Namdak Tonpa +Date: Tue Apr 18 20:18:41 2017 +0300 + + cleanup + +commit 374e4c688ee3cd5269d7a3ba53daaeaeab0728fe +Author: Namdak Tonpa +Date: Tue Apr 18 20:18:01 2017 +0300 + + Update README.md + +commit 079ccb2ad33b1516eb5974ef2ea8e6f59a333993 +Author: Namdak Tonpa +Date: Tue Apr 18 20:17:44 2017 +0300 + + Update README.md + +commit 3f5da7927a455cabb8ed596024a2fd4874ddeec1 +Author: Namdak Tonpa +Date: Tue Apr 18 20:14:21 2017 +0300 + + Update README.md + +commit 0bcf6b265c99704447127b22d17bdcaa13ec87d7 +Author: Namdak Tonpa +Date: Tue Apr 18 20:11:48 2017 +0300 + + Create README.md + +commit 6a609b5985dedeab443562331be75b18cc681862 +Author: Namdak Tonpa +Date: Tue Apr 18 20:08:44 2017 +0300 + + init diff --git a/rebar.config b/rebar.config index fed0547be..b02a99d89 100644 --- a/rebar.config +++ b/rebar.config @@ -12,7 +12,7 @@ {emqttd,".*", {git, "git://github.com/synrc/emqttd","0.9.4"}}, {emq_dashboard,".*", {git, "git://github.com/synrc/emq_dashboard",[]}}, {mochiweb,".*",{git,"https://github.com/emqtt/mochiweb",""}}, - {bert,".*", {git, "git://github.com/synrc/bert",[]}}, + {macbert,".*", {git, "git://github.com/synrc/macbert",[]}}, {rest,".*", {git, "git://github.com/synrc/rest",[]}}, {jsone,".*", {git, "git://github.com/sile/jsone.git",[]}}, {review,".*", {git, "git://github.com/synrc/review",[]}}, diff --git a/sys.config b/sys.config index 04d52bf6b..c5b0642ab 100644 --- a/sys.config +++ b/sys.config @@ -1,6 +1,4 @@ [ {review,[{host,"ns.synrc.com"}]}, - {bert,[{js,"deps/spa/priv/js"}, - {swift,"apps/roster/priv/macbert"}]}, {roster,[{upload,"./storage"}, {email_api,[ {from,<<"Nynja App">>}, diff --git a/tatq b/tatq new file mode 100644 index 000000000..cfd784fdb --- /dev/null +++ b/tatq @@ -0,0 +1,9038 @@ +commit 402eb0ddd9e8de04fc25d992a42d1be4c929af9c +Author: qomputer +Date: Thu Sep 7 12:10:08 2017 +0300 + + Fix on_verify + +commit 99cff8488c3d1a381592efaf030111e78b1ad65d +Author: Namdak Tonpa +Date: Thu Sep 7 05:55:54 2017 +0300 + + prettify topics API in roster.erl + +commit e26d940b40ec1dae32b8ebd13bee44dd4f54f1ca +Author: Namdak Tonpa +Date: Thu Sep 7 04:59:51 2017 +0300 + + the subscriptions are done in on_verify, on_connect is only for publish notifications + +commit 8e9c5c938a49dc67f4829d77fd903424ad3bf33c +Author: Namdak Tonpa +Date: Thu Sep 7 04:43:55 2017 +0300 + + cleanup on_connect + +commit db03edbdeb280a92fda4bb4d64e8fac75f8a59f1 +Author: Namdak Tonpa +Date: Thu Sep 7 04:30:12 2017 +0300 + + fix registration of new devices for existed frienship + +commit 698dd3288462b68362ffbc43d754855837703a79 +Merge: bc75595 2786aa1 +Author: Namdak Tonpa +Date: Thu Sep 7 04:08:14 2017 +0300 + + Merge branch 'master' of github.com:NYNJA-MC/server + +commit bc755958e6e9422594daed9d6f12f910791a3032 +Author: Namdak Tonpa +Date: Thu Sep 7 04:08:06 2017 +0300 + + remove unused funs, TODO notes + +commit 2786aa16e847dcaa70ae1c2bcd9248b19db55613 +Merge: 5ff085e af258ec +Author: ne-luboff +Date: Wed Sep 6 19:22:48 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into push_notifications + +commit af258ecfa4c68e4c33d44d9d69a354369e6c4b99 +Author: cryoflamer +Date: Wed Sep 6 19:16:14 2017 +0300 + + added test_purge + +commit 5ff085e3ee89d4c5fafe24470165120131629807 +Merge: 3c21a7a 2884fbc +Author: ne-luboff +Date: Wed Sep 6 19:06:17 2017 +0300 + + Merge branch 'master' of https://github.com/NYNJA-MC/server into push_notifications + +commit 2884fbc3b1f8a1ae02550001d558c230d0631a8b +Author: qomputer +Date: Wed Sep 6 18:10:22 2017 +0300 + + Fix purge_user + +commit 677caada96c759cad25ae657002fafcb8de78936 +Author: qomputer +Date: Wed Sep 6 16:37:54 2017 +0300 + + Clean roster_roster + +commit 72f87509f6d797e41286c18c770dfc75b0559384 +Author: cryoflamer +Date: Wed Sep 6 15:16:02 2017 +0300 + + upd test_loaded + +commit 3c21a7a65a66a834b04e2633c83719aff0b42edd +Author: ne-luboff +Date: Wed Sep 6 14:42:29 2017 +0300 + + Rename PushAllertStr with PushAllert in push message fun + +commit 8779698dd6f9d087db547e2155b463f234c7949e +Author: ne-luboff +Date: Wed Sep 6 14:40:50 2017 +0300 + + Update push log info + +commit 4110c784f47c7d22e6d8587a6bb640644ec3b12e +Author: ne-luboff +Date: Wed Sep 6 14:07:38 2017 +0300 + + Dont send push in chat with myself + +commit 5fd3cf47e77d3e4d11fc39efe5c00da243f8da74 +Author: ne-luboff +Date: Wed Sep 6 13:34:58 2017 +0300 + + Update Readme + +commit 0b1fa9d87f4e4246a7aa8a70aa3f279995c307e4 +Author: ne-luboff +Date: Wed Sep 6 13:29:17 2017 +0300 + + Add extra condition for audio in push (show it like instead of