4222 Commits
Author SHA1 Message Date
kevinzhow 54b4d2b47d Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-12-15 22:38:34 +08:00
nixzhu a75b8e4a2e Merge branch 'feature/feeds_scroll_smooth' into develop 2015-12-15 18:26:33 +08:00
nixzhu 5aadc11cae refactor timeAndDistanceString of DiscoveredFeed 2015-12-15 18:00:05 +08:00
nixzhu 327c1e18fb merge leftBottomLabel for Feed Cells 2015-12-15 17:52:11 +08:00
nixzhu 81969a4e9e Merge branch 'feature/feeds_scroll_smooth' into develop 2015-12-15 17:19:38 +08:00
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 973dd0f6bf more FPSLabels for important VCs 2015-12-15 14:11:53 +08:00
nixzhu 3af6abfd24 FPSLabel update 4 times in 1 second, color red if fps drop to 50 2015-12-15 14:01:27 +08:00
nixzhu 48b5297967 locationMapImageView show indicator 2015-12-15 13:50:52 +08:00
nixzhu 5f05f2ff1a show FPS for Discover 2015-12-15 13:38:05 +08:00
nixzhu 61051a62fe opaque of DiscoverCardUserCell 2015-12-15 13:33:54 +08:00
nixzhu d143b87a0c ContactsCell & Discover Normal 2015-12-15 13:27:49 +08:00
nixzhu abeec40688 set opaque of subviews for ConversationCell & FeedConversationDockCell ... 2015-12-15 13:23:26 +08:00
nixzhu 15f3a56a52 set opaque of subviews for Feed Cells 2015-12-15 13:12:01 +08:00
nixzhu 1072acc681 use feedsFPSLabel for DEBUG 2015-12-15 11:10:26 +08:00
nixzhu 79f3157edf add FPSLabel 2015-12-15 11:04:19 +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