 nixzhu
|
d1a2ba1c19
|
basic logic of search in Contacts
|
2015-08-19 11:59:07 +08:00 |
|
|
nixzhu
|
2893e0a268
|
add searchController to Contacts
|
2015-08-19 11:35:52 +08:00 |
|
|
nixzhu
|
7d677bdbce
|
update KeyboardMan; Realm stay on 0.94
|
2015-08-19 10:35:32 +08:00 |
|
 kevinzhow
|
7a605c3bd6
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-08-18 20:38:34 +08:00 |
|
|
nixzhu
|
b067c6d038
|
Merge branch 'feature/add_friend_in_conversation' into develop
|
2015-08-18 18:45:08 +08:00 |
|
|
nixzhu
|
84a145d738
|
layout adjust
|
2015-08-18 12:44:50 +08:00 |
|
|
nixzhu
|
3d72385515
|
only tryShowFriendRequestView after sendText
|
2015-08-18 12:35:50 +08:00 |
|
|
nixzhu
|
d1027c3e89
|
need conform before reject friend request
|
2015-08-18 12:25:19 +08:00 |
|
|
nixzhu
|
0e50d708bc
|
refactor tryShowFriendRequestView
|
2015-08-18 12:06:34 +08:00 |
|
|
nixzhu
|
7d369a2986
|
logic of do not show FriendRequestView
|
2015-08-18 12:00:14 +08:00 |
|
|
nixzhu
|
25461f9386
|
alert when block user with conversation
|
2015-08-18 11:45:08 +08:00 |
|
|
nixzhu
|
a5401ff35c
|
alert when user been blocked
|
2015-08-18 11:17:25 +08:00 |
|
|
nixzhu
|
a2841f8bd6
|
show FriendRequestView next time if been rejected
|
2015-08-18 10:46:07 +08:00 |
|
|
nixzhu
|
f691b7cbb6
|
layout of stateLabelBottom
|
2015-08-18 10:40:38 +08:00 |
|
|
nixzhu
|
8de4989f9c
|
do not show .Add FriendRequestView when user been .Rejected or .Blocked
|
2015-08-17 19:01:38 +08:00 |
|
|
nixzhu
|
9a48213e06
|
rejectFriendRequestWithID
|
2015-08-17 18:56:08 +08:00 |
|
|
nixzhu
|
aa3bd936ca
|
acceptFriendRequestWithID; save friendRequestID to Consider state of FriendRequestView
|
2015-08-17 18:49:46 +08:00 |
|
|
nixzhu
|
7edbb1b79f
|
hideFriendRequestView
|
2015-08-17 17:48:00 +08:00 |
|
|
nixzhu
|
fd3946ef5b
|
.Consider state UI of FriendRequestView
|
2015-08-17 17:31:27 +08:00 |
|
|
nixzhu
|
df892e0c7c
|
state of FriendRequestView; basic logic to detect *FriendRequestState
|
2015-08-17 16:35:11 +08:00 |
|
|
nixzhu
|
f10b69e6ca
|
refactor makeFriendRequestViewWithUser; show animation
|
2015-08-17 15:55:46 +08:00 |
|
|
nixzhu
|
6ab2eee492
|
get stateOfFriendRequestWithUser
|
2015-08-17 15:42:32 +08:00 |
|
|
kevinzhow
|
f283489faa
|
Update version
|
2015-08-15 10:18:10 +08:00 |
|
|
nixzhu
|
e5b3defb56
|
only show FriendRequestView for Stranger
|
2015-08-14 16:53:59 +08:00 |
|
|
nixzhu
|
2a1e8721f6
|
logic of sendFriendRequestToUser
|
2015-08-14 16:41:12 +08:00 |
|
|
nixzhu
|
d6fd9f2763
|
set nickname
|
2015-08-14 15:53:37 +08:00 |
|
|
nixzhu
|
7a3270b297
|
action
|
2015-08-14 15:51:12 +08:00 |
|
|
nixzhu
|
8889b956b1
|
use FriendRequestView.height
|
2015-08-14 15:32:08 +08:00 |
|
|
nixzhu
|
178b8eca43
|
set user for avatar
|
2015-08-14 15:25:58 +08:00 |
|
|
nixzhu
|
7e326963e1
|
label color & font
|
2015-08-14 15:12:45 +08:00 |
|
|
nixzhu
|
4f6384e1a0
|
use ContainerView; add visualEffectView below it
|
2015-08-14 15:06:40 +08:00 |
|
|
nixzhu
|
ad83dc4939
|
draw bottom line
|
2015-08-14 14:50:34 +08:00 |
|
|
nixzhu
|
6b59b14054
|
more layout for stateLabel & actionButton
|
2015-08-14 14:33:52 +08:00 |
|
|
nixzhu
|
7e34d04f9f
|
add FriendRequestView
|
2015-08-14 14:13:29 +08:00 |
|
|
nixzhu
|
4b0081f148
|
remove moreAction in other user's Profile
|
2015-08-14 12:56:49 +08:00 |
|
|
nixzhu
|
df2fae2434
|
Merge branch 'feature/intro_show' into develop
|
2015-08-14 12:44:39 +08:00 |
|
|
nixzhu
|
f914f886de
|
Start Yep in ShowViewController when finish
|
2015-08-13 15:38:08 +08:00 |
|
|
nixzhu
|
cae6ee6f23
|
hide NavigationBar in Welcome
|
2015-08-13 14:27:11 +08:00 |
|
|
nixzhu
|
dd3b3c276f
|
refactor use isLogined in YepUserDefaults
|
2015-08-13 13:52:40 +08:00 |
|
|
nixzhu
|
70fbb430e9
|
finishAction for ShowStepViewController
|
2015-08-12 22:59:31 +08:00 |
|
|
nixzhu
|
edd9f91f7e
|
add pageControl
|
2015-08-12 22:43:14 +08:00 |
|
|
nixzhu
|
c112cd2e02
|
add ShowResources; logic of load local show HTML
|
2015-08-12 22:05:31 +08:00 |
|
|
nixzhu
|
9c3e4b42f1
|
basic UI of Show
|
2015-08-12 21:33:30 +08:00 |
|
|
nixzhu
|
db6a0034f4
|
add ShowViewController & ShowStepViewController
|
2015-08-12 18:41:45 +08:00 |
|
|
nixzhu
|
d74e9d8258
|
update countOfUnreadMessagesInRealm, make sure unread messages have fromFriend
|
2015-08-12 13:31:12 +08:00 |
|
|
nixzhu
|
3cb063132c
|
fix set conversation for sender officialMessages
|
2015-08-12 13:26:01 +08:00 |
|
|
nixzhu
|
7cec644eaa
|
do not save YepTeam in officialMessages if it's not with messages
|
2015-08-12 12:56:09 +08:00 |
|
|
nixzhu
|
bb6db3ff29
|
Merge branch 'feature/app_group' into develop
|
2015-08-12 12:50:03 +08:00 |
|
|
nixzhu
|
00377f6a46
|
put YepUserDefaults in App Group
|
2015-08-12 12:48:53 +08:00 |
|
|
nixzhu
|
8ff3f19bc1
|
put Realm in App Group
|
2015-08-12 12:38:37 +08:00 |
|