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

• 3262485882 Meet Frame; position nixzhu 2015-08-20 18:05:56 +08:00
• b1aaed01a9 add accessoryImageView for BorderButton nixzhu 2015-08-20 17:55:38 +08:00
• d29c05d26d colors nixzhu 2015-08-20 17:29:15 +08:00
• e11d1edfb0 adjust layout for Bigger & Plus nixzhu 2015-08-20 17:04:42 +08:00
• 807a31dd00 adjust pageControl & finishButton's position with Ruler nixzhu 2015-08-20 17:00:28 +08:00
• 138b0336cf set titles' bottoms with Ruler nixzhu 2015-08-20 16:56:14 +08:00
• 2801744d6e labels' local string nixzhu 2015-08-20 16:47:19 +08:00
• 32944d1160 refactor; animation for Meet nixzhu 2015-08-20 16:23:16 +08:00
• 68f1fbbcc2 layout of ShowStepMeetViewController nixzhu 2015-08-20 16:18:45 +08:00
• 1f59b0975a add ShowStepMeetViewController nixzhu 2015-08-20 15:57:47 +08:00
• 1eeb19ef41 layout nixzhu 2015-08-20 15:47:21 +08:00
• 46d8fc448c refactor animate in StepMatch nixzhu 2015-08-20 15:44:29 +08:00
• c53a21fdd8 animateKeyboard nixzhu 2015-08-20 15:33:36 +08:00
• f79dc7e834 refactor ShowStepViewController nixzhu 2015-08-20 14:56:32 +08:00
• ecadd85089 images layout for ShowStepMatchViewController nixzhu 2015-08-20 14:46:11 +08:00
• 3916d00dbe add ShowStepMatchViewController nixzhu 2015-08-20 14:39:17 +08:00
• 7b313f70e6 indicator layout nixzhu 2015-08-20 14:33:45 +08:00
• a4ccdc2588 adjust for iPhone Classic nixzhu 2015-08-20 14:31:40 +08:00
• 151595aee4 animate dotsLink nixzhu 2015-08-20 14:18:18 +08:00
• 76fb59d643 more dots animation nixzhu 2015-08-20 14:08:52 +08:00
• 38abceb4ae more dots animation nixzhu 2015-08-20 14:01:52 +08:00
• 469ba570c5 first try animate dot1 nixzhu 2015-08-20 13:35:20 +08:00
• 511623772d Fix error bug kevinzhow 2015-08-20 13:23:46 +08:00
• ce88512ba9 Fix Storyboard error kevinzhow 2015-08-20 13:17:38 +08:00
• eaf39be977 add ShowStepGeniusViewController nixzhu 2015-08-20 13:01:53 +08:00
• ea914dc575 Update pod file kevinzhow 2015-08-20 12:25:29 +08:00
• 3aa5470e9c remove old show nixzhu 2015-08-20 12:15:43 +08:00
• c967841ef7 Fix Skill Home Scroll Bug kevinzhow 2015-08-19 19:46:25 +08:00
• b15691a4c6 Fix Skill Home Scroll Bug kevinzhow 2015-08-19 19:02:14 +08:00
• c2fa3ec437 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-08-19 18:59:04 +08:00
• 053f91fa93 Update version kevinzhow 2015-08-19 18:58:56 +08:00
• 9ee7c35aeb Merge remote-tracking branch 'origin/develop' into develop nixzhu 2015-08-19 18:28:51 +08:00
• b94bff8927 trimming searchText for SearchedUsersViewController nixzhu 2015-08-19 18:28:24 +08:00
• d11ebf22fe Add onePassword Support kevinzhow 2015-08-19 18:07:01 +08:00
• 866b4a735b make filteredFriends optional nixzhu 2015-08-19 15:14:41 +08:00
• 7d97075072 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-08-19 15:10:07 +08:00
• 25404459af searchBar style nixzhu 2015-08-19 15:08:26 +08:00
• 997aa6c0f4 Merge branch 'feature/pull_search_contact' into develop nixzhu 2015-08-19 13:27:53 +08:00
• 2a5023fdfd better logic for dismiss searchController nixzhu 2015-08-19 13:27:35 +08:00
• b0e463628b refactor searchControllerIsActive nixzhu 2015-08-19 13:23:22 +08:00
• 96e1ee1717 only show searchBar in Contacts when friends.count greater than threshold nixzhu 2015-08-19 13:20:19 +08:00
• 19d4642cf9 refactor friendAtIndexPath nixzhu 2015-08-19 12:17:36 +08:00
• bdefcb75e8 case insensitive when search in Contacts nixzhu 2015-08-19 12:14:07 +08:00
• b3e52620e9 dismiss searchController if need before showProfile nixzhu 2015-08-19 12:06:12 +08:00
• d1a2ba1c19 basic logic of search in Contacts nixzhu 2015-08-19 11:59:07 +08:00
• 7e1dc1e105 Update version kevinzhow 2015-08-19 11:49:12 +08:00
• 2893e0a268 add searchController to Contacts nixzhu 2015-08-19 11:35:52 +08:00
• 7d677bdbce update KeyboardMan; Realm stay on 0.94 nixzhu 2015-08-19 10:35:32 +08:00
• 7a605c3bd6 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop kevinzhow 2015-08-18 20:38:34 +08:00
• b067c6d038 Merge branch 'feature/add_friend_in_conversation' into develop nixzhu 2015-08-18 18:45:08 +08:00
• 84a145d738 layout adjust nixzhu 2015-08-18 12:44:50 +08:00
• 3d72385515 only tryShowFriendRequestView after sendText nixzhu 2015-08-18 12:35:50 +08:00
• d1027c3e89 need conform before reject friend request nixzhu 2015-08-18 12:25:19 +08:00
• 0e50d708bc refactor tryShowFriendRequestView nixzhu 2015-08-18 12:06:34 +08:00
• 7d369a2986 logic of do not show FriendRequestView nixzhu 2015-08-18 12:00:14 +08:00
• 25461f9386 alert when block user with conversation nixzhu 2015-08-18 11:45:08 +08:00
• a5401ff35c alert when user been blocked nixzhu 2015-08-18 11:17:25 +08:00
• a2841f8bd6 show FriendRequestView next time if been rejected nixzhu 2015-08-18 10:46:07 +08:00
• f691b7cbb6 layout of stateLabelBottom nixzhu 2015-08-18 10:40:38 +08:00
• 8de4989f9c do not show .Add FriendRequestView when user been .Rejected or .Blocked nixzhu 2015-08-17 19:01:38 +08:00
• 9a48213e06 rejectFriendRequestWithID nixzhu 2015-08-17 18:56:08 +08:00
• aa3bd936ca acceptFriendRequestWithID; save friendRequestID to Consider state of FriendRequestView nixzhu 2015-08-17 18:49:46 +08:00
• 7edbb1b79f hideFriendRequestView nixzhu 2015-08-17 17:48:00 +08:00
• fd3946ef5b .Consider state UI of FriendRequestView nixzhu 2015-08-17 17:31:27 +08:00
• df892e0c7c state of FriendRequestView; basic logic to detect *FriendRequestState nixzhu 2015-08-17 16:35:11 +08:00
• f10b69e6ca refactor makeFriendRequestViewWithUser; show animation nixzhu 2015-08-17 15:55:46 +08:00
• 6ab2eee492 get stateOfFriendRequestWithUser nixzhu 2015-08-17 15:42:32 +08:00
• f283489faa Update version kevinzhow 2015-08-15 10:18:10 +08:00
• e5b3defb56 only show FriendRequestView for Stranger nixzhu 2015-08-14 16:53:59 +08:00
• 2a1e8721f6 logic of sendFriendRequestToUser nixzhu 2015-08-14 16:41:12 +08:00
• d6fd9f2763 set nickname nixzhu 2015-08-14 15:53:37 +08:00
• 7a3270b297 action nixzhu 2015-08-14 15:51:12 +08:00
• 8889b956b1 use FriendRequestView.height nixzhu 2015-08-14 15:32:08 +08:00
• 178b8eca43 set user for avatar nixzhu 2015-08-14 15:25:58 +08:00
• 7e326963e1 label color & font nixzhu 2015-08-14 15:12:45 +08:00
• 4f6384e1a0 use ContainerView; add visualEffectView below it nixzhu 2015-08-14 15:06:40 +08:00
• ad83dc4939 draw bottom line nixzhu 2015-08-14 14:50:34 +08:00
• 6b59b14054 more layout for stateLabel & actionButton nixzhu 2015-08-14 14:33:52 +08:00
• 7e34d04f9f add FriendRequestView nixzhu 2015-08-14 14:13:29 +08:00
• 4b0081f148 remove moreAction in other user's Profile nixzhu 2015-08-14 12:56:49 +08:00
• df2fae2434 Merge branch 'feature/intro_show' into develop nixzhu 2015-08-14 12:44:39 +08:00
• f914f886de Start Yep in ShowViewController when finish nixzhu 2015-08-13 15:38:08 +08:00
• cae6ee6f23 hide NavigationBar in Welcome nixzhu 2015-08-13 14:27:11 +08:00
• dd3b3c276f refactor use isLogined in YepUserDefaults nixzhu 2015-08-13 13:52:40 +08:00
• 70fbb430e9 finishAction for ShowStepViewController nixzhu 2015-08-12 22:59:31 +08:00
• edd9f91f7e add pageControl nixzhu 2015-08-12 22:43:14 +08:00
• c112cd2e02 add ShowResources; logic of load local show HTML nixzhu 2015-08-12 22:05:31 +08:00
• 9c3e4b42f1 basic UI of Show nixzhu 2015-08-12 21:33:30 +08:00
• db6a0034f4 add ShowViewController & ShowStepViewController nixzhu 2015-08-12 18:41:45 +08:00
• d74e9d8258 update countOfUnreadMessagesInRealm, make sure unread messages have fromFriend nixzhu 2015-08-12 13:31:12 +08:00
• 3cb063132c fix set conversation for sender officialMessages nixzhu 2015-08-12 13:26:01 +08:00
• 7cec644eaa do not save YepTeam in officialMessages if it's not with messages nixzhu 2015-08-12 12:56:09 +08:00
• bb6db3ff29 Merge branch 'feature/app_group' into develop nixzhu 2015-08-12 12:50:03 +08:00
• 00377f6a46 put YepUserDefaults in App Group nixzhu 2015-08-12 12:48:53 +08:00
• 8ff3f19bc1 put Realm in App Group nixzhu 2015-08-12 12:38:37 +08:00
• dcaa706feb enable App Group "group.Catch-Inc.Yep" nixzhu 2015-08-12 12:28:22 +08:00
• ff3d2c8974 comment order nixzhu 2015-08-12 12:19:56 +08:00
• 1f1824c2f0 init realm before use nixzhu 2015-08-12 12:19:33 +08:00
• e9d7fc1d06 order nixzhu 2015-08-12 12:11:41 +08:00
• 9dd37663a5 cacheInAdvance in delegate nixzhu 2015-08-12 11:57:52 +08:00