  nixzhuandnixzhu
|
6823c8b1fb
|
clean print
|
2015-10-13 18:01:47 +08:00 |
|
|
nixzhu
|
f5021bb382
|
Merge branch 'feature/open_instagram_media_in_its_app' into develop
|
2015-10-13 17:59:06 +08:00 |
|
|
nixzhuandnixzhu
|
72b6def3b8
|
open instagram media in it's app if can
|
2015-10-13 17:50:59 +08:00 |
|
 kevinzhow
|
f9bed86965
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-10-13 17:36:52 +08:00 |
|
|
nixzhuandnixzhu
|
bbefc6d6e9
|
save media id of Media in InstagramWork
|
2015-10-13 17:29:14 +08:00 |
|
|
nixzhuandnixzhu
|
20a641a0ae
|
make imageView in InstagramMediaCell & DribbbleShotCell ScaleAspectFill
|
2015-10-13 17:18:25 +08:00 |
|
|
nixzhuandnixzhu
|
141076b69e
|
make sure synced self's messages mark as read
|
2015-10-13 16:37:11 +08:00 |
|
|
nixzhuandnixzhu
|
07d114bbc0
|
fix create conversation logic when sync messages (now include self's messages)
|
2015-10-13 16:32:22 +08:00 |
|
|
kevinzhow
|
cb6068ca75
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-10-13 16:16:22 +08:00 |
|
|
kevinzhow
|
e386c64099
|
Update pod
|
2015-10-13 16:16:12 +08:00 |
|
|
nixzhuandnixzhu
|
ca1c11bace
|
hidesBottomBarWhenPushed when showProfile from FeedsViewController; also Joined Feeds
|
2015-10-13 16:02:53 +08:00 |
|
|
nixzhuandnixzhu
|
98b542126f
|
add FromType for ProfileViewController (now tap group user's avatar can sayHi)
|
2015-10-13 15:58:23 +08:00 |
|
|
nixzhuandnixzhu
|
326a574562
|
can delete image while create Feed
|
2015-10-13 15:45:26 +08:00 |
|
|
nixzhuandnixzhu
|
4fcfc680af
|
save discoveredUserSortStyleKey, recover it if can
|
2015-10-13 15:27:58 +08:00 |
|
|
nixzhuandnixzhu
|
3edde21997
|
if is not first appear, set haveUnreadMessages in FeedConversationsViewController
|
2015-10-13 14:22:40 +08:00 |
|
|
nixzhuandnixzhu
|
3333802e1d
|
when sayHi, post YepCreatedConversationNotification instead of YepCreatedConversationNotification to reload Conversations
|
2015-10-13 13:37:20 +08:00 |
|
|
nixzhuandnixzhu
|
b109b80923
|
refactor tryPostNewMessagesReceivedNotificationWithMessageIDs
|
2015-10-13 13:34:15 +08:00 |
|
|
nixzhuandnixzhu
|
cf1fcd163a
|
better sync history logic for when into Conversation
|
2015-10-13 13:15:09 +08:00 |
|
|
nixzhuandnixzhu
|
9f847edaa9
|
fold feedView when appear
|
2015-10-13 13:04:28 +08:00 |
|
|
nixzhuandnixzhu
|
1bae7f9b45
|
prepareForReuse of FeedCell
|
2015-10-13 11:27:14 +08:00 |
|
|
kevinzhow
|
de21412e3e
|
Back pod
|
2015-10-12 22:34:02 +08:00 |
|
|
kevinzhow
|
a24b50e175
|
More chinese
|
2015-10-12 22:16:39 +08:00 |
|
|
kevinzhow
|
c3a32039f8
|
Fix cancel new feed and prevent from hard refresh
|
2015-10-12 22:15:39 +08:00 |
|
|
kevinzhow
|
7eb3a8e670
|
Add discover service icon
|
2015-10-12 22:01:28 +08:00 |
|
|
kevinzhow
|
9efd59f816
|
Better layout on minicard
|
2015-10-12 21:47:22 +08:00 |
|
|
kevinzhow
|
d7e56f1cc1
|
Discover Card Show skills and new Feed View
|
2015-10-12 21:34:08 +08:00 |
|
|
kevinzhow
|
d0641d8f8f
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-10-12 19:56:32 +08:00 |
|
|
kevinzhow
|
0531664b08
|
Change to PhotoLibrary
|
2015-10-12 19:56:23 +08:00 |
|
|
kevinzhow
|
3637e6f97b
|
Fix repeat message
|
2015-10-12 19:24:28 +08:00 |
|
|
nixzhu
|
d75279a5d0
|
Merge branch 'feature/feed_conversations' into develop
|
2015-10-12 18:06:03 +08:00 |
|
|
nixzhuandnixzhu
|
f02db4c93a
|
fix latestMessageInRealm(:withConversationType:)
|
2015-10-12 17:58:07 +08:00 |
|
|
nixzhuandnixzhu
|
36ce782e98
|
replace more Helvetica with systemFont
|
2015-10-12 17:57:41 +08:00 |
|
|
kevinzhow
|
d729a9865c
|
Fix icon list bug
|
2015-10-12 17:19:54 +08:00 |
|
|
nixzhuandnixzhu
|
3954ef1a57
|
hide FeedConversation Section if can
|
2015-10-12 16:57:30 +08:00 |
|
|
nixzhuandnixzhu
|
01cc0f5230
|
add countOfConversationsInRealm to set noConversation
|
2015-10-12 16:49:50 +08:00 |
|
|
nixzhuandnixzhu
|
501f05e824
|
tryDeleteOrClearHistoryOfConversation in FeedConversationsViewController
|
2015-10-12 16:32:31 +08:00 |
|
|
nixzhuandnixzhu
|
57ba5ac2e9
|
refactor tryDeleteOrClearHistoryOfConversation
|
2015-10-12 16:29:51 +08:00 |
|
|
nixzhuandnixzhu
|
840363d5ea
|
fix: delete it's attachments before delete Feed
|
2015-10-12 16:08:29 +08:00 |
|
|
nixzhuandnixzhu
|
931083f92d
|
trans "Joined Feeds"
|
2015-10-12 16:04:11 +08:00 |
|
|
nixzhuandnixzhu
|
7057c8bb71
|
set chatLabel for FeedConversationDockCell
|
2015-10-12 15:57:47 +08:00 |
|
|
nixzhuandnixzhu
|
e2bee0f46e
|
ContactsCell separatorInset
|
2015-10-12 15:41:58 +08:00 |
|
|
nixzhuandnixzhu
|
9ba4de48e8
|
icons
|
2015-10-12 15:37:46 +08:00 |
|
|
nixzhuandnixzhu
|
d8fad32c30
|
haveGroupUnreadMessages for FeedConversationDockCell
|
2015-10-12 15:27:33 +08:00 |
|
|
kevinzhow
|
7669ec670b
|
Fix width of card User
|
2015-10-12 15:24:48 +08:00 |
|
|
nixzhuandnixzhu
|
5a5f1641f2
|
two kind of countOfUnreadMessages (all or with conversation type)
|
2015-10-12 15:18:28 +08:00 |
|
|
nixzhuandnixzhu
|
060601f7b0
|
reloadFeedConversationsTableView if need update unread messages
|
2015-10-12 14:59:08 +08:00 |
|
|
nixzhuandnixzhu
|
9a3b7074d2
|
yepCellAccessoryImageViewTintColor
|
2015-10-12 14:41:21 +08:00 |
|
|
nixzhuandnixzhu
|
43784df0b9
|
chatLabel
|
2015-10-12 14:33:47 +08:00 |
|
|
nixzhuandnixzhu
|
7222d745ab
|
mediaView
|
2015-10-12 14:25:34 +08:00 |
|
|
kevinzhow
|
7b998ff44a
|
Allow Edit Avatar when pick up
|
2015-10-12 14:21:33 +08:00 |
|