854 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Kyle Drake	609cee1c17	track subscription ids	2014-10-25 16:56:53 -07:00
Kyle Drake	5235286d8a	supporter refactor	2014-10-24 18:45:42 -07:00
Kyle Drake	e82e1b4631	tweaks to pricing page	2014-10-24 18:37:03 -07:00
Kyle Drake	ecd838c891	Merge violasong changes	2014-10-24 18:16:05 -07:00
Kyle Drake	d2f46fdf66	implement skeuocard and upgrade capability	2014-10-24 18:16:00 -07:00
Victoria Wang	a2f9c65a3f	Remove stray accent character	2014-10-24 17:11:58 -07:00
Victoria Wang	e575d18019	Style adjustments to updated signup form	2014-10-24 17:00:54 -07:00
Victoria Wang	fa9d7c39ac	merge kyledrake changes	2014-10-24 16:43:51 -07:00
Kyle Drake	f2180b1385	fix fields for validate	2014-10-24 16:43:24 -07:00
Victoria Wang	3613991fc2	Prevent ugly chrome autofill behavior in signup form via ridiculous hack	2014-10-24 16:33:29 -07:00
Kyle Drake	58131f4964	Merge violasong changes	2014-10-24 16:26:40 -07:00
Kyle Drake	9c5337edae	Initial start on plan refactor	2014-10-24 16:26:32 -07:00
Kyle Drake	31c43c3170	Fix and add mock black box	2014-10-24 16:25:53 -07:00
Victoria Wang	06205e7bde	More alignment fixes for news feed	2014-10-24 16:13:50 -07:00
Victoria Wang	f26ee30b74	fix merge conflicts	2014-10-24 15:50:05 -07:00
Victoria Wang	7e25397845	News feed changes - cleaned up text, improved colors/alignment	2014-10-24 15:48:03 -07:00
Victoria Wang	0b013b55de	Added supporter heart to supporter usernames in surf bar	2014-10-24 15:18:01 -07:00
Kyle Drake	9584cf9a67	fix autosubmit for typeahead	2014-10-23 20:06:03 -07:00
Victoria Wang	9ca5caab9d	Reverting to large icon style for all comments	2014-10-23 19:44:12 -07:00
Victoria Wang	7d43fe2ab8	Trying out small icon style for my friends' comments on someone else's page	2014-10-23 19:41:05 -07:00
Kyle Drake	6e4ad797d5	Merge violasong changes	2014-10-23 17:54:48 -07:00
Kyle Drake	5c96a4d4ce	add comment on index.html edit	2014-10-23 17:54:28 -07:00
Victoria Wang	d56beab370	Merge kyledrake changes	2014-10-23 17:32:32 -07:00
Victoria Wang	7163fec474	Fixes to newsfeed file listing styles	2014-10-23 17:32:26 -07:00
Kyle Drake	bf4381e1ca	Merge violasong commits	2014-10-23 17:25:20 -07:00
Kyle Drake	4e987286ee	improvements to text editor	2014-10-23 17:25:14 -07:00
Victoria Wang	26a1af2bcc	Merge kyledrake changes	2014-10-23 16:59:32 -07:00
Victoria Wang	5e83b7f4b5	css3 fix for surf bar iframe height issues	2014-10-23 16:56:47 -07:00
Victoria Wang	f580cf2856	Changed surf bar popover colors	2014-10-23 16:17:37 -07:00
Victoria Wang	df30d5879e	Surf bar style refinements	2014-10-23 16:12:13 -07:00
Kyle Drake	d83fbf81d3	fix news feed and site profile event activity	2014-10-23 15:39:10 -07:00
Kyle Drake	15c60cb6a8	limit ip site creation	2014-10-22 22:32:02 -07:00
Kyle Drake	9140f3b929	fix merge cflct	2014-10-22 22:08:09 -07:00
Kyle Drake	42e2935916	implement new signup form validation	2014-10-22 22:06:36 -07:00
Victoria Wang	3016ef8d79	adjusted news feed pagination style	2014-10-21 19:27:28 -07:00
Victoria Wang	1fd6dd9101	Fixed browse page surf links	2014-10-21 19:14:38 -07:00
Victoria Wang	9cc9b0e5d7	Removed actions from follow events, style changes to news feed	2014-10-21 17:40:49 -07:00
Victoria Wang	f1ffd458e4	Fixed small comment avatars	2014-10-21 17:29:47 -07:00
Victoria Wang	bb5bb45687	Fixed screenshots in following section in sidebar	2014-10-21 17:29:17 -07:00
Victoria Wang	a1ba1a0974	Added user icon to usernames, with heart icon denoting supporter status	2014-10-21 16:25:52 -07:00
Victoria Wang	f30b77a3e0	Made the site updated box a bit more subtle	2014-10-21 16:24:45 -07:00
Victoria Wang	f8a27aec6c	Merge kyledrake changes	2014-10-21 16:22:59 -07:00
Kyle Drake	1aac62923d	Site creation is back online	2014-10-21 15:12:25 -07:00
Kyle Drake	6c4cacbd3e	slight adjustment to suggestions	2014-10-21 14:49:10 -07:00
Victoria Wang	fb437bf2cf	Fixed dashboard screenshot image	2014-10-20 18:02:01 -07:00
Kyle Drake	39a7b93cc1	fix test, fix home display for own site updates	2014-10-20 17:39:23 -07:00
Kyle Drake	8d592bb982	ability to follow sites from surf page	2014-10-20 17:31:03 -07:00
Victoria Wang	8a0d556fc7	Fixed Open Company link	2014-10-20 17:20:49 -07:00
Kyle Drake	8649973d71	fix for missing tag	2014-10-20 17:09:52 -07:00
Kyle Drake	1a55ca93d8	Merge violasong changes	2014-10-20 17:03:42 -07:00