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

• 99ba0da986 add SegueViewController override performSegueWithIdentifier to prevent duplicate push nixzhu 2016-01-04 09:46:28 +08:00
• de68c5d5db override performSegueWithIdentifier force check shouldPerformSegueWithIdentifier for directly perform segue nixzhu 2016-01-04 09:08:35 +08:00
• 9b4e1f5f67 update pods nixzhu 2016-01-04 08:52:41 +08:00
• 59e612e532 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-12-31 22:14:58 +08:00
• d7b3436dbb new logic for afterDeletedFeedAction nixzhu 2015-12-31 18:27:11 +08:00
• 52910be89c Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-12-31 18:13:11 +08:00
• 90c54d0fd3 Update version kevinzhow 2015-12-31 18:13:03 +08:00
• 6fe51a84dc update lastMessageReadByRecipient use last_read_id nixzhu 2015-12-31 17:55:28 +08:00
• 776718114a use last_read_id from Faye to markAsReadAllSentMesagesBeforeUnixTime if need nixzhu 2015-12-31 17:30:16 +08:00
• a57048976a Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-12-31 17:08:51 +08:00
• 7829ef7892 clear applicationIconBadgeNumber & notification when applicationDidBecomeActive nixzhu 2015-12-31 16:21:02 +08:00
• 7cdcf1417b do not call clearUselessRealmObjects when into background nixzhu 2015-12-31 15:31:26 +08:00
• 0d7d4b14bd guard conversation is not invalidated when updateStateInfoOfTitleView nixzhu 2015-12-31 14:59:38 +08:00
• 46c22af844 fix latestValidMessageInRealm & latestUnreadValidMessageInRealm nixzhu 2015-12-31 14:44:41 +08:00
• 585d28afb4 Merge branch 'feature/fix_bugs' into develop nixzhu 2015-12-31 11:59:24 +08:00
• c9a90069be white background for FeedLocationContainerView nixzhu 2015-12-31 11:58:20 +08:00
• 8a8fb117ef white background for FeedMediaContainerView nixzhu 2015-12-31 11:55:10 +08:00
• fb39841cf8 white background for FeedGithubRepoContainerView nixzhu 2015-12-31 11:51:08 +08:00
• 04da9d99e3 add UpdateFeedsMode; conversationDirtyAction for Conversation to updateFeeds Static nixzhu 2015-12-31 11:13:57 +08:00
• 03f5363ff1 feedsTableView WayToUpdate: ReloadIndexPaths if MessagesCountUpdated nixzhu 2015-12-31 10:07:34 +08:00
• 2239468c88 ReloadData if need when updateFeeds nixzhu 2015-12-31 09:54:47 +08:00
• 1931c0bec2 trans 消息已被撤回 nixzhu 2015-12-31 09:42:21 +08:00
• 505b95d2dd Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-12-30 17:07:12 +08:00
• 611e2d5619 Merge branch 'feature/pull_time' into develop nixzhu 2015-12-30 16:36:13 +08:00
• 6a6e96bd03 delay when pull in Conversation nixzhu 2015-12-30 16:36:00 +08:00
• 1a521067cc delay 0.3s before finish for pullToRefreshView in Feeds nixzhu 2015-12-30 16:32:09 +08:00
• 0ab9540f7d trans nixzhu 2015-12-30 13:59:56 +08:00
• 3bf9ae807a Merge branch 'feature/delete_message2' into develop nixzhu 2015-12-30 13:55:58 +08:00
• b0725c724d fix latestValidMessage of Conversation nixzhu 2015-12-30 13:55:44 +08:00
• 738b56276c latestValidMessage for Conversation; new logic for find latest message withConversationType nixzhu 2015-12-30 13:44:31 +08:00
• b7bac52824 message.deleteInRealm nixzhu 2015-12-30 13:16:58 +08:00
• 830b716619 do not sync message sent from me & deleted nixzhu 2015-12-30 13:07:20 +08:00
• 65c3497d0b refactor message.textContentToShow nixzhu 2015-12-30 11:29:14 +08:00
• e7522c55cc new way to show message.deletedByCreator nixzhu 2015-12-30 11:26:18 +08:00
• 0993e53b2b textColor for message.deletedByCreator nixzhu 2015-12-30 11:14:57 +08:00
• 627c1f4ad3 new logic for handleDeletedMessages in Conversation (update height of deleted message) nixzhu 2015-12-30 10:45:50 +08:00
• 3800d74c4e update updateForDeletedFromServerInRealm nixzhu 2015-12-30 10:30:44 +08:00
• 93217ee244 refactor message.updateForDeletedFromServerInRealm nixzhu 2015-12-30 10:26:08 +08:00
• 2ab097cae3 new logic for handleMessageDeletedFromServer nixzhu 2015-12-30 10:21:15 +08:00
• a7fe8959ca hidden replace deleted in Message; add deletedByCreator nixzhu 2015-12-30 10:17:17 +08:00
• 0038be8ced update recordMessage for message deleted by creator nixzhu 2015-12-30 09:58:56 +08:00
• f12ff5ae5f Update kevinzhow 2015-12-29 22:21:45 +08:00
• d6cb5d6638 Merge branch 'feature/delete_message' into develop nixzhu 2015-12-29 17:39:41 +08:00
• d0ecc22379 new title for deleteMessage nixzhu 2015-12-29 17:36:40 +08:00
• 656306abc2 reload for deletedMessages in Conversations & FeedConversations nixzhu 2015-12-29 17:19:43 +08:00
• 4e343e5078 refactor handleMessageDeletedFromServer nixzhu 2015-12-29 17:14:42 +08:00
• bcaeb9a93c handle MessageDeleted from Faye nixzhu 2015-12-29 17:05:35 +08:00
• c685de35c6 post deletedMessages notification to update Conversation nixzhu 2015-12-29 16:47:47 +08:00
• 9b678a989a handle remote MessageDeleted notification nixzhu 2015-12-29 16:26:13 +08:00
• d65f264228 better BubbleMaskImage nixzhu 2015-12-29 15:53:29 +08:00
• e9a77576d8 fix imageKey for mapImageOfMessage nixzhu 2015-12-29 15:52:26 +08:00
• 7eb2d9b0e0 remove ChatTextContainerView nixzhu 2015-12-29 15:34:16 +08:00
• 76a4bfc2f7 clean code nixzhu 2015-12-29 15:23:02 +08:00
• 293cf4c858 prepareForMenuAction for ChatRightTextCell nixzhu 2015-12-29 15:20:41 +08:00
• ccb25ed435 deleteMessageFromServer nixzhu 2015-12-29 15:05:29 +08:00
• f0a7c2cc4c prepareForMenuAction to cancel tap from showing menu nixzhu 2015-12-29 14:40:35 +08:00
• 2ff43ac76e new logic for clearMessagesOfConversation nixzhu 2015-12-29 10:47:39 +08:00
• a4c82d6e08 mark deleted when delete message from others nixzhu 2015-12-29 10:37:07 +08:00
• 4a47544a0c rename deleteMessageAction for ChatBaseCell; disable ChatTextContainerView nixzhu 2015-12-29 10:13:26 +08:00
• 2a5c496b31 clean code cal bubbleFrame nixzhu 2015-12-29 10:05:44 +08:00
• d8215b77d3 Disable Staging kevinzhow 2015-12-28 21:27:28 +08:00
• a81b5b1c71 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-12-28 20:57:58 +08:00
• 405e56be92 Merge branch 'feature/soyep_API' into develop nixzhu 2015-12-28 19:28:12 +08:00
• 7c2ccc6e32 yepBaseURL feature/soyep_API nixzhu 2015-12-24 14:14:40 +08:00
• f9219e8325 Update version kevinzhow 2015-12-23 14:38:31 +08:00
• 61f98ca091 new way to report in Feeds nixzhu 2015-12-23 10:14:51 +08:00
• c40f0c14c2 test newAvatarURLString nixzhu 2015-12-22 14:36:42 +08:00
• 4c7f8062f8 api.soyep.com nixzhu 2015-12-22 10:44:23 +08:00
• a7b37ad893 Attachment & DiscoveredAttachment remove kind nixzhu 2015-12-21 17:01:55 +08:00
• 0de0f01b9c new way to create feed voice nixzhu 2015-12-21 16:43:48 +08:00
• 304010f487 rename attachments nixzhu 2015-12-21 16:36:56 +08:00
• f54911d9f5 new way to create Images Feed nixzhu 2015-12-21 16:35:20 +08:00
• 36e82d95c1 use tryUploadAttachment when sendMessage nixzhu 2015-12-21 15:04:19 +08:00
• 12390dd310 uploadAttachment nixzhu 2015-12-21 14:21:36 +08:00
• 446a068a69 use updateAvatarWithImageData when register nixzhu 2015-12-21 13:53:24 +08:00
• 98e3601278 use updateAvatarWithImageData nixzhu 2015-12-21 13:45:46 +08:00
• eba919c137 updateUserWithUserID avatar; syncMyInfo avatar nixzhu 2015-12-21 12:27:26 +08:00
• 94697845c2 updateAvatarWithImageData nixzhu 2015-12-21 12:22:01 +08:00
• 376e013db9 parseDiscoveredUser for avatar nixzhu 2015-12-21 10:23:38 +08:00
• 697a289b39 /api/v1 nixzhu 2015-12-21 10:17:16 +08:00
• 20e517aae1 new STAGING nixzhu 2015-12-21 09:23:46 +08:00
• de9ca597c8 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-12-19 17:17:45 +08:00
• bc448d53a8 update shellScript for ${PODS_ROOT}/Fabric/run nixzhu 2015-12-18 13:37:35 +08:00
• c73b417ae7 update Pods (Realm 0.97) nixzhu 2015-12-18 13:34:09 +08:00
• 8c8194ac3b trimming(.WhitespaceAndNewline) for NewFeed message nixzhu 2015-12-18 11:13:13 +08:00
• 24def648ff adjust messageTextView nixzhu 2015-12-18 11:02:39 +08:00
• c13e03930c ceil rect.width nixzhu 2015-12-18 10:54:24 +08:00
• a709640a85 Merge branch 'feature/feed_layout_cache' into develop nixzhu 2015-12-18 10:45:00 +08:00
• 746f74c215 adjust logoImageView.frame nixzhu 2015-12-18 10:43:33 +08:00
• f8a8c18cba opaque in FeedBasicCell nixzhu 2015-12-18 10:33:45 +08:00
• acfa27fa98 private; do not updateFeedCellLayout when updateFeeds completion (call heighOfFeeds will do it) nixzhu 2015-12-18 10:08:03 +08:00
• eabaf4cf7d static FeedsViewController.layoutPool for reuse nixzhu 2015-12-18 09:58:17 +08:00
• 36dffd8da0 FeedCellLayout do not consider needShowSkill nixzhu 2015-12-18 09:46:58 +08:00
• 7ab5d40f3d refactor needShowSkill nixzhu 2015-12-18 09:19:16 +08:00
• 5cc540e879 refactor heightOfFeed use FeedCellLayout nixzhu 2015-12-18 09:15:43 +08:00
• 1eaed84126 Disable AppSee kevinzhow 2015-12-17 23:31:37 +08:00
• 132f5e9e35 height in FeedCellLayout nixzhu 2015-12-17 19:07:20 +08:00
• 8dc82a7c39 delete FeedSocialWorkCell nixzhu 2015-12-17 19:00:01 +08:00
• 5a413b11c1 add FeedLocationCell nixzhu 2015-12-17 18:58:36 +08:00
• 578b1f070b add FeedVoiceCell nixzhu 2015-12-17 18:37:52 +08:00