 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 |
|
|
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 |
|
|
nixzhu
|
dcaa706feb
|
enable App Group
"group.Catch-Inc.Yep"
|
2015-08-12 12:28:22 +08:00 |
|
|
nixzhu
|
ff3d2c8974
|
comment order
|
2015-08-12 12:19:56 +08:00 |
|
|
nixzhu
|
1f1824c2f0
|
init realm before use
|
2015-08-12 12:19:33 +08:00 |
|
|
nixzhu
|
e9d7fc1d06
|
order
|
2015-08-12 12:11:41 +08:00 |
|
|
nixzhu
|
9dd37663a5
|
cacheInAdvance in delegate
|
2015-08-12 11:57:52 +08:00 |
|
 kevinzhow
|
6f353b241a
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-08-11 17:47:35 +08:00 |
|
|
nixzhu
|
0c4ea67029
|
use serverPath for SkillSet
|
2015-08-11 15:45:29 +08:00 |
|
|
kevinzhow
|
3c6652a7dd
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-08-11 14:51:47 +08:00 |
|
|
kevinzhow
|
ca7ce55fb7
|
Update build number
|
2015-08-11 14:51:37 +08:00 |
|
|
nixzhu
|
0dd77d1da6
|
Merge branch 'feature/skill_set' into develop
|
2015-08-11 14:50:13 +08:00 |
|
|
nixzhu
|
814569333f
|
refactor annotationText & failedSelectSkillMessage in SkillSet
|
2015-08-11 14:49:20 +08:00 |
|
|
nixzhu
|
b801799203
|
rename discoveredUsersWithSkillSet
|
2015-08-11 14:38:55 +08:00 |
|
|
nixzhu
|
018f7fedce
|
remove SkillHomeState & SkillSetType
|
2015-08-11 14:32:06 +08:00 |
|
|
nixzhu
|
50b9be17c2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-08-11 14:15:42 +08:00 |
|
|
nixzhu
|
cd212f50bf
|
none selection of EditSkill
|
2015-08-11 14:14:53 +08:00 |
|
|
nixzhu
|
f84f485b45
|
title of EditSkills
|
2015-08-11 14:13:16 +08:00 |
|
|
kevinzhow
|
be003d9315
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-08-11 13:57:04 +08:00 |
|
|
nixzhu
|
08577cb3e5
|
Merge branch 'feature/edit_skills' into develop
|
2015-08-11 12:01:09 +08:00 |
|
|
nixzhu
|
ad03a29c91
|
add skill from EditSkills when select skill; do syncSkillsFromServerAction when done
|
2015-08-11 12:00:55 +08:00 |
|