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

• d2a58061b8 menu position nixzhu 2015-07-23 14:52:02 +08:00
• 12676b4345 local string nixzhu 2015-07-23 14:35:29 +08:00
• de3c315032 hide logic nixzhu 2015-07-23 14:34:15 +08:00
• e865b5a7c7 cell longPress show menu nixzhu 2015-07-23 14:30:45 +08:00
• 6bfab45aab set BubbleMenuView Item action nixzhu 2015-07-23 13:08:55 +08:00
• 7f387b49d1 add BubbleMenuView nixzhu 2015-07-23 12:53:18 +08:00
• d0e7264644 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-07-22 18:14:09 +08:00
• e9ef36a323 Update version kevinzhow 2015-07-22 18:13:56 +08:00
• 494703c37f fix skillsFromUserSkillList (server dot return skillCategory, and relogin will lose skillCategory) nixzhu 2015-07-22 17:37:45 +08:00
• c78cf7cf38 delete UIDevice+Yep nixzhu 2015-07-22 17:32:24 +08:00
• 3ac46f534f use Ruler nixzhu 2015-07-22 17:31:20 +08:00
• d64a45cadd add pod Ruler nixzhu 2015-07-22 17:16:40 +08:00
• eb046d9e32 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-07-22 07:02:42 +08:00
• b2ff9cedef Update version kevinzhow 2015-07-22 07:02:29 +08:00
• 9b131f0267 Merge branch 'feature/skill_cover' into develop nixzhu 2015-07-21 16:22:27 +08:00
• d1979555f1 faster imagePicker appear in EditProfile nixzhu 2015-07-21 16:22:09 +08:00
• f69167147f faster imagePicker appear nixzhu 2015-07-21 16:18:09 +08:00
• 9eefda07dd show action sheet for changeCoverAction nixzhu 2015-07-21 16:09:14 +08:00
• bd07a365b0 do not set navigationBar.tintColor in CustomNavigationBarViewController nixzhu 2015-07-21 15:56:37 +08:00
• ade0cc1065 block UI when update skill cover nixzhu 2015-07-21 15:42:24 +08:00
• dad24d7aba we need updateProfileCollectionView afterUpdatedSkillCoverAction nixzhu 2015-07-21 15:27:02 +08:00
• 66ffc58a36 show skill cover nixzhu 2015-07-21 15:14:36 +08:00
• 640ad4226e updateCoverOfSkillWithSkillID nixzhu 2015-07-21 14:40:11 +08:00
• fc54238ad6 upload skill cover nixzhu 2015-07-21 14:25:44 +08:00
• a6f0a30c20 tap SkillHome headerImageView to pick image nixzhu 2015-07-21 14:09:11 +08:00
• eaea2ea0d4 code order nixzhu 2015-07-21 13:52:22 +08:00
• fe88f772e2 code order nixzhu 2015-07-21 13:41:28 +08:00
• 20296f1b5e Done nixzhu 2015-07-21 13:30:28 +08:00
• eb8f2a4c2c Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-07-21 06:51:06 +08:00
• 4a935420d0 base color of MessageLoadingProgressView nixzhu 2015-07-20 19:11:49 +08:00
• 7779dde0b4 when send image, resize to smaller, not need fixRotation nixzhu 2015-07-20 19:06:43 +08:00
• 6ab31536c6 print if can not download attachments of message nixzhu 2015-07-20 18:40:01 +08:00
• 2b52c32129 fix generate tasks nixzhu 2015-07-20 18:33:17 +08:00
• 6b3fc1bdc6 fix handleData nixzhu 2015-07-20 18:15:28 +08:00
• 7f80bfabfd better logic for set downloadState (Video need more consideration) nixzhu 2015-07-20 18:14:23 +08:00
• 06b64ce826 better logic for totalProgress nixzhu 2015-07-20 17:44:28 +08:00
• 5715720de7 logic for remove finished ProgressReporter nixzhu 2015-07-20 17:35:35 +08:00
• 69b1d1c92a refactor nixzhu 2015-07-20 17:13:37 +08:00
• 6fc286e39c clean code nixzhu 2015-07-20 16:56:09 +08:00
• ae4a8a00a0 refactor ProgressReporter nixzhu 2015-07-20 16:54:15 +08:00
• 21c200c81b clean code nixzhu 2015-07-20 16:31:53 +08:00
• a96afe8ecf better logic for download progress report nixzhu 2015-07-20 16:26:32 +08:00
• 48c90b1fa3 undo nixzhu 2015-07-20 14:21:16 +08:00
• a47cc29a59 Merge remote-tracking branch 'origin/develop' into develop nixzhu 2015-07-20 14:13:22 +08:00
• a7aa42d0b2 better set loadingProgress logic nixzhu 2015-07-20 14:12:55 +08:00
• 5d2f410aee Update version kevinzhow 2015-07-18 16:34:04 +08:00
• 400c9508ff Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-07-17 20:13:57 +08:00
• b4c87a0129 Update version kevinzhow 2015-07-17 20:13:47 +08:00
• 19f1c685a7 Merge branch 'feature/better_meta_data' into develop nixzhu 2015-07-17 16:23:57 +08:00
• 2742749c06 rename nixzhu 2015-07-17 16:20:24 +08:00
• 3bdafe0acf delete all mediaMetaDatas when clearMessages for delete conversation nixzhu 2015-07-17 16:15:23 +08:00
• 9402f2d72b in deleteMessageAction, delete mediaMetaData while delete message nixzhu 2015-07-17 16:10:34 +08:00
• fe04addcf3 convert metaData (String) to MediaMetaData (NSData); better meta data use logic nixzhu 2015-07-17 16:05:51 +08:00
• b357138ce6 Merge branch 'feature/video64' into develop nixzhu 2015-07-17 13:54:08 +08:00
• 5d920e90f6 fix downloading progress of video nixzhu 2015-07-17 13:53:53 +08:00
• fb513bbd0c pack blurredThumbnail string when send video nixzhu 2015-07-17 13:18:30 +08:00
• fd99ee89f8 progress nixzhu 2015-07-17 13:01:24 +08:00
• fdb5c99d23 config imageAppearDuration nixzhu 2015-07-17 12:51:46 +08:00
• 655922b335 use fileName to cal preloadingPropgress nixzhu 2015-07-17 12:44:43 +08:00
• 65b86e16b9 better logic of imageOfMessage nixzhu 2015-07-16 19:41:13 +08:00
• 020a1c6963 modify userSkillsFromSkillsData (server may not return category) nixzhu 2015-07-16 12:52:28 +08:00
• a232fdbf25 Merge branch 'feature/faster_cache' into develop nixzhu 2015-07-16 12:43:06 +08:00
• 9141b18c5b refactor nixzhu 2015-07-16 12:42:52 +08:00
• fb599736e4 pre cache message image or thumbnail nixzhu 2015-07-16 12:35:51 +08:00
• b01713a01e pre cache all chat size avatar nixzhu 2015-07-16 11:44:07 +08:00
• 17b2548026 config ChatCell centerXOffset nixzhu 2015-07-16 11:09:48 +08:00
• 7aee9f6585 Merge branch 'feature/base64' into develop nixzhu 2015-07-16 00:41:44 +08:00
• a5154f5259 config video meta data name nixzhu 2015-07-16 00:38:28 +08:00
• 8660af1797 prepare thumbnail not in main queue nixzhu 2015-07-16 00:31:00 +08:00
• 18b5837c18 loadingProgressView position & play position nixzhu 2015-07-15 23:33:56 +08:00
• 7c70609a32 avoid fixRotation in ImageCache (it will generate bitmap, use too much memory) nixzhu 2015-07-15 23:09:51 +08:00
• 64a2f82282 cache bubblebBlurredThumbnailImage nixzhu 2015-07-15 20:24:33 +08:00
• 528dd33db7 fix thumbnailHeight nixzhu 2015-07-15 20:13:29 +08:00
• cdb4e2da27 show blurredThumbnailImageOfMessage before show full image nixzhu 2015-07-15 19:56:55 +08:00
• d552efb288 config MetaData nixzhu 2015-07-15 19:29:47 +08:00
• 4a9e3a88f0 pack blurred_thumbnail_string into meta data when sendImage nixzhu 2015-07-15 19:21:43 +08:00
• 35247f8588 return support when input mobile nixzhu 2015-07-15 14:52:36 +08:00
• 067619cea3 try play next audio after play current one from friend nixzhu 2015-07-15 14:18:55 +08:00
• 40188441e9 use nameWithArrow on Discover nixzhu 2015-07-15 13:56:58 +08:00
• 71e9bbb754 update pod Proposer nixzhu 2015-07-15 13:56:37 +08:00
• a284e96b83 Update Pods kevinzhow 2015-07-15 05:51:16 +08:00
• 97ba3469cd Fix voice record crash bug kevinzhow 2015-07-15 05:41:53 +08:00
• 9e0e70aece Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-07-15 05:34:08 +08:00
• 961c8e5d72 Update kevinzhow 2015-07-15 05:33:58 +08:00
• 117afa2519 mark Unavailable skills nixzhu 2015-07-14 15:05:12 +08:00
• fbd5ca443b make sure get skillCategories before presentSelectSkills nixzhu 2015-07-14 14:40:34 +08:00
• d623cb9bf9 fix update lastTimeMessagesCount after deleteMessageAction nixzhu 2015-07-14 11:51:00 +08:00
• 6ffd05bbe7 need cal currentIndexPath for deleteMessageAction nixzhu 2015-07-14 11:42:10 +08:00
• 1e9489811a adjust layout of SettingsUserCell nixzhu 2015-07-13 16:55:15 +08:00
• 69be83b142 trim space of newline of newIntroduction nixzhu 2015-07-13 16:47:00 +08:00
• f4c221f963 better logic for newMessagesCount nixzhu 2015-07-13 16:34:15 +08:00
• 3fb77b57a5 fix preview animation for iOS 9 nixzhu 2015-07-13 16:19:14 +08:00
• 6eb9f7b154 hideStatusBar after viewDidAppear in Preview nixzhu 2015-07-13 15:29:41 +08:00
• 5385d2bf44 not print nixzhu 2015-07-13 14:43:32 +08:00
• ec674b0737 only record draft's text when BeginTextInput & TextInputing nixzhu 2015-07-13 14:38:25 +08:00
• 3fc1e2dc5a use lazy for imagePicker (touch it when tap +) nixzhu 2015-07-13 14:28:18 +08:00
• bb3577ade1 Resume background music kevinzhow 2015-07-13 13:35:46 +08:00
• e7db20475b Fix Swift Debug kevinzhow 2015-07-12 18:43:58 +08:00
• 976cfc883a Faster pick image and Debug optimization kevinzhow 2015-07-12 18:31:10 +08:00
• d74ad72e1e Merge branch 'feature/propose' into develop nixzhu 2015-07-11 14:27:12 +08:00