 kevinzhow
|
57fa801bbf
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-09-15 17:49:45 +08:00 |
|
 nixzhu
|
c5cdf08900
|
Merge branch 'feature/messages_order' into develop
|
2015-09-15 12:42:07 +08:00 |
|
|
nixzhu
|
2df539b522
|
update version 1.0 (87)
|
2015-09-15 12:21:00 +08:00 |
|
|
nixzhu
|
29dc9930ec
|
alert test
|
2015-09-15 12:20:15 +08:00 |
|
|
nixzhu
|
590c1f66de
|
make sure new message newer than all local messages
|
2015-09-15 12:13:36 +08:00 |
|
|
nixzhu
|
750b624b82
|
hide mediaView.imageView when preview video
|
2015-09-15 11:54:36 +08:00 |
|
|
nixzhu
|
33d32fa15e
|
timeLable left offset
|
2015-09-15 11:51:53 +08:00 |
|
|
nixzhu
|
88257a7b9e
|
animate mediaControlView appear
|
2015-09-15 11:50:14 +08:00 |
|
|
nixzhu
|
6a7e20b727
|
icon_more_image for Image
|
2015-09-15 11:41:59 +08:00 |
|
|
nixzhu
|
3ed74605a4
|
dismiss keyboard if need (do not preview)
|
2015-09-14 18:07:54 +08:00 |
|
|
kevinzhow
|
78b4fa114c
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-09-14 16:22:40 +08:00 |
|
|
nixzhu
|
91f375bbd3
|
alert if newMessagesCount != messageIDs.count
|
2015-09-14 15:47:18 +08:00 |
|
|
nixzhu
|
4ecc500c90
|
update version 1.0 (86)
|
2015-09-14 14:33:53 +08:00 |
|
|
nixzhu
|
3fa9d8c991
|
Merge branch 'feature/keyboard_hide_when_preview' into develop
|
2015-09-14 14:33:14 +08:00 |
|
|
nixzhu
|
e5a29a8511
|
fix avatar cache may not return image in some cases
|
2015-09-14 14:32:15 +08:00 |
|
|
nixzhu
|
d9640c0573
|
use YepConfig.dismissKeyboardDelayTimeInterval
|
2015-09-14 14:17:43 +08:00 |
|
|
nixzhu
|
d854353ecb
|
dismiss keyboard with messageToolbar.state before all preview if need
|
2015-09-14 14:12:35 +08:00 |
|
|
nixzhu
|
0416f717da
|
dismiss keyboard before showMessageMedia if need
|
2015-09-14 12:28:52 +08:00 |
|
|
nixzhu
|
94328cda56
|
Merge branch 'feature/set_username' into develop
|
2015-09-14 11:43:06 +08:00 |
|
|
nixzhu
|
d33adcc125
|
trans for set username
|
2015-09-14 11:39:51 +08:00 |
|
|
nixzhu
|
8c25337748
|
update cell after set username
|
2015-09-14 11:32:33 +08:00 |
|
|
nixzhu
|
d74181dad0
|
select alert set username
|
2015-09-14 11:27:29 +08:00 |
|
|
kevinzhow
|
92c839455d
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-09-14 11:22:06 +08:00 |
|
|
nixzhu
|
7aca723e1b
|
add username cell in EditProfile
|
2015-09-14 11:09:11 +08:00 |
|
|
nixzhu
|
afa6b1fa99
|
Merge branch 'feature/fix_UI' into develop
|
2015-09-12 16:11:35 +08:00 |
|
|
nixzhu
|
f2b006c239
|
fix pick skill arrow color
|
2015-09-12 16:10:11 +08:00 |
|
|
nixzhu
|
0c49ebfbd8
|
fix playButton.tintColor may changed after present PickLocation
|
2015-09-12 16:06:50 +08:00 |
|
|
nixzhu
|
13c07ce780
|
update version 1.0 (85)
|
2015-09-12 11:39:26 +08:00 |
|
|
nixzhu
|
db8c6cbaf9
|
Merge branch 'feature/monkey_king' into develop
|
2015-09-12 11:38:28 +08:00 |
|
|
nixzhu
|
1a90d231c3
|
add convenient WeChatActivity
|
2015-09-12 11:35:45 +08:00 |
|
|
nixzhu
|
e30db47e79
|
remove WeixinSDK, use MonkeyKing instead; prepare for iOS 9 LSApplicationQueriesSchemes
|
2015-09-12 11:12:31 +08:00 |
|
|
nixzhu
|
3a263ab660
|
add AnyActivity
|
2015-09-12 10:30:31 +08:00 |
|
|
nixzhu
|
41816eb641
|
add MonkeyKing
|
2015-09-12 10:28:39 +08:00 |
|
|
nixzhu
|
c146d59f39
|
new logic of textAlignment
|
2015-09-11 12:33:53 +08:00 |
|
|
kevinzhow
|
eb86100e82
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-09-11 12:27:14 +08:00 |
|
|
nixzhu
|
afb1111ba2
|
layoutSubviews for ChatLeftAudioCell
|
2015-09-11 12:03:34 +08:00 |
|
|
nixzhu
|
3d49247ea9
|
try fix layout broken of ChatRightAudioCell
|
2015-09-11 12:02:14 +08:00 |
|
|
nixzhu
|
fd22609f2a
|
Merge branch 'feature/location_name' into develop
|
2015-09-10 19:25:04 +08:00 |
|
|
nixzhu
|
271b03b7b2
|
mapItem.name
|
2015-09-10 19:24:16 +08:00 |
|
|
kevinzhow
|
ff74860c8f
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
Conflicts:
Yep/Info.plist
|
2015-09-10 19:19:58 +08:00 |
|
|
nixzhu
|
907e0b55b3
|
detail of location cell
|
2015-09-10 19:18:44 +08:00 |
|
|
nixzhu
|
4282b4be6e
|
use location_bottom_shadow
|
2015-09-10 19:08:05 +08:00 |
|
|
nixzhu
|
d36658570a
|
logic of bottom shadow for map image bubble
|
2015-09-10 18:36:07 +08:00 |
|
|
nixzhu
|
c4aed89bfe
|
sendLocation with Location.Info
|
2015-09-10 18:09:26 +08:00 |
|
|
nixzhu
|
f2d6b2a380
|
use Location.Info
|
2015-09-10 17:59:01 +08:00 |
|
|
nixzhu
|
afd55337d6
|
add locationNameLabel to ChatRightLocationCell
|
2015-09-10 17:35:04 +08:00 |
|
|
nixzhu
|
65ff3b3425
|
add locationNameLabel for ChatLeftLocationCell
|
2015-09-10 17:31:41 +08:00 |
|
|
nixzhu
|
d84cebbe75
|
update version 1.0 (84)
|
2015-09-10 15:52:48 +08:00 |
|
|
nixzhu
|
1f57d4d5da
|
Merge branch 'feature/wechat_activities' into develop
|
2015-09-10 15:44:03 +08:00 |
|
|
nixzhu
|
4ca2e528d4
|
wechat icons
|
2015-09-10 15:42:57 +08:00 |
|