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 |
|
nixzhu
|
5ca9ad0d30
|
check skillCategories in tapAction; comments
|
2015-08-11 11:33:38 +08:00 |
|
nixzhu
|
1986feb4cf
|
add skill in EditSkills
|
2015-08-11 11:29:05 +08:00 |
|
kevinzhow
|
847d0c54e1
|
Update
|
2015-08-10 23:55:37 +08:00 |
|
nixzhu
|
f453f9244b
|
fix logic of indexPathToDelete in EditSkill
|
2015-08-10 18:42:32 +08:00 |
|
nixzhu
|
819be90ffd
|
delete skill from server in EditSkills
|
2015-08-10 18:25:59 +08:00 |
|
nixzhu
|
2c3e5a4212
|
use afterChangedSkillsAction update Profile's UI after delete skill in EditSkills
|
2015-08-10 18:09:57 +08:00 |
|
nixzhu
|
a9a7d93ca9
|
removeSkillAction
|
2015-08-10 18:04:25 +08:00 |
|
nixzhu
|
165ebe7967
|
show self's skills in EditSkill
|
2015-08-10 17:52:56 +08:00 |
|
nixzhu
|
957e42a9c1
|
init skillSetType of EditSkillsViewController
|
2015-08-10 17:42:34 +08:00 |
|
nixzhu
|
890706c300
|
set BottomButtonView actionButton's title
|
2015-08-10 17:14:01 +08:00 |
|
nixzhu
|
05521541c7
|
use EditSkillCell; UI detail
|
2015-08-10 17:08:30 +08:00 |
|
nixzhu
|
500fb5182a
|
add EditSkillCell
|
2015-08-10 17:08:00 +08:00 |
|
nixzhu
|
d230263233
|
basic UI of EditSkillsViewController
|
2015-08-10 16:35:24 +08:00 |
|
nixzhu
|
8416abaed4
|
refactor SayHiView to BottomButtonView
|
2015-08-10 16:22:07 +08:00 |
|
nixzhu
|
b2515f01a2
|
add EditSkillsViewController
|
2015-08-10 16:07:08 +08:00 |
|
nixzhu
|
989aa794a9
|
do not markAsRead messages from YepTeam
|
2015-08-10 15:44:26 +08:00 |
|
nixzhu
|
8c8fe6aeb8
|
Coordinate safe version property
|
2015-08-10 15:35:51 +08:00 |
|
nixzhu
|
bec63ded77
|
refactor generate Coordinate
|
2015-08-10 15:27:27 +08:00 |
|
nixzhu
|
c5f4fcc96a
|
make sure coordinate when generate
|
2015-08-10 15:08:51 +08:00 |
|
nixzhu
|
90a73525dc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-08-10 14:47:56 +08:00 |
|
nixzhu
|
4cb82ae756
|
fix setRegion of Map
|
2015-08-10 14:46:41 +08:00 |
|
kevinzhow
|
afeabb5ba2
|
Update version
|
2015-08-10 14:31:03 +08:00 |
|
kevinzhow
|
9393b6aa5c
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-08-10 13:15:25 +08:00 |
|
kevinzhow
|
a1eeeb7815
|
Update version
|
2015-08-10 13:15:18 +08:00 |
|
nixzhu
|
fc33e3254e
|
change cacheQueue
|
2015-08-10 12:57:48 +08:00 |
|
nixzhu
|
b582a59b4f
|
avoid some force unwraps in PickLocation
|
2015-08-10 12:52:05 +08:00 |
|
nixzhu
|
f959205048
|
fix a crash in mapImageOfMessage
|
2015-08-10 12:46:33 +08:00 |
|
nixzhu
|
3f8edb99c9
|
rename voice record actions
|
2015-08-10 11:07:06 +08:00 |
|
nixzhu
|
15d627c56f
|
set swipeUpPromptLabel text when begin voice record
|
2015-08-10 10:59:26 +08:00 |
|
nixzhu
|
cf15a489e8
|
add voiceRecordingUpdateUIAction
|
2015-08-10 10:53:43 +08:00 |
|
nixzhu
|
dd24f23f74
|
add activityIndicator to SkillHome
|
2015-08-10 09:06:27 +08:00 |
|
kevinzhow
|
0fca36c8f1
|
Solve Navigation Bar For Skill Home
|
2015-08-10 02:39:13 +08:00 |
|
kevinzhow
|
e8d41d4d60
|
Slove Navigation Bar Problem and Better pop gesture
|
2015-08-10 02:29:22 +08:00 |
|
kevinzhow
|
22f4899747
|
Merge branch 'develop' of https://github.com/CatchChat/Yep into develop
|
2015-08-07 23:17:56 +08:00 |
|
kevinzhow
|
634aeebe9e
|
Update pod file
|
2015-08-07 23:17:47 +08:00 |
|
nixzhu
|
83ec28372c
|
use weak self
|
2015-08-07 16:19:13 +08:00 |
|
nixzhu
|
df56586b54
|
clean code
|
2015-08-07 16:16:13 +08:00 |
|
nixzhu
|
81a8492130
|
use ChatCell.lineSpacing
|
2015-08-07 16:13:35 +08:00 |
|
nixzhu
|
b31c694448
|
remove unused done
|
2015-08-07 16:07:21 +08:00 |
|
nixzhu
|
d1e077003c
|
request officialMessages when receive official_message notification
|
2015-08-07 14:30:57 +08:00 |
|
nixzhu
|
7b1c45fbf3
|
Merge branch 'feature/official_messages' into develop
|
2015-08-07 14:18:28 +08:00 |
|
nixzhu
|
aa41a7d79a
|
print count
|
2015-08-07 14:05:05 +08:00 |
|