kevinzhow
|
6568c9f148
|
Better topics swipe
|
2015-10-22 19:33:31 +08:00 |
|
kevinzhow
|
7803f8c758
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-10-22 19:16:54 +08:00 |
|
nixzhu
|
bfe1f80967
|
Merge branch 'feature/pick_feed_skill' into develop
|
2015-10-22 19:02:36 +08:00 |
|
 nixzhuandnixzhu
|
ffe3e6c53a
|
remove unused code
|
2015-10-22 19:01:58 +08:00 |
|
 nixzhuandnixzhu
|
2ee5be6286
|
logic of pickedSkillLabel
|
2015-10-22 18:56:13 +08:00 |
|
 nixzhuandnixzhu
|
50e620bfcb
|
hideSkillPickerView
|
2015-10-22 18:41:57 +08:00 |
|
 nixzhuandnixzhu
|
c2d40e0ec7
|
trans
|
2015-10-22 18:34:39 +08:00 |
|
 nixzhuandnixzhu
|
ad4c663377
|
scroll hide keyboard
|
2015-10-22 18:28:34 +08:00 |
|
 nixzhuandnixzhu
|
a06d26ec60
|
create new feed in scroll view (Fuck Ray! And Ray fuck Kevin!)
|
2015-10-22 18:19:53 +08:00 |
|
 nixzhuandnixzhu
|
df856191d3
|
fill skill to feed if can
|
2015-10-22 17:41:15 +08:00 |
|
 nixzhuandnixzhu
|
0a06346c52
|
skillLabel FeedCell
|
2015-10-22 17:29:43 +08:00 |
|
 nixzhuandnixzhu
|
73f315eb90
|
create feed with skill
|
2015-10-22 17:16:19 +08:00 |
|
 nixzhuandnixzhu
|
e5d774f081
|
choosePromptLabel
|
2015-10-22 17:06:21 +08:00 |
|
 nixzhuandnixzhu
|
18e72f835a
|
UI detail; animation
|
2015-10-22 16:59:54 +08:00 |
|
 nixzhuandnixzhu
|
a3cb4fa267
|
channel
|
2015-10-22 16:19:23 +08:00 |
|
 nixzhuandnixzhu
|
4c5a92259a
|
pickedSkill
|
2015-10-22 16:09:47 +08:00 |
|
 nixzhuandnixzhu
|
bc568d54a9
|
skills
|
2015-10-22 15:59:42 +08:00 |
|
 nixzhuandnixzhu
|
ff114a3916
|
use masterSkills; infinity picker
|
2015-10-22 15:57:18 +08:00 |
|
kevinzhow
|
14f1110ac2
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-10-22 15:55:53 +08:00 |
|
kevinzhow
|
5c12ddb0db
|
Update
|
2015-10-22 15:55:46 +08:00 |
|
 nixzhuandnixzhu
|
b45f2728f5
|
add FeedSkillPickerItemView
|
2015-10-22 15:40:08 +08:00 |
|
 nixzhuandnixzhu
|
965926c396
|
add PickFeedSkillCell
|
2015-10-22 14:48:53 +08:00 |
|
 nixzhuandnixzhu
|
512fe7df36
|
add PickFeedSkillView
|
2015-10-22 14:30:07 +08:00 |
|
nixzhu
|
2786def9e9
|
make Pods_Yep.framework optional for run in Xcode 7.1
|
2015-10-22 12:58:09 +08:00 |
|
kevinzhow
|
808eea8f64
|
Back to pod
|
2015-10-22 08:12:55 +08:00 |
|
kevinzhow
|
31f8fd785c
|
use new jpush and enable bitcode
|
2015-10-22 07:37:45 +08:00 |
|
kevinzhow
|
3e783956f7
|
more weak self
|
2015-10-22 07:18:11 +08:00 |
|
kevinzhow
|
75a9e75103
|
pod back
|
2015-10-22 01:13:44 +08:00 |
|
kevinzhow
|
d6a77f7da9
|
About Fix freeze
|
2015-10-22 01:13:24 +08:00 |
|
kevinzhow
|
5feb23d79f
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-10-21 23:27:38 +08:00 |
|
 nixzhuandnixzhu
|
904bae7652
|
fix resize image with no scale version
|
2015-10-21 18:27:49 +08:00 |
|
 nixzhuandnixzhu
|
0d6fd29f01
|
update pods (Navi & Realm), fix round avatar from gray color space image
|
2015-10-21 17:27:45 +08:00 |
|
 nixzhuandnixzhu
|
ca92da906a
|
fix pick photos logic after pick & delete
|
2015-10-21 16:25:31 +08:00 |
|
 nixzhuandnixzhu
|
44371bd7ac
|
trans of Send Photos (%d)
|
2015-10-21 16:16:11 +08:00 |
|
 nixzhuandnixzhu
|
8a7beddb80
|
use YepConfig.Notification.MarkAsReaded to reduce unnecessary updates
|
2015-10-21 15:59:18 +08:00 |
|
 nixzhuandnixzhu
|
432b036e4f
|
clean quick picked photos after send
|
2015-10-21 14:35:21 +08:00 |
|
kevinzhow
|
2303067312
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-10-21 14:10:07 +08:00 |
|
kevinzhow
|
6257085c21
|
Podfile
|
2015-10-21 14:09:26 +08:00 |
|
kevinzhow
|
2ae67cc9dc
|
Use Arbitrarloads
|
2015-10-21 14:09:19 +08:00 |
|
 nixzhuandnixzhu
|
87418601b1
|
update changeMode
|
2015-10-21 13:57:00 +08:00 |
|
 nixzhuandnixzhu
|
4b6bea483a
|
prepareForReuse for DiscoverNormalUserCell
|
2015-10-21 13:43:52 +08:00 |
|
 nixzhuandnixzhu
|
f6689164d6
|
better definition of userMode in DiscoverViewController
|
2015-10-21 13:43:33 +08:00 |
|
 nixzhuandnixzhu
|
7242dfb387
|
prepareForReuse for DiscoverCardUserCell
|
2015-10-21 13:38:11 +08:00 |
|
 nixzhuandnixzhu
|
8f13600caa
|
reduce syncFriendships
|
2015-10-21 13:27:16 +08:00 |
|
 nixzhuandnixzhu
|
687d68c6ad
|
reduce reloadConversationsTableView
|
2015-10-21 13:18:53 +08:00 |
|
nixzhu
|
7fbb42b296
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-10-21 13:02:44 +08:00 |
|
nixzhu
|
ab9e2478ba
|
Merge branch 'feature/realm_queue' into develop
|
2015-10-21 13:00:08 +08:00 |
|
 nixzhuandnixzhu
|
a6b519cc70
|
readed = false (do not use 0); adjust logic of batchMarkMessagesAsReaded
|
2015-10-21 11:42:11 +08:00 |
|
 nixzhuandnixzhu
|
deff9e5a40
|
do not syncMessagesReadStatus (now with batch mark as read)
|
2015-10-21 11:09:54 +08:00 |
|
kevinzhow
|
e38f041359
|
better upload logic
|
2015-10-21 11:09:38 +08:00 |
|