Skip to content
This repository has been archived by the owner on Jul 2, 2019. It is now read-only.

Stable 190222 #425

Open
wants to merge 98 commits into
base: master
Choose a base branch
from
Open

Stable 190222 #425

wants to merge 98 commits into from

Commits on May 22, 2017

  1. 迁移修改的聊天的代码

    @zhihanhe
    zhihanhe committed May 22, 2017
    Configuration menu
    Copy the full SHA
    ec8b75c View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2017

  1. 增加在游戏中不说语音的功能

    Yang committed Jun 8, 2017
    Configuration menu
    Copy the full SHA
    2722ff5 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2017

  1. BugFix:删除图片圆角功能

    Yang committed Jun 9, 2017
    Configuration menu
    Copy the full SHA
    097d86a View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2017

  1. 收到消息的文案修改

    @zhihanhe
    zhihanhe committed Jun 12, 2017
    Configuration menu
    Copy the full SHA
    94484c7 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2017

  1. 修复发送消息导致崩溃的bug

    @zhihanhe
    zhihanhe committed Jul 4, 2017
    Configuration menu
    Copy the full SHA
    ba6640c View commit details
    Browse the repository at this point in the history

  2. 增加charkit的版本

    @zhihanhe
    zhihanhe committed Jul 4, 2017
    Configuration menu
    Copy the full SHA
    4010b91 View commit details
    Browse the repository at this point in the history

  3. 对新数据临时做兼容

    @zhihanhe
    zhihanhe committed Jul 4, 2017
    Configuration menu
    Copy the full SHA
    1b33e1b View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2017

  1. 兼容错误的返回数据

    @zhihanhe
    zhihanhe committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    1a50b60 View commit details
    Browse the repository at this point in the history

  2. 更新pod版本

    @zhihanhe
    zhihanhe committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    47d8c98 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2017

  1. 添加对位置类型的支持“

    Yang committed Jul 6, 2017
    Configuration menu
    Copy the full SHA
    ec76a1c View commit details
    Browse the repository at this point in the history

  2. merge

    Yang committed Jul 6, 2017
    Configuration menu
    Copy the full SHA
    0204077 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2017

  1. Fix:更改依赖MWPhotoBrowser为私有库

    Yang committed Jul 7, 2017
    Configuration menu
    Copy the full SHA
    ce6c1df View commit details
    Browse the repository at this point in the history

  2. Fix:更新MWPhotoBrowser

    Yang committed Jul 7, 2017
    Configuration menu
    Copy the full SHA
    d605ad1 View commit details
    Browse the repository at this point in the history

  3. 更新podsec

    Yang committed Jul 7, 2017
    Configuration menu
    Copy the full SHA
    918816d View commit details
    Browse the repository at this point in the history

  4. 删除MWPhotoBrowser

    Yang committed Jul 7, 2017
    Configuration menu
    Copy the full SHA
    ebd1656 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2017

  1. 自动添加MBProgressHUD

    Yang committed Jul 10, 2017
    Configuration menu
    Copy the full SHA
    48aa399 View commit details
    Browse the repository at this point in the history

  2. 删除podsec修改

    Yang committed Jul 10, 2017
    Configuration menu
    Copy the full SHA
    b3683ae View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2017

  1. 切换区域，先把缓存去掉

    Yang committed Jul 12, 2017
    Configuration menu
    Copy the full SHA
    f95bbab View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2017

  1. more item 为空时会抛出异常

    Yang committed Jul 13, 2017
    Configuration menu
    Copy the full SHA
    ba069c0 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2017

  1. 修复在32位处理器bug,更新podspec

    Yang committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    40ca686 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2017

  1. 自定义消息可以响应点击头像跳转

    Yang committed Aug 7, 2017
    Configuration menu
    Copy the full SHA
    6b41a20 View commit details
    Browse the repository at this point in the history

  2. 自定义消息头像点击问题

    Yang committed Aug 7, 2017
    Configuration menu
    Copy the full SHA
    8112c09 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2017

  1. 更新到最新

    Yang committed Aug 29, 2017
    Configuration menu
    Copy the full SHA
    e62a081 View commit details
    Browse the repository at this point in the history

  2. 禁玩信息存在本地

    Yang committed Aug 29, 2017
    Configuration menu
    Copy the full SHA
    4a61410 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2017

  1. 黑名单功能

    Yang committed Sep 20, 2017
    Configuration menu
    Copy the full SHA
    243dd49 View commit details
    Browse the repository at this point in the history

  2. 黑名单功能优化

    Yang committed Sep 20, 2017
    Configuration menu
    Copy the full SHA
    cac9a89 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2017

  1. 更新黑名单功能

    Yang committed Sep 26, 2017
    Configuration menu
    Copy the full SHA
    3512a58 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2017

  1. Associate lcck message with raw message

    @zhihanhe
    zhihanhe committed Oct 28, 2017
    Configuration menu
    Copy the full SHA
    bbdfc5d View commit details
    Browse the repository at this point in the history

  2. 更新版本

    @zhihanhe
    zhihanhe committed Oct 28, 2017
    Configuration menu
    Copy the full SHA
    c9aa362 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2017

  1. 修改部分操作

    @zhihanhe
    zhihanhe committed Oct 30, 2017
    Configuration menu
    Copy the full SHA
    5c71eb5 View commit details
    Browse the repository at this point in the history

  2. 解决有时候没头像的问题

    @zhihanhe
    zhihanhe committed Oct 30, 2017
    Configuration menu
    Copy the full SHA
    707cae9 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2017

  1. 更新替换title的功能

    @zhihanhe
    zhihanhe committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    da6f340 View commit details
    Browse the repository at this point in the history

  2. 增加对家族的支持

    @zhihanhe
    zhihanhe committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    8ff8451 View commit details
    Browse the repository at this point in the history

  3. 修改pod版本

    @zhihanhe
    zhihanhe committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    8512a64 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2017

  1. 增加conv_id

    @zhihanhe
    zhihanhe committed Nov 2, 2017
    Configuration menu
    Copy the full SHA
    2dedadd View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2017

  1. 增加conv_id给rn

    @zhihanhe
    zhihanhe committed Nov 3, 2017
    Configuration menu
    Copy the full SHA
    d447e5f View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2017

  1. 更新chatkit，支持iOS 11的问题

    @zhihanhe
    zhihanhe committed Nov 8, 2017
    Configuration menu
    Copy the full SHA
    c11add8 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2017

  1. 修复bug https://leanticket.cn/tickets/14890 chatkit聊天，有些用户的消息被发了多条

    @zhihanhe
    zhihanhe committed Nov 28, 2017
    Configuration menu
    Copy the full SHA
    e5d3f7c View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2017

  1. 支持群聊的个人信息显示

    @zhihanhe
    zhihanhe committed Dec 18, 2017
    Configuration menu
    Copy the full SHA
    a90766e View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2017

  1. 增加消息来源的字段

    @zhihanhe
    zhihanhe committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    b23436a View commit details
    Browse the repository at this point in the history

  2. 增加参数

    @zhihanhe
    zhihanhe committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    0b47be5 View commit details
    Browse the repository at this point in the history

  3. 传递到上一层的class中

    @zhihanhe
    zhihanhe committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    bfacd72 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2018

  1. 修复没有头像会崩溃的问题

    Yang committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    b45c5cf View commit details
    Browse the repository at this point in the history

  2. 添加提示代码

    Yang committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    b11cb4d View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2018

  1. 过滤暂态消息

    Yang committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    e4901e2 View commit details
    Browse the repository at this point in the history

  2. 添加编辑日期

    Yang committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    ff953e3 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2018

  1. 收到暂态消息不播放声音

    Yang committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    7f9d3a0 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2018

  1. 更新chatkit版本到 180326

    @zhihanhe
    zhihanhe committed Mar 26, 2018
    Configuration menu
    Copy the full SHA
    3c8c542 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2018

  1. 最原始版本与最新版本合并

    @xiaozao2008
    xiaozao2008 committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    d9d6ba0 View commit details
    Browse the repository at this point in the history

  2. 先把没用的多余的提交 

    这次提交不用看
    @xiaozao2008
    xiaozao2008 committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    5bbeaaa View commit details
    Browse the repository at this point in the history

  3. 所有的本次更新都在这里了

    @xiaozao2008
    xiaozao2008 committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    60332df View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1 from xiaozao2008/master 

    0.8.14和我们目前代码合并了一下
    @zhihanhe
    zhihanhe authored Jun 13, 2018
    Configuration menu
    Copy the full SHA
    74e277e View commit details
    Browse the repository at this point in the history

  5. 更新chatkit的pod版本

    @zhihanhe
    zhihanhe committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    a2cbfc0 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2018

  1. 防止多次push

    @AbcTM
    AbcTM committed Dec 22, 2018
    Configuration menu
    Copy the full SHA
    488a58e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from tianlinchun/master 

    防止多次push
    @zhihanhe
    zhihanhe authored Dec 22, 2018
    Configuration menu
    Copy the full SHA
    1708a67 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2019

  1. 给消息增加默认值

    @zhihanhe
    zhihanhe committed Jan 3, 2019
    Configuration menu
    Copy the full SHA
    91e9c26 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2019

  1. 修改国际化加载奔溃

    @AbcTM
    AbcTM committed Jan 21, 2019
    Configuration menu
    Copy the full SHA
    df375e1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from tianlinchun/master 

    修改国际化加载奔溃
    @zhihanhe
    zhihanhe authored Jan 21, 2019
    Configuration menu
    Copy the full SHA
    40a5129 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2019

  1. 提交稳定版本

    @zhihanhe
    zhihanhe committed Jan 24, 2019
    Configuration menu
    Copy the full SHA
    f0a0b30 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2019

  1. 去掉红包的引用

    @zhihanhe
    zhihanhe committed Feb 2, 2019
    Configuration menu
    Copy the full SHA
    6b2be33 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2019

  1. Merge commit 'cc714e918d952ea88d2bf6b044df819897690b1a' of git://gith… 

    …ub.com/leancloud/ChatKit-OC into stable_190222

