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

• 6f353b241a Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-08-11 17:47:35 +08:00
• 0c4ea67029 use serverPath for SkillSet nixzhu 2015-08-11 15:45:29 +08:00
• 3c6652a7dd Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-08-11 14:51:47 +08:00
• ca7ce55fb7 Update build number kevinzhow 2015-08-11 14:51:37 +08:00
• 0dd77d1da6 Merge branch 'feature/skill_set' into develop nixzhu 2015-08-11 14:50:13 +08:00
• 814569333f refactor annotationText & failedSelectSkillMessage in SkillSet nixzhu 2015-08-11 14:49:20 +08:00
• b801799203 rename discoveredUsersWithSkillSet nixzhu 2015-08-11 14:38:55 +08:00
• 018f7fedce remove SkillHomeState & SkillSetType nixzhu 2015-08-11 14:32:06 +08:00
• 50b9be17c2 Merge remote-tracking branch 'origin/develop' into develop nixzhu 2015-08-11 14:15:42 +08:00
• cd212f50bf none selection of EditSkill nixzhu 2015-08-11 14:14:53 +08:00
• f84f485b45 title of EditSkills nixzhu 2015-08-11 14:13:16 +08:00
• be003d9315 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-08-11 13:57:04 +08:00
• 08577cb3e5 Merge branch 'feature/edit_skills' into develop nixzhu 2015-08-11 12:01:09 +08:00
• ad03a29c91 add skill from EditSkills when select skill; do syncSkillsFromServerAction when done nixzhu 2015-08-11 12:00:55 +08:00
• 5ca9ad0d30 check skillCategories in tapAction; comments nixzhu 2015-08-11 11:33:38 +08:00
• 1986feb4cf add skill in EditSkills nixzhu 2015-08-11 11:29:05 +08:00
• 847d0c54e1 Update kevinzhow 2015-08-10 23:55:37 +08:00
• f453f9244b fix logic of indexPathToDelete in EditSkill nixzhu 2015-08-10 18:42:32 +08:00
• 819be90ffd delete skill from server in EditSkills nixzhu 2015-08-10 18:25:59 +08:00
• 2c3e5a4212 use afterChangedSkillsAction update Profile's UI after delete skill in EditSkills nixzhu 2015-08-10 18:09:57 +08:00
• a9a7d93ca9 removeSkillAction nixzhu 2015-08-10 18:04:25 +08:00
• 165ebe7967 show self's skills in EditSkill nixzhu 2015-08-10 17:52:56 +08:00
• 957e42a9c1 init skillSetType of EditSkillsViewController nixzhu 2015-08-10 17:42:34 +08:00
• 890706c300 set BottomButtonView actionButton's title nixzhu 2015-08-10 17:14:01 +08:00
• 05521541c7 use EditSkillCell; UI detail nixzhu 2015-08-10 17:08:30 +08:00
• 500fb5182a add EditSkillCell nixzhu 2015-08-10 17:08:00 +08:00
• d230263233 basic UI of EditSkillsViewController nixzhu 2015-08-10 16:35:24 +08:00
• 8416abaed4 refactor SayHiView to BottomButtonView nixzhu 2015-08-10 16:22:07 +08:00
• b2515f01a2 add EditSkillsViewController nixzhu 2015-08-10 16:07:08 +08:00
• 989aa794a9 do not markAsRead messages from YepTeam nixzhu 2015-08-10 15:44:26 +08:00
• 8c8fe6aeb8 Coordinate safe version property nixzhu 2015-08-10 15:35:51 +08:00
• bec63ded77 refactor generate Coordinate nixzhu 2015-08-10 15:27:27 +08:00
• c5f4fcc96a make sure coordinate when generate nixzhu 2015-08-10 15:08:51 +08:00
• 90a73525dc Merge remote-tracking branch 'origin/develop' into develop nixzhu 2015-08-10 14:47:56 +08:00
• 4cb82ae756 fix setRegion of Map nixzhu 2015-08-10 14:46:41 +08:00
• afeabb5ba2 Update version kevinzhow 2015-08-10 14:31:03 +08:00
• 9393b6aa5c Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-08-10 13:15:25 +08:00
• a1eeeb7815 Update version kevinzhow 2015-08-10 13:15:18 +08:00
• fc33e3254e change cacheQueue nixzhu 2015-08-10 12:57:48 +08:00
• b582a59b4f avoid some force unwraps in PickLocation nixzhu 2015-08-10 12:52:05 +08:00
• f959205048 fix a crash in mapImageOfMessage nixzhu 2015-08-10 12:46:33 +08:00
• 3f8edb99c9 rename voice record actions nixzhu 2015-08-10 11:07:06 +08:00
• 15d627c56f set swipeUpPromptLabel text when begin voice record nixzhu 2015-08-10 10:59:26 +08:00
• cf15a489e8 add voiceRecordingUpdateUIAction nixzhu 2015-08-10 10:53:43 +08:00
• dd24f23f74 add activityIndicator to SkillHome nixzhu 2015-08-10 09:06:27 +08:00
• 0fca36c8f1 Solve Navigation Bar For Skill Home kevinzhow 2015-08-10 02:39:13 +08:00
• e8d41d4d60 Slove Navigation Bar Problem and Better pop gesture kevinzhow 2015-08-10 02:29:22 +08:00
• 22f4899747 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-08-07 23:17:56 +08:00
• 634aeebe9e Update pod file kevinzhow 2015-08-07 23:17:47 +08:00
• 83ec28372c use weak self nixzhu 2015-08-07 16:19:13 +08:00
• df56586b54 clean code nixzhu 2015-08-07 16:16:13 +08:00
• 81a8492130 use ChatCell.lineSpacing nixzhu 2015-08-07 16:13:35 +08:00
• b31c694448 remove unused done nixzhu 2015-08-07 16:07:21 +08:00
• d1e077003c request officialMessages when receive official_message notification nixzhu 2015-08-07 14:30:57 +08:00
• 7b1c45fbf3 Merge branch 'feature/official_messages' into develop nixzhu 2015-08-07 14:18:28 +08:00
• aa41a7d79a print count nixzhu 2015-08-07 14:05:05 +08:00
• e0caa44c3a officialMessages messagesCount nixzhu 2015-08-07 14:01:32 +08:00
• c03c678adb get officialMessages nixzhu 2015-08-07 13:55:46 +08:00
• 8dd0990ff6 add userURLString to DribbbleWork for share nixzhu 2015-08-06 14:24:33 +08:00
• 7926f9cfee refactor update user with info nixzhu 2015-08-06 14:11:45 +08:00
• 2cf3c71086 update user info in Profile (fetch & update skills for stranger (or normal friend)) nixzhu 2015-08-06 13:59:42 +08:00
• f3b4244ff7 tap avatar to show Profile nixzhu 2015-08-06 13:37:58 +08:00
• ec7e74189a use ChatBaseCell as all Chat Cells' super class nixzhu 2015-08-06 13:22:18 +08:00
• 5c82e57dc6 add ChatBaseCell nixzhu 2015-08-06 13:02:10 +08:00
• a497d993cf new new logic for cancel audio record nixzhu 2015-08-06 12:45:01 +08:00
• 303083b200 Instagram's share use the first media's username nixzhu 2015-08-06 10:56:43 +08:00
• 7a9bc1fb93 add & parse username for InstagramWork nixzhu 2015-08-06 10:47:55 +08:00
• b24fa4648d Merge remote-tracking branch 'origin/develop' into develop nixzhu 2015-08-06 10:26:01 +08:00
• e5b04cb780 update Pod nixzhu 2015-08-06 10:25:17 +08:00
• ee65909ca8 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-08-05 15:57:09 +08:00
• 125dbe9859 Update Version kevinzhow 2015-08-05 15:56:53 +08:00
• 968c775c6a more newlines nixzhu 2015-08-05 15:56:17 +08:00
• fe6c953979 Merge remote-tracking branch 'origin/develop' into develop nixzhu 2015-08-05 15:43:07 +08:00
• 8fcf318a75 clean code nixzhu 2015-08-05 15:40:44 +08:00
• 799747d2ed no logic for delete skill nixzhu 2015-08-05 15:38:21 +08:00
• d7aeaedd07 pass weak self to selectSkillAction nixzhu 2015-08-05 14:56:21 +08:00
• 184c579c19 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-08-05 13:28:32 +08:00
• 8029ff4683 refactor use actions in MessageToolbar nixzhu 2015-08-05 12:57:21 +08:00
• 59e312ad6a Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-08-05 12:53:54 +08:00
• fa7ad77280 Update Pod kevinzhow 2015-08-05 12:53:45 +08:00
• dafe420498 Merge remote-tracking branch 'origin/develop' into develop nixzhu 2015-08-05 12:51:39 +08:00
• c7c1745d65 Update Version kevinzhow 2015-08-05 12:47:23 +08:00
• c513aed26c swipe up to cancel record audio nixzhu 2015-08-05 12:45:34 +08:00
• 0ff78f7d22 refactor VoiceRecordButton's actions nixzhu 2015-08-05 12:27:49 +08:00
• 95c486f94d Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-08-05 00:36:35 +08:00
• 453424c22c Add Ignore kevinzhow 2015-08-05 00:36:22 +08:00
• db63ed1058 Update version kevinzhow 2015-08-05 00:36:07 +08:00
• 67ceabd4a5 fix set some view's widths in SkillHome nixzhu 2015-08-04 17:46:36 +08:00
• 50c72d04c7 fix setActive nixzhu 2015-08-04 17:39:59 +08:00
• b275e4bc82 refactor sync DoNotDisturb nixzhu 2015-08-04 14:51:33 +08:00
• 5b2e2ad713 new logic for sync DoNotDisturb from server nixzhu 2015-08-04 14:33:32 +08:00
• d144a00dea add DoNotDisturbPeriod more strings nixzhu 2015-08-04 14:24:34 +08:00
• 9a9743d236 use serverFromString & serverToString in enableDoNotDisturb nixzhu 2015-08-04 14:16:31 +08:00
• 60377e60d2 update Podfile nixzhu 2015-08-04 13:32:10 +08:00
• f7278bd736 Merge branch 'feature/do_dot_disturb_period' into develop nixzhu 2015-08-03 19:30:16 +08:00
• 41d77214f0 sync DoNotDisturb from server nixzhu 2015-08-03 19:28:31 +08:00
• 5beaf4461b clean UI after disableDoNotDisturb nixzhu 2015-08-03 19:05:04 +08:00
• cdf8b5106c updateDoNotDisturb if isDirty nixzhu 2015-08-03 19:01:36 +08:00
• 2b7db50f35 sync NotificationsViewController from DoNotDisturbPeriodViewController nixzhu 2015-08-03 18:54:16 +08:00
• 0127ac7f69 init doNotDisturbPeriod for both NotificationsViewController & DoNotDisturbPeriodViewController nixzhu 2015-08-03 18:49:12 +08:00