Commit Graph

Select branches

Hide Pull Requests

develop

feature/MZFayeClient

feature/add_friends

feature/better_pick_location

feature/chat_state

feature/more_types_feed

feature/no_autolayout_chat_cells

feature/soyep_API

feature/sync_social_works

master

137

138

148

150

154

165

Mono Color

• 7873b17ba6 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-12-02 22:22:47 +08:00
• d40f0716fd Merge branch 'feature/realm_performance' into develop nixzhu 2015-12-02 21:53:18 +08:00
• b9248d2ba9 update attachmentFromDiscoveredAttachment nixzhu 2015-12-02 21:51:58 +08:00
• bf684a80e0 better YepDownloader nixzhu 2015-12-02 21:45:59 +08:00
• 5d69a2e534 better syncSocialWorksToMessagesForYepTeam nixzhu 2015-12-02 21:38:26 +08:00
• 12f1ef2832 better clearMessagesOfConversation, deleteConversation, tryDeleteOrClearHistoryOfConversation, updateUserWithUserID nixzhu 2015-12-02 21:22:47 +08:00
• 4d9426ea5f better prepareConversationForFeed, getOrCreateUserWithDiscoverUser, saveFeedWithDiscoveredFeed nixzhu 2015-12-02 21:11:02 +08:00
• 40203d3f16 better logic for tryPostNewMessagesReceivedNotificationWithMessageIDs when Faye receive messages nixzhu 2015-12-02 20:57:43 +08:00
• 64f9c6260f better syncUnreadMessages; update deleteMessage(:inRealm:), messagesFromRecipient, recordMessageWithMessageID, syncMessageWithMessageInfo nixzhu 2015-12-02 20:45:08 +08:00
• 706eb2eea1 better syncFriendships nixzhu 2015-12-02 20:27:53 +08:00
• 0ae9c166a7 clean code; better syncGroupWithGroupInfo nixzhu 2015-12-02 20:23:47 +08:00
• 1415eb22a1 better syncGroups; use updateUserWithUserID(:useUserInfo:inRealm:); update saveFeedWithDiscoveredFeed(:group:inRealm:) nixzhu 2015-12-02 20:18:31 +08:00
• f5620fb786 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-12-02 17:35:26 +08:00
• a4011a80f4 clean code nixzhu 2015-12-02 17:12:48 +08:00
• 52ff880e9a workaround for textContentLabelWidth "我之前写 Sketch Plugin 被 sandbox 搞烦了，就没有了" nixzhu 2015-12-02 17:00:25 +08:00
• bfbe9f5a04 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-12-02 16:28:59 +08:00
• 669be8be5b UITextView.sizeThatFits is not cool nixzhu 2015-12-02 16:04:31 +08:00
• fa4544ac1b update countOfUnreadMessagesInRealm (consider ConversationType & Group.includeMe) nixzhu 2015-12-02 14:46:54 +08:00
• d845c4ff4d make all messages read if group not includeMe nixzhu 2015-12-02 14:30:26 +08:00
• 1b04d21ec2 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-12-02 13:31:55 +08:00
• f33633ab91 Merge branch 'feature/offline_cache' into develop nixzhu 2015-12-02 13:30:15 +08:00
• f26b28b8e7 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-12-02 12:37:14 +08:00
• 9c34f5c3ac not use offlineJSON for profile to feeds nixzhu 2015-12-02 12:34:10 +08:00
• 367df84798 use feeds offlineJSON nixzhu 2015-12-02 12:22:53 +08:00
• 19bfa732e1 save feeds offlineJSON nixzhu 2015-12-02 12:04:22 +08:00
• 89bf3a4229 add OfflineJSON nixzhu 2015-12-02 11:49:30 +08:00
• 58d8e3e3b7 checkDoubleTapOnFeeds to trigger pull ot refresh nixzhu 2015-12-02 10:49:54 +08:00
• 08b8ea3860 when feeds.isEmpty or isRefreshing, do not trigger nixzhu 2015-12-02 10:28:53 +08:00
• d05b717084 tap on feeds tab pull to refresh when feedsTableView isAtTop nixzhu 2015-12-02 10:24:22 +08:00
• 5fa506f7cc update keyboardMan.animateWhenKeyboardAppear consider subscribeView nixzhu 2015-12-01 18:35:35 +08:00
• e04446e06a Less fetch on discover kevinzhow 2015-12-01 18:28:50 +08:00
• ecb6de7989 less fetch for better performance on Feeds and Discover kevinzhow 2015-12-01 18:28:37 +08:00
• d7d026c872 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-12-01 18:26:33 +08:00
• d1c9569975 update updateConversationCollectionViewWithMessageIDs (also hide subscribeView after send message) nixzhu 2015-12-01 18:24:11 +08:00
• 8cf112d164 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-12-01 18:15:30 +08:00
• 32e907c9dc Merge branch 'feature/feed_join' into develop nixzhu 2015-12-01 18:11:48 +08:00
• f8c4dd804b update unsubscribeAction nixzhu 2015-12-01 18:11:33 +08:00
• 6ee60ab8a7 trans nixzhu 2015-12-01 18:07:13 +08:00
• 9c7c8a55e5 update batchMarkMessagesAsReaded (don't needMarkInServer if group not includeMe) nixzhu 2015-12-01 18:01:24 +08:00
• 208e3930df better check nixzhu 2015-12-01 17:54:18 +08:00
• 6c70ba865c check if meIsMemberOfGroup to show subscribeView nixzhu 2015-12-01 17:45:03 +08:00
• c75059dd62 consider subscribeViewHeight, update animateWhenKeyboardDisappear & trySnapContentOfConversationCollectionViewToBottom nixzhu 2015-12-01 17:23:24 +08:00
• 2a0f6a86ef refactor tryUpdateConversationCollectionViewWith nixzhu 2015-12-01 17:11:38 +08:00
• 04ea98d28f showWithChangeAction & hideWithChangeAction for SubscribeView do animation nixzhu 2015-12-01 16:43:51 +08:00
• 32394fb736 update feedConversations' predicate (do not show group is not includeMe) nixzhu 2015-12-01 15:34:01 +08:00
• 9f832629f0 check if Group includeMe nixzhu 2015-12-01 15:21:01 +08:00
• 6031d99966 refactor saveFeedWithDiscoveredFeed; new syncMessages logic nixzhu 2015-12-01 14:59:34 +08:00
• f77b7df77b subscribeAction nixzhu 2015-12-01 14:17:35 +08:00
• 556cb44d78 icons nixzhu 2015-12-01 14:07:05 +08:00
• 6d66ab17cb SubscribeView detail nixzhu 2015-12-01 12:36:30 +08:00
• 60bc8311da show / hide animation nixzhu 2015-12-01 12:06:07 +08:00
• 86c0b6b6da add SubscribeView nixzhu 2015-12-01 11:47:47 +08:00
• c4413eeaf2 Update version kevinzhow 2015-11-30 17:36:48 +08:00
• d08a7d39eb Merge branch 'feature/more_types_feed' into develop nixzhu 2015-11-30 16:40:19 +08:00
• 0da4cfb4ee activityIndicator logic feature/more_types_feed nixzhu 2015-11-30 16:37:20 +08:00
• 87872fff62 set location Default if can; update it's name when update userLocationPlacemarks nixzhu 2015-11-30 16:35:46 +08:00
• 8508a03e51 cache mapImage in FeedView nixzhu 2015-11-30 16:23:20 +08:00
• e776799112 tapLocationAction for FeedView nixzhu 2015-11-30 16:20:38 +08:00
• 34f7cac49a cache mapImageOfLocationCoordinate nixzhu 2015-11-30 16:13:26 +08:00
• 1995b83bb8 pass afterCreatedFeedAction for New Feed Location nixzhu 2015-11-30 15:50:47 +08:00
• c4c8dd715a disable Short Movie nixzhu 2015-11-30 15:45:51 +08:00
• aff8f2eea1 prepareForReuse nixzhu 2015-11-30 15:40:40 +08:00
• f3b9feb296 config location in FeedView nixzhu 2015-11-30 15:35:58 +08:00
• 656398a588 location UI in FeedView nixzhu 2015-11-30 15:13:26 +08:00
• a9a3faa3ed better pick location logic nixzhu 2015-11-30 15:09:54 +08:00
• 793f0b292e Default for nature location nixzhu 2015-11-30 14:35:54 +08:00
• 551d04265d UI detail nixzhu 2015-11-30 14:24:31 +08:00
• 8ec0581ff2 tapLocationAction in Feeds nixzhu 2015-11-30 13:57:30 +08:00
• 7351ec83e3 show location map in FeedSocialWorkCell nixzhu 2015-11-30 12:00:54 +08:00
• 650e3f2376 FeedLocation for Feed nixzhu 2015-11-30 11:30:41 +08:00
• afb562f511 LocationInfo for DiscoveredFeed nixzhu 2015-11-30 11:20:09 +08:00
• 83a9300bdc location UI in FeedSocialWorkCell nixzhu 2015-11-30 11:05:36 +08:00
• 98882a8451 post location nixzhu 2015-11-30 10:55:19 +08:00
• 8dc8d39bc5 location UI in NewFeed nixzhu 2015-11-30 10:49:57 +08:00
• 5a5b333b4d pass Location(location) nixzhu 2015-11-30 10:07:53 +08:00
• 9b247a9ccf set purpose of PickLocation nixzhu 2015-11-30 09:49:03 +08:00
• 65ba213723 presentPickLocation from Feeds nixzhu 2015-11-30 09:38:29 +08:00
• a84302c894 UI detail nixzhu 2015-11-27 18:19:28 +08:00
• 40f2128562 voiceIndicatorImageView animation detail nixzhu 2015-11-27 18:12:47 +08:00
• effc4a24d8 clean code nixzhu 2015-11-27 17:50:39 +08:00
• e4364b1a77 animation in set audioPlayedDuration nixzhu 2015-11-27 17:48:05 +08:00
• af13fd1c13 voiceIndicatorImageView nixzhu 2015-11-27 16:41:17 +08:00
• b1d311df3d UI detail nixzhu 2015-11-27 16:06:57 +08:00
• 410c24c17b new reset logic nixzhu 2015-11-27 15:53:33 +08:00
• cdee3ddade playOrPauseAudio in NewFeedVoiceRecord nixzhu 2015-11-27 15:48:11 +08:00
• 7eb0583b0d stop audio playing when present NewFeedVoiceRecord nixzhu 2015-11-27 15:28:05 +08:00
• 753ca352ee no cancelButton if attachment needPrepare in NewFeed nixzhu 2015-11-27 15:14:35 +08:00
• b78d4fe156 try playOrPauseAudio nixzhu 2015-11-27 15:10:06 +08:00
• 45868f7375 trans nixzhu 2015-11-27 15:04:02 +08:00
• 21eb4bd384 refactor playOrPauseAudioAction for FeedSocialWorkCell nixzhu 2015-11-27 12:38:35 +08:00
• 74f9602d1a playOrPauseAudio in FeedView nixzhu 2015-11-27 12:31:15 +08:00
• 634d7152c6 configure audio in FeedView nixzhu 2015-11-27 11:54:01 +08:00
• 8522661f02 layout of audio in FeedView nixzhu 2015-11-27 11:45:07 +08:00
• 0eff863809 voiceContainerView in FeedView nixzhu 2015-11-27 11:27:24 +08:00
• ac0ccc8bcf tryDeleteFeedVoice after post or cancel nixzhu 2015-11-27 11:13:53 +08:00
• b68ddc7555 better updateVoiceContainerView for set audioPlaying; recover audio cells' UI when play finished nixzhu 2015-11-27 11:06:37 +08:00
• c8160bcea7 fix playOrPauseAudioAction logic nixzhu 2015-11-27 10:52:33 +08:00
• aa87df68b0 fix audioPlaying check nixzhu 2015-11-27 10:33:27 +08:00
• 4ef84f2758 playing progress of feed audio nixzhu 2015-11-27 10:30:23 +08:00
• 0ebb7ae7c4 configure audioPlaying nixzhu 2015-11-27 10:02:40 +08:00