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

• 2c02f02af8 update Services for RealmSwift nixzhu 2015-05-11 12:34:31 +08:00
• 51cd553c2b update Models for RealmSwift nixzhu 2015-05-11 12:10:28 +08:00
• c180f9ab08 Update build kevinzhow 2015-05-08 15:41:12 +08:00
• 662082a8cd refactor FayeMessageType; fix sendMessage usingBlock for NOT Message type's completion nixzhu 2015-05-08 18:41:09 +08:00
• 186579fbd9 refactor notify InstantState nixzhu 2015-05-08 17:22:16 +08:00
• 5260ce581f use lastChatTimeOfConversation for updateStateInfoOfTitleView nixzhu 2015-05-08 16:27:42 +08:00
• aa0a509301 Merge branch 'feature/fill_more_skills' into develop nixzhu 2015-05-08 13:49:18 +08:00
• 5a619dd0cb add CustomNavigationBarViewController; fix NavigationBar Style when push/pop multil times nixzhu 2015-05-08 13:48:57 +08:00
• d1dbbaa789 SkillHome isFirstAppear nixzhu 2015-05-08 13:37:44 +08:00
• f09b9936ab fix skillsFromSkillsData for allSkillCategories in register nixzhu 2015-05-08 13:32:47 +08:00
• a9faed0534 fill skillCategory & cover for DiscoveredUser's skills nixzhu 2015-05-08 13:27:54 +08:00
• ef1575fde0 sync lastSignInAt nixzhu 2015-05-08 13:11:27 +08:00
• 830d1730d6 sync group members' skills info nixzhu 2015-05-08 12:56:40 +08:00
• c7f41478eb sync userSkillCategory nixzhu 2015-05-08 12:41:05 +08:00
• fd7eb79650 add UserSkillCategory; UserSkill add category & coverURLString; first Migration nixzhu 2015-05-08 12:20:17 +08:00
• 0e42dd436c remove space kevinzhow 2015-05-07 01:52:26 +08:00
• 79dfb72601 fix confict nixzhu 2015-05-07 15:28:54 +08:00
• 6bb20c5592 Merge remote-tracking branch 'origin/develop' into develop nixzhu 2015-05-07 15:23:21 +08:00
• a0a72af325 Merge branch 'feature/better_message_preview' into develop nixzhu 2015-05-07 15:21:31 +08:00
• b3dbecf3fd pause video when dismiss nixzhu 2015-05-07 15:20:45 +08:00
• d59c87dfb0 share nixzhu 2015-05-07 15:15:36 +08:00
• c52907a690 playOrPause nixzhu 2015-05-07 14:39:48 +08:00
• d7f66411c1 fix duration NaN nixzhu 2015-05-07 14:31:11 +08:00
• 88b8ea66d0 check playerItemDidReachEnd nixzhu 2015-05-07 14:29:32 +08:00
• 9a2043b003 play count down in seconds nixzhu 2015-05-07 14:02:25 +08:00
• 20af11ffab add MediaControlView.PlayState for play control nixzhu 2015-05-07 13:30:13 +08:00
• af8c6b1efb set mediaControlView in transition animation nixzhu 2015-05-07 13:23:03 +08:00
• b6be2ba760 add MediaControlView.Type for Image or Video Control nixzhu 2015-05-07 13:19:12 +08:00
• 73abd6da0b add MediaControlView nixzhu 2015-05-07 01:59:25 +08:00
• de61b70a4d Add isStateFirstInit kevinzhow 2015-05-07 01:06:17 +08:00
• 2f68d6f4d6 Merge branch 'feature/skill_home_page' into develop kevinzhow 2015-05-07 00:54:46 +08:00
• 7a2716df71 Tableview Navigation kevinzhow 2015-05-07 00:54:20 +08:00
• c99b3312e0 fix downloadAttachmentOfMessage for thumbnail nixzhu 2015-05-07 00:05:53 +08:00
• 8a5890e026 fix thumbnail uploadFileToS3 nixzhu 2015-05-07 00:04:23 +08:00
• 163a7f4ce2 Add tableview kevinzhow 2015-05-06 23:45:42 +08:00
• 4cc3e80fd7 Change section kevinzhow 2015-05-06 23:26:22 +08:00
• c8acd5ebc1 fix upload video thumbnail key nixzhu 2015-05-06 22:36:18 +08:00
• c3cbe9cd17 Fix video gravity kevinzhow 2015-05-06 22:05:34 +08:00
• a8a302973f Add skill home kevinzhow 2015-05-06 21:57:12 +08:00
• b2e211c7f7 better logic for hide transitionView first when dismiss (feel better) nixzhu 2015-05-06 21:47:10 +08:00
• 0a7f10f8f1 clean code nixzhu 2015-05-06 21:34:42 +08:00
• 747281bc33 dismiss keyframe animation nixzhu 2015-05-06 21:28:52 +08:00
• 6fb3403f79 sexy keyframe present animation nixzhu 2015-05-06 19:33:09 +08:00
• bba1799e3c animation detail nixzhu 2015-05-06 19:13:17 +08:00
• a0edae6ca4 zoom in nixzhu 2015-05-06 18:42:41 +08:00
• 256bdf198d media imageView AspectFit nixzhu 2015-05-06 17:02:28 +08:00
• 6a888588a5 real media frame nixzhu 2015-05-06 16:27:09 +08:00
• 03e8896726 use path animation nixzhu 2015-05-06 15:29:10 +08:00
• ec99ea7456 add ConversationMessagePreviewTransitionManager nixzhu 2015-05-06 14:35:02 +08:00
• 8d0438e3cc Update build number kevinzhow 2015-05-06 04:49:21 +08:00
• b4eb19bd20 Fix JPushSDK on cocoapods, JPush is suck kevinzhow 2015-05-05 17:28:58 +08:00
• c192502374 refine waver and sampleview kevinzhow 2015-05-05 15:49:32 +08:00
• 00ee523eb6 Make sure scroll to bottom kevinzhow 2015-05-05 15:39:17 +08:00
• 9d53fb5b6d If user send message, scroll to bottom kevinzhow 2015-05-05 15:22:30 +08:00
• 7518d7147b group info in conversations nixzhu 2015-05-05 14:15:51 +08:00
• 367fe83858 Merge branch 'feature/location' into develop nixzhu 2015-05-05 14:04:12 +08:00
• 0c18834c7b centered (& zoom in) map when select location nixzhu 2015-05-05 14:01:17 +08:00
• e4d0cbfb50 send searched location nixzhu 2015-05-05 13:54:54 +08:00
• a9eff73320 show searchedMapItems on table nixzhu 2015-05-05 13:46:02 +08:00
• 1535dbac5b search place in Pick Location nixzhu 2015-05-05 13:27:39 +08:00
• 8c9549e32e [Location] nixzhu 2015-05-05 11:37:54 +08:00
• 6bcd54ed2f fix mapImage cache key nixzhu 2015-05-05 11:31:00 +08:00
• eae8e8d771 when tap on map, pick location in tableView nixzhu 2015-05-05 11:21:34 +08:00
• 216096deed pin in map cells nixzhu 2015-05-05 11:06:23 +08:00
• 1f05d4c8eb fill Location Cells nixzhu 2015-05-05 10:55:48 +08:00
• 5ab71add18 fix get location in PickLocationViewController nixzhu 2015-05-05 10:46:00 +08:00
• ebfcde1ebc sendLocation nixzhu 2015-05-05 09:05:44 +08:00
• c9a6fe6840 add ChatLeftLocationCell & ChatRightLocationCell nixzhu 2015-05-05 08:09:19 +08:00
• e0febc96b9 select location in cell nixzhu 2015-05-05 07:36:24 +08:00
• d2d76eac05 fill locations nixzhu 2015-05-05 07:17:39 +08:00
• 33dcda5382 add PickLocationCell nixzhu 2015-05-05 06:45:49 +08:00
• 21d327dece add searchBar & tableView nixzhu 2015-05-05 06:27:10 +08:00
• bdd59a67ac enable sendButton after didUpdateUserLocation nixzhu 2015-05-04 21:27:11 +08:00
• 675fe302da when user tap on map, show UserPickedLocationPin nixzhu 2015-05-04 21:21:03 +08:00
• 5eb7a791ac only isFirstShowUserLocation zoom in map nixzhu 2015-05-04 20:24:15 +08:00
• 6541f288a9 show current location on map nixzhu 2015-05-04 20:08:17 +08:00
• 32c7b6e28e current location nixzhu 2015-05-04 17:56:24 +08:00
• 6582c4edd5 add PickLocationViewController nixzhu 2015-05-04 17:37:10 +08:00
• 36afc2a017 Add icon_playvideo kevinzhow 2015-05-04 16:36:53 +08:00
• 5cd11e7b0a clean code kevinzhow 2015-05-04 16:13:32 +08:00
• 9cdd415eef remove conversation button and fix a crash bug because of less message id kevinzhow 2015-05-04 15:47:23 +08:00
• 371da31f93 close prints for sync friendships & groups nixzhu 2015-05-04 15:08:57 +08:00
• 6be8064095 add lastSignInAt, longitude, latitude to User nixzhu 2015-05-04 15:02:29 +08:00
• 7c8f19c82f tap Contacts to Profile nixzhu 2015-05-04 14:55:37 +08:00
• 0a0bd85177 sync friend's skills nixzhu 2015-05-04 13:59:32 +08:00
• 25631396b4 add RLMObject UserSkill; User add introduction & skills nixzhu 2015-05-04 13:33:04 +08:00
• 5932528e74 use real created_at, last_sign_in_at date nixzhu 2015-05-04 12:41:03 +08:00
• 2607ebdcb9 fix Message TextCells' AutoLayout break on iPhone 6 or iPhone 6 Plus (cell xib's width need bigger than device's width) nixzhu 2015-05-04 02:18:16 +08:00
• ceaed4fe8f fix textAlignment of Message TextCells nixzhu 2015-05-04 01:46:21 +08:00
• 3ee58f9c94 fix a crash of add member for group (RLMArray.addObject must in a write transaction) nixzhu 2015-05-04 01:12:57 +08:00
• b26bf25e3f fix a crash of sendPrivateMessage (or sendGroupMessage) with Faye, call completion when true may with nil messageID; refactor createMessageWithMessageInfo's Faye part nixzhu 2015-05-04 01:05:33 +08:00
• 63311fb15d remove undoMessageSend nixzhu 2015-05-04 00:29:37 +08:00
• 0721c204b5 fix a crash when prepare skillsCollectionView nixzhu 2015-05-04 00:19:14 +08:00
• 2417bb6c71 COCOAPODS: 0.37.0 nixzhu 2015-05-04 00:12:19 +08:00
• b9e0f6aef3 Add voice state kevinzhow 2015-05-03 13:12:31 +08:00
• 0a58bbe470 Add user type status kevinzhow 2015-05-03 13:05:05 +08:00
• 3134e91d01 Not mark it as readed in background kevinzhow 2015-05-03 11:43:22 +08:00
• 6a9a52b9db Remove ruby button kevinzhow 2015-05-02 23:41:53 +08:00
• a5af7788cc Use default discvoer kevinzhow 2015-05-02 23:41:01 +08:00
• c91eef79cd remove callback on selector kevinzhow 2015-05-01 23:40:45 +08:00