4222 Commits
Author SHA1 Message Date
kevinzhow dbe93f3383 Add Color 2015-10-12 13:45:16 +08:00
kevinzhow 1a8ad24edc Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-10-12 13:04:23 +08:00
kevinzhow 0907847c13 Update 2015-10-12 13:04:02 +08:00
nixzhuandnixzhu 59490e81db showConversation from FeedConversationsViewController 2015-10-12 12:31:42 +08:00
nixzhuandnixzhu f15fa2d216 FeedConversationCell separatorInset 2015-10-12 12:25:15 +08:00
nixzhuandnixzhu 420cbc7875 adjust nameLabel's length in FeedConversationCell 2015-10-12 12:23:27 +08:00
nixzhuandnixzhu 9f5154f77e unreadCountLabel in FeedConversationCell 2015-10-12 12:20:59 +08:00
nixzhuandnixzhu d8fcc12e1e show feedConversations in FeedConversationsViewController 2015-10-12 12:11:44 +08:00
nixzhuandnixzhu 28f06ffc18 add FeedConversationCell 2015-10-12 11:57:35 +08:00
nixzhuandnixzhu 4abd420741 showFeedConversations 2015-10-12 11:35:22 +08:00
nixzhuandnixzhu f0e63c0c5e add FeedConversationDockCell 2015-10-12 11:33:11 +08:00
nixzhuandnixzhu 6c9f6c5eef Section for ConversationsViewController 2015-10-12 11:15:51 +08:00
nixzhuandnixzhu ef76a76aeb add FeedConversationsViewController 2015-10-12 11:03:08 +08:00
nixzhu 5f03a48324 Merge remote-tracking branch 'origin/develop' into develop 2015-10-12 10:45:30 +08:00
nixzhuandnixzhu 1aebdf8fa9 better messageLabelTrailingConstraint logic (consider attachmentURLs) 2015-10-12 10:37:06 +08:00
kevinzhow b68431e335 Back pod 2015-10-10 23:07:22 +08:00
kevinzhow d432d7ebf9 Show Skills for Test 2015-10-10 23:06:54 +08:00
kevinzhow 7adf022b1c Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-10-10 22:55:06 +08:00
kevinzhow 4374ee9d9b Use new discover view 2015-10-10 22:54:52 +08:00
nixzhuandnixzhu 708e168363 fix tryScrollToBottom (consider feedViewHeight) 2015-10-10 17:03:35 +08:00
kevinzhow e0b652b0cc Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-10-10 16:38:09 +08:00
nixzhuandnixzhu 0ebdb3c858 showProfileFromFeedView 2015-10-10 15:18:23 +08:00
nixzhuandnixzhu 9299c8dfe8 showProfile when tap Avatar in FeedCell 2015-10-10 15:08:54 +08:00
kevinzhow 32cc7dc31b Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-10-10 14:36:13 +08:00
kevinzhow e13150c280 Save 2015-10-10 14:36:05 +08:00
nixzhuandnixzhu c68826357f better logic for when cell inGroup to hide dotImageView 2015-10-10 14:32:24 +08:00
nixzhuandnixzhu a020b5e34c fix FeedView layout 2015-10-10 13:45:12 +08:00
nixzhuandnixzhu 7a9796cb51 remove unused constraints in FeedView & FeedCell 2015-10-10 13:35:10 +08:00
nixzhuandnixzhu 9a5dc9ae83 fix TPKeyboardAvoiding link 2015-10-10 13:18:55 +08:00
nixzhuandnixzhu dfbde89c4f pod Alamofire helps 2015-10-10 13:17:44 +08:00
kevinzhow 6540ccedf1 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-10-10 11:37:27 +08:00
kevinzhow 1801fd290b Update 2015-10-10 11:36:41 +08:00
nixzhu 1707e7cc6f Merge branch 'feature/feed_preview' into develop 2015-10-10 11:35:27 +08:00
nixzhuandnixzhu 1579ec23af fix send video to group with metadata 2015-10-10 11:35:16 +08:00
nixzhuandnixzhu c91ffd3e7d fix send image to group with metadata 2015-10-10 11:34:00 +08:00
nixzhuandnixzhu db984546cd preview image in FeedView 2015-10-10 10:43:22 +08:00
nixzhuandnixzhu 9f56a29666 dismiss crossover detail 2015-10-10 10:29:18 +08:00
nixzhuandnixzhu f790274f26 share feed's image 2015-10-10 10:18:19 +08:00
nixzhuandnixzhu f3f1616bf4 crossover feed's image preview 2015-10-10 10:13:16 +08:00
nixzhuandnixzhu 3782eb6352 if isFeedMedia, logic of frame & transitionViewSnapshot 2015-10-09 17:22:12 +08:00
nixzhuandnixzhu e07d016234 add enum PreviewMedia for MessageMediaViewController; basic logic to preview feed's image 2015-10-09 15:38:39 +08:00
nixzhuandnixzhu 72513bac64 frame & transitionView 2015-10-09 15:07:50 +08:00
nixzhuandnixzhu 87a26889eb basic logic of transition from Feeds to MessageMedia 2015-10-09 14:55:29 +08:00
nixzhuandnixzhu ab5030d93e mediaCollectionView.scrollsToTop = false (otherwise it will broke feedsTableView's scrollsToTop) 2015-10-09 13:34:37 +08:00
nixzhuandnixzhu 5dcd22173b new layout of mediaCollectionView in FeedView 2015-10-09 13:23:32 +08:00
nixzhuandnixzhu 2bdfd6b7c3 new layout of mediaCollectionView in FeedCell 2015-10-09 13:19:50 +08:00
nixzhuandnixzhu 0847cf6f97 fix insert feed in afterCreatedFeedAction 2015-10-09 11:15:20 +08:00
kevinzhow bc70541cad Fix Dot view on group 2015-10-08 21:54:05 +08:00
kevinzhow 32b56d692d Fix group message send status 2015-10-08 21:20:01 +08:00
kevinzhow ed91634291 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-10-08 19:50:06 +08:00