4222 Commits
Author SHA1 Message Date
kevinzhow d0e7264644 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-07-22 18:14:09 +08:00
kevinzhow e9ef36a323 Update version 2015-07-22 18:13:56 +08:00
nixzhu 494703c37f fix skillsFromUserSkillList (server dot return skillCategory, and relogin will lose skillCategory) 2015-07-22 17:37:45 +08:00
nixzhu c78cf7cf38 delete UIDevice+Yep 2015-07-22 17:32:24 +08:00
nixzhu 3ac46f534f use Ruler 2015-07-22 17:31:20 +08:00
nixzhu d64a45cadd add pod Ruler 2015-07-22 17:16:40 +08:00
kevinzhow eb046d9e32 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-07-22 07:02:42 +08:00
kevinzhow b2ff9cedef Update version 2015-07-22 07:02:29 +08:00
nixzhu 9b131f0267 Merge branch 'feature/skill_cover' into develop 2015-07-21 16:22:27 +08:00
nixzhu d1979555f1 faster imagePicker appear in EditProfile 2015-07-21 16:22:09 +08:00
nixzhu f69167147f faster imagePicker appear 2015-07-21 16:18:09 +08:00
nixzhu 9eefda07dd show action sheet for changeCoverAction 2015-07-21 16:09:14 +08:00
nixzhu bd07a365b0 do not set navigationBar.tintColor in CustomNavigationBarViewController 2015-07-21 15:56:37 +08:00
nixzhu ade0cc1065 block UI when update skill cover 2015-07-21 15:42:24 +08:00
nixzhu dad24d7aba we need updateProfileCollectionView afterUpdatedSkillCoverAction 2015-07-21 15:27:02 +08:00
nixzhu 66ffc58a36 show skill cover 2015-07-21 15:14:36 +08:00
nixzhu 640ad4226e updateCoverOfSkillWithSkillID 2015-07-21 14:40:11 +08:00
nixzhu fc54238ad6 upload skill cover 2015-07-21 14:25:44 +08:00
nixzhu a6f0a30c20 tap SkillHome headerImageView to pick image 2015-07-21 14:09:11 +08:00
nixzhu eaea2ea0d4 code order 2015-07-21 13:52:22 +08:00
nixzhu fe88f772e2 code order 2015-07-21 13:41:28 +08:00
nixzhu 20296f1b5e Done 2015-07-21 13:30:28 +08:00
kevinzhow eb8f2a4c2c Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-07-21 06:51:06 +08:00
nixzhu 4a935420d0 base color of MessageLoadingProgressView 2015-07-20 19:11:49 +08:00
nixzhu 7779dde0b4 when send image, resize to smaller, not need fixRotation 2015-07-20 19:06:43 +08:00
nixzhu 6ab31536c6 print if can not download attachments of message 2015-07-20 18:40:01 +08:00
nixzhu 2b52c32129 fix generate tasks 2015-07-20 18:33:17 +08:00
nixzhu 6b3fc1bdc6 fix handleData 2015-07-20 18:15:28 +08:00
nixzhu 7f80bfabfd better logic for set downloadState (Video need more consideration) 2015-07-20 18:14:23 +08:00
nixzhu 06b64ce826 better logic for totalProgress 2015-07-20 17:44:28 +08:00
nixzhu 5715720de7 logic for remove finished ProgressReporter 2015-07-20 17:35:35 +08:00
nixzhu 69b1d1c92a refactor 2015-07-20 17:13:37 +08:00
nixzhu 6fc286e39c clean code 2015-07-20 16:56:09 +08:00
nixzhu ae4a8a00a0 refactor ProgressReporter 2015-07-20 16:54:15 +08:00
nixzhu 21c200c81b clean code 2015-07-20 16:31:53 +08:00
nixzhu a96afe8ecf better logic for download progress report 2015-07-20 16:26:32 +08:00
nixzhu 48c90b1fa3 undo 2015-07-20 14:21:16 +08:00
nixzhu a47cc29a59 Merge remote-tracking branch 'origin/develop' into develop 2015-07-20 14:13:22 +08:00
nixzhu a7aa42d0b2 better set loadingProgress logic 2015-07-20 14:12:55 +08:00
kevinzhow 5d2f410aee Update version 2015-07-18 16:34:04 +08:00
kevinzhow 400c9508ff Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-07-17 20:13:57 +08:00
kevinzhow b4c87a0129 Update version 2015-07-17 20:13:47 +08:00
nixzhu 19f1c685a7 Merge branch 'feature/better_meta_data' into develop 2015-07-17 16:23:57 +08:00
nixzhu 2742749c06 rename 2015-07-17 16:20:24 +08:00
nixzhu 3bdafe0acf delete all mediaMetaDatas when clearMessages for delete conversation 2015-07-17 16:15:23 +08:00
nixzhu 9402f2d72b in deleteMessageAction, delete mediaMetaData while delete message 2015-07-17 16:10:34 +08:00
nixzhu fe04addcf3 convert metaData (String) to MediaMetaData (NSData); better meta data use logic 2015-07-17 16:05:51 +08:00
nixzhu b357138ce6 Merge branch 'feature/video64' into develop 2015-07-17 13:54:08 +08:00
nixzhu 5d920e90f6 fix downloading progress of video 2015-07-17 13:53:53 +08:00
nixzhu fb513bbd0c pack blurredThumbnail string when send video 2015-07-17 13:18:30 +08:00