Commit Graph
3657 Commits
Author SHA1 Message Date
kevinzhow f23e6e2861 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-12-15 16:03:09 +08:00
kevinzhow 3fad0bcbc1 Update 2015-12-15 16:02:55 +08:00
nixzhu 0008756fca add lines for NewFeed 2015-12-15 10:26:15 +08:00
nixzhu 9a17dbe844 adjust more line 2015-12-15 10:23:28 +08:00
nixzhu 887334f609 update SubscribeView & FeedView 2015-12-15 10:17:33 +08:00
nixzhu db75b59555 add positionStyle for HorizontalLineView 2015-12-15 10:05:48 +08:00
nixzhu 4d04cd200e hide messageCountLabel for Feed Cells if feed.messagesCount == 0 2015-12-15 09:52:24 +08:00
nixzhu 0c9ea054a9 fix auto layout in RegisterPickSkills 2015-12-15 09:39:53 +08:00
nixzhu 2352327daf adjust logic for nextButton.enabled when register 2015-12-15 09:22:57 +08:00
kevinzhow 3c04a230a7 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-12-15 00:27:11 +08:00
nixzhu 2b87ca3ee2 do not show forked repo 2015-12-14 17:30:47 +08:00
nixzhu aaaa2cb7d7 offline discoveredUsers 2015-12-14 17:00:20 +08:00
nixzhu 62bb3be8e5 clean code 2015-12-14 16:48:11 +08:00
nixzhu ec67dd545d better logic for set socialWork in ProfileSocialAccount 2015-12-14 16:46:48 +08:00
kevinzhow cd28d6dc1f Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-12-14 16:37:00 +08:00
kevinzhow 99b68f3778 Update version 2015-12-14 16:36:52 +08:00
nixzhu 269c3822c2 better logic for set feedAttachments in ProfileFeedsCell 2015-12-14 16:22:05 +08:00
kevinzhow 699a8e27b2 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-12-14 16:21:36 +08:00
nixzhu 27249492e4 Merge branch 'feature/push_check' into develop 2015-12-14 15:52:01 +08:00
nixzhu 06206fbf4d add shouldPerformSegueWithIdentifier for all segues 2015-12-14 15:51:21 +08:00
nixzhu e13e6d2d49 defer all deselectRowAtIndexPath 2015-12-14 15:30:42 +08:00
nixzhu 94ea7c3a24 check topViewController before show from Feeds 2015-12-14 15:30:18 +08:00
nixzhu ed4840ed4a another way check topViewController before show from FeedConversations 2015-12-14 15:21:00 +08:00
nixzhu 180ec0f4be check topViewController before show from Conversations 2015-12-14 15:16:34 +08:00
kevinzhow 3ecdf51c5a Update place holder 2015-12-14 14:36:33 +08:00
nixzhu 1c41a793cb Merge branch 'feature/upload_media_extend_name' into develop 2015-12-14 11:26:28 +08:00
nixzhu 45e1307c7c use FileExtension for local file name 2015-12-14 11:26:17 +08:00
nixzhu ddd749f31d rename FileExtension cases 2015-12-14 11:14:57 +08:00
nixzhu b2ec085d56 update s3UploadFileOfKind withFileExtension 2015-12-14 10:56:40 +08:00
nixzhu 579d6c5ad0 add FileExtension 2015-12-14 10:36:54 +08:00
nixzhu c4b4f21f2e use UploadState for create Feed 2015-12-14 10:10:24 +08:00
nixzhu 7e08e51330 trans 2015-12-14 09:47:25 +08:00
nixzhu 95bc67b64b guard voice upload success to create Feed 2015-12-14 09:42:24 +08:00
nixzhu c738ba064c guard all mediaImages upload to create Feed 2015-12-14 09:37:55 +08:00
nixzhu 6239bac04c split uploadImagesGroup & uploadVoiceGroup 2015-12-14 09:27:13 +08:00
nixzhu 43a6e49005 update get DeviceGuru.hardwareDescription 2015-12-14 09:18:45 +08:00
nixzhu 1963e185c4 update pods 2015-12-14 09:13:27 +08:00
kevinzhow 06b2c3a122 Fix feed view distance 2015-12-13 12:50:11 +08:00
kevinzhow 452b5e7ada Make sure not showing message created by userself 2015-12-13 12:44:11 +08:00
kevinzhow 8e4634975f Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-12-13 12:24:05 +08:00
kevinzhow 5f494e87fc Update version 2015-12-13 12:23:40 +08:00
nixzhu 534f6e3006 update pod Kingfisher 1.8.4, recover MediaOptionsInfos for Dribbble's GIF 2015-12-12 18:28:50 +08:00
kevinzhow 84f83e12ff Update version 2015-12-12 17:27:16 +08:00
kevinzhow 6e2afce551 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-12-12 17:22:18 +08:00
nixzhu b54c825b9c Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-12-12 16:44:32 +08:00
nixzhu d1ff6acbec fix gif animation in Feeds 2015-12-12 16:40:04 +08:00
kevinzhow 26df5929e6 Enable appsee 2015-12-12 15:04:49 +08:00
kevinzhow a36fc1ae6f Fix feed order on profile 2015-12-12 14:53:16 +08:00
kevinzhow 349bbc2fec Dribbble GIF may only animate when hidpi & May less of description 2015-12-12 14:43:23 +08:00
kevinzhow aa34d8b4f8 Update version 2015-12-12 01:20:51 +08:00