# Conflicts:
#	ChatKit.podspec
#	ChatKit/Class/Module/Base/LCCKBaseTableViewController.m
#	ChatKit/Class/Module/Conversation/Controller/LCCKConversationViewController.m
#	ChatKit/Class/Module/Conversation/Model/LCCKConversationViewModel.m
#	ChatKit/Class/Tool/Service/LCCKConversationService.m
#	ChatKit/Class/Tool/Service/LCCKSessionService.m
    @zhihanhe
    zhihanhe committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    9ace8c1 View commit details
    Browse the repository at this point in the history

  2. 指定提交版本，合并时间

    @zhihanhe
    zhihanhe committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    d484392 View commit details
    Browse the repository at this point in the history

  3. 提交远程合并方法

    @zhihanhe
    zhihanhe committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    b6b5476 View commit details
    Browse the repository at this point in the history

  4. 版本

    @zhihanhe
    zhihanhe committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    c2f4263 View commit details
    Browse the repository at this point in the history

  5. 版本

    @zhihanhe
    zhihanhe committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    82ec814 View commit details
    Browse the repository at this point in the history

  6. 支持X

    @zhihanhe
    zhihanhe committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    cdf7295 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2019

  1. 修复chatkit狂送礼物崩溃的问题

    @zhihanhe
    zhihanhe committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    2b3d93e View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2019

  1. 更新聊天消息

    @zhihanhe
    zhihanhe committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    4122921 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2019

  1. Merge commit '61f51fb8c67da7182604650e9bc9d8c2678096b2' of git://gith… 

    …ub.com/leancloud/ChatKit-OC into stable_190222

