 kevinzhow
|
6fcc5dd490
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-08-24 18:26:24 +08:00 |
|
 nixzhu
|
a905557856
|
Merge branch 'feature/black_list' into develop
|
2015-08-24 17:32:57 +08:00 |
|
|
nixzhu
|
31a1825f77
|
Notifications & Privacy
|
2015-08-24 17:32:23 +08:00 |
|
|
nixzhu
|
fc0c809c59
|
None selectionStyle
|
2015-08-24 17:30:25 +08:00 |
|
|
nixzhu
|
47c9cfa0b1
|
fonts & UI detail of Notifications
|
2015-08-24 17:27:36 +08:00 |
|
|
nixzhu
|
d3f4bed4b3
|
handle blockedUsers 分页
|
2015-08-24 17:14:25 +08:00 |
|
|
nixzhu
|
9063a709c3
|
show "No blocked users." if not
|
2015-08-24 16:51:56 +08:00 |
|
|
nixzhu
|
c66913aa82
|
activityIndicator in BlackList
|
2015-08-24 16:48:43 +08:00 |
|
|
nixzhu
|
18aca8b882
|
Unblock in BlackList
|
2015-08-24 16:24:35 +08:00 |
|
|
nixzhu
|
a9f4d7da33
|
show blockedUsersByMe in BlackList
|
2015-08-24 15:49:46 +08:00 |
|
|
nixzhu
|
3ad15166c7
|
refactor config ContactsCell
|
2015-08-24 15:47:55 +08:00 |
|
|
nixzhu
|
9817ead23f
|
cell
|
2015-08-24 15:12:52 +08:00 |
|
|
nixzhu
|
8d8c729afd
|
basic UI of BlackListViewController
|
2015-08-24 15:06:07 +08:00 |
|
|
nixzhu
|
5a0ff0ba25
|
add BlackListViewController
|
2015-08-24 14:56:01 +08:00 |
|
|
nixzhu
|
f31ec7cb7b
|
show "No search results." if no searchedUsers
|
2015-08-24 12:46:56 +08:00 |
|
|
nixzhu
|
aa28a1e00b
|
show activityIndicator before show SearchedUsers
|
2015-08-24 12:42:02 +08:00 |
|
|
kevinzhow
|
d47be91e70
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-08-24 12:25:07 +08:00 |
|
|
nixzhu
|
27ea9d9e01
|
syncFriendships when friend_request accepted
|
2015-08-24 12:21:37 +08:00 |
|
|
nixzhu
|
96dc6c8ef9
|
use weak self in loadContacts
|
2015-08-24 12:10:01 +08:00 |
|
|
nixzhu
|
8e12c2923c
|
check isFriend before show FriendRequestView
|
2015-08-24 11:31:04 +08:00 |
|
|
kevinzhow
|
0e9c19c030
|
Update version
|
2015-08-22 00:45:37 +08:00 |
|
|
nixzhu
|
75484cf7da
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-08-21 22:29:24 +08:00 |
|
|
nixzhu
|
fad08753d1
|
do not set textContentTextViewWidthConstraint for ChatTextCells; use magicWidth
make textView's width always bigger than the one used to calculate (4 points for now)
|
2015-08-21 22:28:39 +08:00 |
|
|
kevinzhow
|
25e854c861
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-08-21 20:05:07 +08:00 |
|
|
kevinzhow
|
f1ca0776da
|
Update pod file
|
2015-08-21 20:04:58 +08:00 |
|
|
nixzhu
|
12b3789e43
|
refactor YepAlert useage
|
2015-08-21 17:17:11 +08:00 |
|
|
nixzhu
|
e605f4b0e8
|
make sure all YepAlert on main thread
|
2015-08-21 16:52:07 +08:00 |
|
|
nixzhu
|
0561486d92
|
make sure only one FriendRequestView is showing
|
2015-08-21 16:37:08 +08:00 |
|
|
nixzhu
|
2cf1adb6f1
|
fix SkillHome show LearningTable at first
|
2015-08-21 16:23:42 +08:00 |
|
|
kevinzhow
|
43fb381d2c
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-08-21 16:18:13 +08:00 |
|
|
kevinzhow
|
b64a574b03
|
Update pod version
|
2015-08-21 16:18:05 +08:00 |
|
|
nixzhu
|
ed283a34e3
|
pod 1PasswordExtension 1.5
|
2015-08-21 15:56:42 +08:00 |
|
|
nixzhu
|
0834cd2116
|
podile.lock conflict
|
2015-08-21 15:53:02 +08:00 |
|
|
nixzhu
|
763c4d2f6a
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-08-21 15:51:26 +08:00 |
|
|
nixzhu
|
fd1c4d8730
|
use textAttributes in Config
|
2015-08-21 15:44:02 +08:00 |
|
|
nixzhu
|
a7fbd81b7f
|
update ChatTextCells layout
|
2015-08-21 15:36:25 +08:00 |
|
|
kevinzhow
|
f4d305b815
|
Back to AFNetworking 2.5.4
|
2015-08-21 13:43:29 +08:00 |
|
|
nixzhu
|
cf2b6ebe9f
|
update 1Password; now must use fillItemIntoWebView
|
2015-08-21 11:37:59 +08:00 |
|
|
nixzhu
|
8f6a01c2cb
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-08-20 21:56:53 +08:00 |
|
|
nixzhu
|
bcd8596dbb
|
Merge branch 'feature/real_show' into develop
|
2015-08-20 21:44:09 +08:00 |
|
|
nixzhu
|
d72a3f7a53
|
enable antialiasing when rotate
|
2015-08-20 21:42:23 +08:00 |
|
|
nixzhu
|
460de121b1
|
fade in Show
|
2015-08-20 21:32:34 +08:00 |
|
|
nixzhu
|
fbb2b45f0b
|
layout
|
2015-08-20 18:12:49 +08:00 |
|
|
nixzhu
|
70b19ea22d
|
detail
|
2015-08-20 18:07:42 +08:00 |
|
|
nixzhu
|
3262485882
|
Meet Frame; position
|
2015-08-20 18:05:56 +08:00 |
|
|
nixzhu
|
b1aaed01a9
|
add accessoryImageView for BorderButton
|
2015-08-20 17:55:38 +08:00 |
|
|
nixzhu
|
d29c05d26d
|
colors
|
2015-08-20 17:29:15 +08:00 |
|
|
nixzhu
|
e11d1edfb0
|
adjust layout for Bigger & Plus
|
2015-08-20 17:04:42 +08:00 |
|
|
nixzhu
|
807a31dd00
|
adjust pageControl & finishButton's position with Ruler
|
2015-08-20 17:00:28 +08:00 |
|
|
nixzhu
|
138b0336cf
|
set titles' bottoms with Ruler
|
2015-08-20 16:56:14 +08:00 |
|