4222 Commits
Author SHA1 Message Date
nixzhuandnixzhu a899a7fe71 rename touch actions; better comment 2015-10-16 13:43:15 +08:00
nixzhuandnixzhu 0378d3a335 make messageTextView can tap to push 2015-10-16 13:40:27 +08:00
nixzhuandnixzhu a877c27713 use FeedTextView to make textView in FeedCell & FeedView unselectable 2015-10-16 13:25:16 +08:00
nixzhuandnixzhu 4501622862 tap to switchFold for FeedView 2015-10-16 13:10:45 +08:00
nixzhuandnixzhu 88a31d69f0 show first line when fold FeedView 2015-10-16 13:04:48 +08:00
nixzhuandnixzhu d3e2aa9c64 fix calHeightOfMessageTextView 2015-10-16 12:51:07 +08:00
kevinzhow 1cb1c6cb39 Fix dribbble instagram order and wrong image bug 2015-10-16 09:41:33 +08:00
kevinzhow 82df60b46f Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-10-15 20:34:41 +08:00
nixzhuandnixzhu 104720af92 better logic for pick photos, done, and pick photos again 2015-10-15 20:32:54 +08:00
nixzhuandnixzhu cd105e9b3d clean some println 2015-10-15 20:18:54 +08:00
nixzhuandnixzhu c2be413001 better logic for PhotoCell requestImage 2015-10-15 20:15:18 +08:00
nixzhuandnixzhu 2cfa6d0c63 fix logic of photoPickedImageView.hidden when scroll 2015-10-15 20:11:15 +08:00
kevinzhow bfd3aa1522 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-10-15 18:24:45 +08:00
nixzhuandnixzhu 44eff2c0a6 try? realm.write 2015-10-15 15:50:45 +08:00
nixzhuandnixzhu 3516f2bfc7 update pods (Realm 0.96.0, Alamofire 3.0.0) 2015-10-15 15:39:12 +08:00
kevinzhow 4ccf904004 Update to 109 2015-10-15 15:29:47 +08:00
kevinzhow dabe919375 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-10-15 15:23:36 +08:00
kevinzhow 9fea342225 Update slice 2015-10-15 15:22:50 +08:00
nixzhuandnixzhu 4dae516a8b magic 2015-10-15 15:21:15 +08:00
nixzhuandnixzhu a620f8b98b prepareForReuse 2015-10-15 15:18:32 +08:00
nixzhuandnixzhu 1305dcdf73 fix a link detect bug in iOS (ref http://stackoverflow.com/a/19128056 ) 2015-10-15 15:11:54 +08:00
nixzhuandnixzhu 1307c2c89c detail 2015-10-15 15:06:19 +08:00
nixzhuandnixzhu 0f48b92bd1 replace messageLabel in FeedCell with messageTextView 2015-10-15 15:02:35 +08:00
nixzhuandnixzhu 31dc6c98c6 detect link in FeedView 2015-10-15 14:41:33 +08:00
kevinzhow bb3d6637b4 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-10-15 04:11:37 +08:00
nixzhu 9c70a864f0 Merge branch 'feature/pick_images_for_feed' into develop 2015-10-15 00:28:46 +08:00
nixzhuandnixzhu 7e35dacb42 logic of get images from PHAsset Set for done 2015-10-15 00:28:05 +08:00
kevinzhow 75e9b935b2 Move to web2.0 2015-10-14 21:46:14 +08:00
nixzhuandnixzhu 9dd515ac95 photos picked logic 2015-10-14 17:45:56 +08:00
nixzhuandnixzhu f7a2d5216c title & color 2015-10-14 17:27:52 +08:00
nixzhuandnixzhu 1f7b1e7e04 size & gap 2015-10-14 17:25:23 +08:00
nixzhuandnixzhu 32ce3431d0 add PickPhotosViewController & PhotoCell; basic logic to show Photos for pick 2015-10-14 16:58:03 +08:00
kevinzhow 7b0efe5f29 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-10-14 16:31:56 +08:00
kevinzhow 7e7758724b Pod now 2015-10-14 16:31:47 +08:00
nixzhuandnixzhu 83102c100c only when messageAge is New to adjust message's createdUnixTime 2015-10-14 15:08:54 +08:00
nixzhu 108bc8e3b5 Merge remote-tracking branch 'origin/develop' into develop 2015-10-14 14:54:35 +08:00
nixzhuandnixzhu 6e78e1ba86 fix some FeedConversationCell may show other's media images when it has not any image URLs. 2015-10-14 14:53:18 +08:00
nixzhuandnixzhu c1511723c4 make messagesBunchCount 30 2015-10-14 14:44:01 +08:00
nixzhuandnixzhu 68a62b08ee better logic for pull to load old messages (we may have old messages in local) 2015-10-14 14:43:25 +08:00
nixzhuandnixzhu 6690b95f5e add MessageAge to present message is old or new; better handleReceivedNewMessagesNotification; use messageAge to insert in adjustConversationCollectionViewWithMessageIDs 2015-10-14 14:35:45 +08:00
nixzhuandnixzhu d34c078eef pull to load group old messages 2015-10-14 13:25:59 +08:00
kevinzhow 8ba65a0f3e Pod back 2015-10-13 20:35:41 +08:00
kevinzhow 1e535ab154 Fix feed media view shows wrong image 2015-10-13 20:34:48 +08:00
kevinzhow 90b2b0eab4 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-10-13 19:28:19 +08:00
nixzhuandnixzhu 2fedca6543 faster 2015-10-13 19:23:17 +08:00
nixzhuandnixzhu 7bd32bc7ab details of simulate 2015-10-13 19:18:48 +08:00
kevinzhow bf8f21b709 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-10-13 19:07:33 +08:00
nixzhuandnixzhu d52d21cdfb add TouchClosuresView; make a better simulate select effects when tap on cell.mediaCollectionView's space part 2015-10-13 19:05:53 +08:00
nixzhuandnixzhu c2b8a81ea0 add tapMediaCollectionViewBackgroundViewAction to simulate select cell when tap on space part on FeedCell's mediaCollectionView 2015-10-13 18:45:51 +08:00
kevinzhow 54653b483c Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-10-13 18:01:49 +08:00