# Conflicts:
#	ChatKit/Class/Module/Conversation/Model/LCCKConversationViewModel.m
    @zhihanhe
    zhihanhe committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    04202b6 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2019

  1. 兼容调试

    @zhihanhe
    zhihanhe committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    2e6dc11 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2019

  1. 增加消息更新机制

    @zhihanhe
    zhihanhe committed Mar 1, 2019
    Configuration menu
    Copy the full SHA
    9886b03 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2019

  1. 正确转发消息

    @zhihanhe
    zhihanhe committed Mar 7, 2019
    Configuration menu
    Copy the full SHA
    250041d View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2019

  1. 消息判断让finalMessage不为空

    @zhihanhe
    zhihanhe committed Mar 11, 2019
    Configuration menu
    Copy the full SHA
    5018ee3 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2019

  1. 在网络异常的情况下，conversationId 是空的，这会导致崩溃，这种情况下return掉

    @zhihanhe
    zhihanhe committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    e759531 View commit details
    Browse the repository at this point in the history

  2. 去掉自定义消息在在网络不好的情况下不发的问题

    @zhihanhe
    zhihanhe committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    4186c86 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2019

  1. 对自定义消息增加cid是不是为空的判断

    @zhihanhe
    zhihanhe committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    daee626 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2019

  1. 两个人的首次聊天不需要这条消息

    @zhihanhe
    zhihanhe committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    c91ec53 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2019

  1. 去掉olCustom添加时，attr是nil的问题

    @zhihanhe
    zhihanhe committed Apr 26, 2019
    Configuration menu
    Copy the full SHA
    76bebe6 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2019

  1. 更新版本

    @zhihanhe
    zhihanhe committed Apr 28, 2019
    Configuration menu
    Copy the full SHA
    934c4e4 View commit details
    Browse the repository at this point in the history

  2. 更新版本

    @zhihanhe
    zhihanhe committed Apr 28, 2019
    Configuration menu
    Copy the full SHA
    392c2dc View commit details
    Browse the repository at this point in the history

  3. 还原版本

    @zhihanhe
    zhihanhe committed Apr 28, 2019
    Configuration menu
    Copy the full SHA
    7afa54d View commit details
    Browse the repository at this point in the history

