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

• be66341b18 Message nixzhu 2015-09-09 23:25:28 +08:00
• fc6e8c471d Media nixzhu 2015-09-09 23:11:54 +08:00
• feb7756186 clean code nixzhu 2015-09-09 22:58:04 +08:00
• cf2eed2c51 two type WeChatActivity nixzhu 2015-09-09 22:51:39 +08:00
• 60b76bad20 basic logic for share link to WeChat nixzhu 2015-09-09 20:05:13 +08:00
• 06b2a57b2a add WeixinSDK (Fuck it!) nixzhu 2015-09-09 18:36:20 +08:00
• 75aa10581c add WeChatActivity nixzhu 2015-09-09 18:08:19 +08:00
• a2099dbbee Fix not now kevinzhow 2015-09-09 16:44:53 +08:00
• 79ba038b8a Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-09-09 16:32:43 +08:00
• bbe51fb414 Update podfile kevinzhow 2015-09-09 16:32:27 +08:00
• a7066a4666 make distanceThreshold 500 nixzhu 2015-09-09 15:19:37 +08:00
• 395b0df969 no force unwrap in cURLCommandLine nixzhu 2015-09-09 15:07:11 +08:00
• 3dd70dc7aa make sure customNavigationBar's color is normal nixzhu 2015-09-09 14:43:46 +08:00
• 0c4ae12355 window?.tintAdjustmentMode = .Normal nixzhu 2015-09-09 14:29:36 +08:00
• f1b9d8ca2e use YepConfig.ChatCell.playImageViewXOffset nixzhu 2015-09-09 14:20:52 +08:00
• 58282dbd73 fix loadingProgressView's center for ChatLeftImageCell nixzhu 2015-09-09 14:10:43 +08:00
• 7044068346 fix typo "dready" nixzhu 2015-09-09 14:03:28 +08:00
• 0d223348dd fix chat image may have white line nixzhu 2015-09-09 12:08:13 +08:00
• e399bd3279 better logic get fakeID nixzhu 2015-09-09 10:59:56 +08:00
• aacabf4105 Merge branch 'feature/curl' into develop nixzhu 2015-09-08 23:09:28 +08:00
• 6d5bc33242 println(request.cURLCommandLine) when get error nixzhu 2015-09-08 23:09:05 +08:00
• f2bcecb9d4 add NSURLRequest+cURL nixzhu 2015-09-08 23:07:49 +08:00
• d0082ca9bf fix shareProfileWithUsername nixzhu 2015-09-08 19:49:20 +08:00
• 985567fb65 add settingsForUserWithUserID for Conversation's moreAction (now can not update stranger info before view it's profile) nixzhu 2015-09-08 16:25:58 +08:00
• da0921fc8a trans for Add to Me nixzhu 2015-09-08 15:32:16 +08:00
• 1445e50029 alert Success for addSkillToMe nixzhu 2015-09-08 15:25:58 +08:00
• 854cff5c8a remove rightBarButtonItem when addSkillToMe success, then sync nixzhu 2015-09-08 15:15:09 +08:00
• 21faf11937 Choose Skill Set nixzhu 2015-09-08 15:09:41 +08:00
• 6b8baf6b13 addSkillToMeButton in SkillHomeViewController nixzhu 2015-09-08 14:49:18 +08:00
• 9dd186b004 sort pods nixzhu 2015-09-08 14:17:45 +08:00
• 9aacd5fb7b save username when sayHi nixzhu 2015-09-08 13:57:25 +08:00
• 76cd919eeb Merge branch 'feature/share_with_username' into develop nixzhu 2015-09-08 13:54:31 +08:00
• 371be8490e trans of create username for share profile nixzhu 2015-09-08 13:51:33 +08:00
• 2a55775ec1 better placeholder nixzhu 2015-09-08 13:41:27 +08:00
• 3420b4c105 doShareProfile nixzhu 2015-09-08 13:27:23 +08:00
• 8d8970cd86 share profileURL nixzhu 2015-09-08 12:46:09 +08:00
• 54ab31a337 create username nixzhu 2015-09-08 12:35:39 +08:00
• 217eced1ac alert Create a username nixzhu 2015-09-08 12:00:00 +08:00
• 12985bb92a better logic for add shareButton nixzhu 2015-09-08 11:18:04 +08:00
• a8387e0f8f add share button in Profile nixzhu 2015-09-08 11:04:39 +08:00
• 3c7f2b6657 LoginUser & DiscoveredUser add username nixzhu 2015-09-08 10:28:06 +08:00
• 718e92270b update username in updateUserWithUserID; nixzhu 2015-09-08 10:27:46 +08:00
• 5c76feed13 add username to User nixzhu 2015-09-08 10:19:01 +08:00
• 7b86837f12 Merge remote-tracking branch 'origin/develop' into develop nixzhu 2015-09-08 09:41:12 +08:00
• cbe8723b62 Merge branch 'feature/no_autolayout_chat_cells' into develop nixzhu 2015-09-08 09:40:12 +08:00
• e96950fdf6 only recover state that don't change height feature/no_autolayout_chat_cells nixzhu 2015-09-07 18:33:12 +08:00
• e907855089 do no recover messageToolbar.state when old state is Text, but we set draft text nixzhu 2015-09-07 18:11:56 +08:00
• 6ffa1c8b12 use YepConfig.ChatCell.gapBetweenAvatarImageViewAndBubble nixzhu 2015-09-07 17:19:19 +08:00
• 8894b50c34 use YepConfig.ChatCell.gapBetweenDotImageViewAndBubble nixzhu 2015-09-07 17:09:46 +08:00
• 30e29ad87a min of audio simpleViewWidth nixzhu 2015-09-07 17:04:55 +08:00
• a195a6a2dc clean code nixzhu 2015-09-07 16:59:38 +08:00
• e69432776f use magicWidth after sizeThatFits in ChatText cells nixzhu 2015-09-07 16:41:46 +08:00
• c7a92541e1 xOffset of pin in mapImageOfMessage nixzhu 2015-09-07 16:19:49 +08:00
• 0043a8a4a3 frame layout of ChatLeftLocationCell nixzhu 2015-09-07 16:15:28 +08:00
• a491c39f6d frame layout of ChatRightLocationCell nixzhu 2015-09-07 16:13:06 +08:00
• f642c7eceb audio cell detail nixzhu 2015-09-07 15:38:51 +08:00
• 4193c1bfdc frame layout of ChatLeftAudioCell nixzhu 2015-09-07 15:36:02 +08:00
• 522e371564 frame layout of ChatRightAudioCell nixzhu 2015-09-07 15:25:31 +08:00
• 87b552f526 frame layout of ChatLeftVideoCell nixzhu 2015-09-07 15:11:12 +08:00
• ebe422d927 frame layout of ChatRightVideoCell nixzhu 2015-09-07 15:05:53 +08:00
• d0d65a5759 frame layout of ChatLeftImageCell nixzhu 2015-09-07 14:47:20 +08:00
• 3dad86b3ea frame layout of ChatRightImageCell nixzhu 2015-09-07 14:42:33 +08:00
• 45ac27d7ab frame layout of ChatLeftTextCell nixzhu 2015-09-07 14:31:36 +08:00
• c102e42e44 frame layout of ChatRightTextCell nixzhu 2015-09-07 14:24:14 +08:00
• 1df3d1ebc0 disable AutoLayout for all chat cells nixzhu 2015-09-07 13:05:47 +08:00
• 86724a9ee8 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-09-07 12:26:09 +08:00
• ab564b89d5 之前的“重新进入时不弹出键盘”破坏了状态机 nixzhu 2015-09-07 12:04:06 +08:00
• 5337940d80 make sure tryRecoverMessageToolBar after set stateTransitionAction nixzhu 2015-09-07 11:49:50 +08:00
• ec301761ab Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-09-07 11:27:24 +08:00
• 7ce6fde308 force moreView show/hide in main thread nixzhu 2015-09-07 11:26:11 +08:00
• 6ff052eff3 use isFirstAppear instead of lazyOnceToken nixzhu 2015-09-07 11:20:46 +08:00
• d495827928 chat text cells layoutIfNeeded; color nixzhu 2015-09-07 11:12:46 +08:00
• fae1891d4d Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-09-07 11:07:38 +08:00
• be8400726f lazy set some property & closures nixzhu 2015-09-07 11:05:46 +08:00
• c90dfe9dd3 lazy pullToRefreshView nixzhu 2015-09-07 10:32:58 +08:00
• dd797c5e76 lazy waverView nixzhu 2015-09-07 10:23:31 +08:00
• b1a7729d47 do not use textFieldShouldReturn in SMS code nixzhu 2015-09-07 00:17:00 +08:00
• 4d15c3f1b6 handle activeAgain in SMS code nixzhu 2015-09-07 00:15:49 +08:00
• 8663e8bc5d use haveAppropriateInput in textFieldShouldReturn nixzhu 2015-09-06 23:44:36 +08:00
• 66148664ed do not set placeholder nil nixzhu 2015-09-06 23:16:03 +08:00
• 1d29d9dec4 completion defaultRoundAvatar first nixzhu 2015-09-06 23:10:01 +08:00
• 74dd9b2a16 Merge branch 'feature/smooth_conversation' into develop nixzhu 2015-09-06 23:02:29 +08:00
• ec408d5f36 reduce cell.tapAvatarAction nixzhu 2015-09-06 23:01:40 +08:00
• 455e62f862 move cell configure in willDisplayCell nixzhu 2015-09-06 22:49:31 +08:00
• b45b434aee Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-09-06 20:33:25 +08:00
• aae2d08b77 Update version kevinzhow 2015-09-06 20:33:09 +08:00
• 45ec005e6a completion with defaultRoundAvatarOfRadius when necessary nixzhu 2015-09-06 14:31:20 +08:00
• a77fcdccf2 refactor mineType & useage nixzhu 2015-09-06 14:29:52 +08:00
• dad3d59683 delay touch imagePicker nixzhu 2015-09-06 14:06:49 +08:00
• 36c069719b prepareForReuse for ProfileSocialAccountImagesCell nixzhu 2015-09-06 13:34:51 +08:00
• 4b1df8c962 placeholderImage nil in ProfileSocialAccountImagesCell nixzhu 2015-09-06 10:28:55 +08:00
• 62fbe8583b Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-09-06 00:14:09 +08:00
• 38a5e3acf0 Merge branch 'feature/audio_use_headset_in_proximity_state' into develop nixzhu 2015-09-05 17:35:58 +08:00
• b3d18e0fbf only set proximityMonitoringEnabled if need, disable when audio play finished nixzhu 2015-09-05 17:35:16 +08:00
• e9b98e80fa after proximityStateChanged; make sure record or continuous play normal nixzhu 2015-09-05 17:21:56 +08:00
• 00e701a926 change AVAudioSession's category when proximityStateChanged nixzhu 2015-09-05 17:11:01 +08:00
• 51407a33ec Update build kevinzhow 2015-09-04 22:15:57 +08:00
• ae825fa7e7 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-09-04 21:22:12 +08:00
• d614450eaa comment; refactor localNewerTimeInterval & sectionOlderTimeInterval nixzhu 2015-09-04 17:37:38 +08:00
• c48b221f0e make sure the newly created local message newer than all existing messages (A、B在相互对发的过程中，有可能接受到的消息比本地刚创建的消息要新，会导致消息排序的问题（直观感受是：己方发送的消息不见，对方的变成两条，pop再push才会正常）) nixzhu 2015-09-04 17:19:50 +08:00