4222 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
nixzhu	aa0a509301	Merge branch 'feature/fill_more_skills' into develop	2015-05-08 13:49:18 +08:00
nixzhu	5a619dd0cb	add CustomNavigationBarViewController; fix NavigationBar Style when push/pop multil times	2015-05-08 13:48:57 +08:00
nixzhu	d1dbbaa789	SkillHome isFirstAppear	2015-05-08 13:37:44 +08:00
nixzhu	f09b9936ab	fix skillsFromSkillsData for allSkillCategories in register	2015-05-08 13:32:47 +08:00
nixzhu	a9faed0534	fill skillCategory & cover for DiscoveredUser's skills	2015-05-08 13:27:54 +08:00
nixzhu	ef1575fde0	sync lastSignInAt	2015-05-08 13:11:27 +08:00
nixzhu	830d1730d6	sync group members' skills info	2015-05-08 12:56:40 +08:00
nixzhu	c7f41478eb	sync userSkillCategory	2015-05-08 12:41:05 +08:00
nixzhu	fd7eb79650	add UserSkillCategory; UserSkill add category & coverURLString; first Migration	2015-05-08 12:20:17 +08:00
kevinzhow	0e42dd436c	remove space	2015-05-07 17:59:31 +08:00
nixzhu	79dfb72601	fix confict	2015-05-07 15:28:54 +08:00
nixzhu	6bb20c5592	Merge remote-tracking branch 'origin/develop' into develop	2015-05-07 15:23:21 +08:00
nixzhu	a0a72af325	Merge branch 'feature/better_message_preview' into develop	2015-05-07 15:21:31 +08:00
nixzhu	b3dbecf3fd	pause video when dismiss	2015-05-07 15:20:45 +08:00
nixzhu	d59c87dfb0	share	2015-05-07 15:15:36 +08:00
nixzhu	c52907a690	playOrPause	2015-05-07 14:39:48 +08:00
nixzhu	d7f66411c1	fix duration NaN	2015-05-07 14:31:11 +08:00
nixzhu	88b8ea66d0	check playerItemDidReachEnd	2015-05-07 14:29:32 +08:00
nixzhu	9a2043b003	play count down in seconds	2015-05-07 14:02:25 +08:00
nixzhu	20af11ffab	add MediaControlView.PlayState for play control	2015-05-07 13:30:13 +08:00
nixzhu	af8c6b1efb	set mediaControlView in transition animation	2015-05-07 13:23:03 +08:00
nixzhu	b6be2ba760	add MediaControlView.Type for Image or Video Control	2015-05-07 13:19:12 +08:00
nixzhu	73abd6da0b	add MediaControlView	2015-05-07 01:59:25 +08:00
kevinzhow	de61b70a4d	Add isStateFirstInit	2015-05-07 01:06:17 +08:00
kevinzhow	2f68d6f4d6	Merge branch 'feature/skill_home_page' into develop	2015-05-07 00:54:46 +08:00
kevinzhow	7a2716df71	Tableview Navigation	2015-05-07 00:54:20 +08:00
nixzhu	c99b3312e0	fix downloadAttachmentOfMessage for thumbnail	2015-05-07 00:05:53 +08:00
nixzhu	8a5890e026	fix thumbnail uploadFileToS3	2015-05-07 00:04:23 +08:00
kevinzhow	163a7f4ce2	Add tableview	2015-05-06 23:45:42 +08:00
kevinzhow	4cc3e80fd7	Change section	2015-05-06 23:26:22 +08:00
nixzhu	c8acd5ebc1	fix upload video thumbnail key	2015-05-06 22:36:18 +08:00
kevinzhow	c3cbe9cd17	Fix video gravity	2015-05-06 22:05:34 +08:00
kevinzhow	a8a302973f	Add skill home	2015-05-06 21:57:12 +08:00
nixzhu	b2e211c7f7	better logic for hide transitionView first when dismiss (feel better)	2015-05-06 21:47:10 +08:00
nixzhu	0a7f10f8f1	clean code	2015-05-06 21:34:42 +08:00
nixzhu	747281bc33	dismiss keyframe animation	2015-05-06 21:28:52 +08:00
nixzhu	6fb3403f79	sexy keyframe present animation	2015-05-06 19:33:09 +08:00
nixzhu	bba1799e3c	animation detail	2015-05-06 19:13:17 +08:00
nixzhu	a0edae6ca4	zoom in	2015-05-06 18:42:41 +08:00
nixzhu	256bdf198d	media imageView AspectFit	2015-05-06 17:02:28 +08:00
nixzhu	6a888588a5	real media frame	2015-05-06 16:27:09 +08:00
nixzhu	03e8896726	use path animation	2015-05-06 15:29:10 +08:00
nixzhu	ec99ea7456	add ConversationMessagePreviewTransitionManager	2015-05-06 14:35:02 +08:00
kevinzhow	8d0438e3cc	Update build number	2015-05-06 04:49:21 +08:00
kevinzhow	b4eb19bd20	Fix JPushSDK on cocoapods, JPush is suck	2015-05-05 17:28:58 +08:00
kevinzhow	c192502374	refine waver and sampleview	2015-05-05 15:49:32 +08:00
kevinzhow	00ee523eb6	Make sure scroll to bottom	2015-05-05 15:39:17 +08:00
kevinzhow	9d53fb5b6d	If user send message, scroll to bottom	2015-05-05 15:22:30 +08:00
nixzhu	7518d7147b	group info in conversations	2015-05-05 14:15:51 +08:00
nixzhu	367fe83858	Merge branch 'feature/location' into develop	2015-05-05 14:04:12 +08:00