Commits on May 31, 2019

  1. 测试翻译功能

    @zhihanhe
    zhihanhe committed May 31, 2019
    Configuration menu
    Copy the full SHA
    552e750 View commit details
    Browse the repository at this point in the history

  2. 增加翻译

    @zhihanhe
    zhihanhe committed May 31, 2019
    Configuration menu
    Copy the full SHA
    a14d4bd View commit details
    Browse the repository at this point in the history

  3. 调整代码位置

    @zhihanhe
    zhihanhe committed May 31, 2019
    Configuration menu
    Copy the full SHA
    f8a3174 View commit details
    Browse the repository at this point in the history

  4. 更新繁体翻译翻译

    @zhihanhe
    zhihanhe committed May 31, 2019
    Configuration menu
    Copy the full SHA
    a006747 View commit details
    Browse the repository at this point in the history

  5. 修改代码

    @zhihanhe
    zhihanhe committed May 31, 2019
    Configuration menu
    Copy the full SHA
    b105385 View commit details
    Browse the repository at this point in the history

  6. 增加阿拉伯语支持

    @zhihanhe
    zhihanhe committed May 31, 2019
    Configuration menu
    Copy the full SHA
    2a5b3fb View commit details
    Browse the repository at this point in the history

  7. 增加表情国际化

    @zhihanhe
    zhihanhe committed May 31, 2019
    Configuration menu
    Copy the full SHA
    aecadc0 View commit details
    Browse the repository at this point in the history

  8. 更新阿拉伯语文案

    @zhihanhe
    zhihanhe committed May 31, 2019
    Configuration menu
    Copy the full SHA
    618b5fb View commit details
    Browse the repository at this point in the history

  9. 增加翻译

    @zhihanhe
    zhihanhe committed May 31, 2019
    Configuration menu
    Copy the full SHA
    7da7818 View commit details
    Browse the repository at this point in the history

  10. 都是用简体

    @zhihanhe
    zhihanhe committed May 31, 2019
    Configuration menu
    Copy the full SHA
    00f6241 View commit details
    Browse the repository at this point in the history

  11. no message

    @zhihanhe
    zhihanhe committed May 31, 2019
    Configuration menu
    Copy the full SHA
    3eb6cb3 View commit details
    Browse the repository at this point in the history

  12. 匹配各国语言表情

    @zhihanhe
    zhihanhe committed May 31, 2019
    Configuration menu
    Copy the full SHA
    2d029dc View commit details
    Browse the repository at this point in the history

  13. 修复赠送礼物显示不正确的问题

    @zhihanhe
    zhihanhe committed May 31, 2019
    Configuration menu
    Copy the full SHA
    91b9295 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2019

  1. 修复翻译问题

    @zhihanhe
    zhihanhe committed Jun 11, 2019
    Configuration menu
    Copy the full SHA
    e5d3205 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2019

  1. 修复翻译问题

    @zhihanhe
    zhihanhe committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    44f11e1 View commit details
    Browse the repository at this point in the history

  2. 修改翻译

    @zhihanhe
    zhihanhe committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    8f5a451 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2019

  1. 去掉版本引用

    @zhihanhe
    zhihanhe committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    5a34887 View commit details
    Browse the repository at this point in the history