kevinzhow 9e7913af30 Merge branch 'feature/MZFayeClient' into develop ...

Conflicts:
	Podfile.lock
	Yep/Yep-Bridging-Header.h

2016-02-01 22:30:51 +08:00

..

1Password.xcassets

Add onePassword Support

2015-08-19 18:07:01 +08:00

Activities

use pod MonkeyKing

2015-09-21 17:52:55 +08:00

Activities.xcassets

wechat icons

2015-09-10 15:42:57 +08:00

Badges.xcassets

set badgeEnabledImageView's image

2015-07-02 18:38:15 +08:00

Base.lproj

move storyboards

2016-01-22 17:14:38 +08:00

Caches

check message.attachmentExpiresUnixTime for download

2016-02-01 17:14:21 +08:00

Configs

Remove GA

2016-01-23 13:22:40 +08:00

en.lproj

better "Last seen %@" trans string

2015-11-06 10:48:06 +08:00

Extensions

PHImageRequestOptions allow iCloud

2016-02-01 09:50:45 +08:00

Helpers

add userLocationName to YepUserDefaults

2016-01-21 09:55:52 +08:00

Images.xcassets

new location in profile

2016-01-20 09:38:58 +08:00

Operations

fix update uploadState on main queue

2016-01-22 16:24:00 +08:00

Protocols

OpenGraphInfoType

2016-01-26 13:54:09 +08:00

Realm

record attachmentID & attachmentExpiresUnixTime

2016-02-01 15:40:26 +08:00

Services

check message.attachmentExpiresUnixTime for download

2016-02-01 17:14:21 +08:00

Show.xcassets

find Fill 4 for Meet Show

2015-09-04 13:02:29 +08:00

Sounds

Fix sound and mark

2015-10-27 12:59:11 +08:00

Vendors/MZFayeClient

Bring MZFayeClient from CocoaPods to project

2016-02-01 15:05:05 +08:00

ViewControllers

check message.attachmentExpiresUnixTime for download

2016-02-01 17:14:21 +08:00

Views

wordString.trimming(.Whitespace) for tryMentionUserAction

2016-01-30 11:02:13 +08:00

zh-Hans.lproj

trans

2016-01-25 16:31:14 +08:00

AppDelegate.swift

Merge branch 'develop' of https://github.com/CatchChat/Yep into develop

2016-02-01 22:28:08 +08:00

Info.plist

Update version

2016-01-26 16:56:43 +08:00

Yep-Bridging-Header.h

Bring MZFayeClient from CocoaPods to project

2016-02-01 15:05:05 +08:00

Yep.entitlements

Init Unversal Link

2015-11-08 22:14:30 +08:00