783 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Victoria Wang	745bfaeb27	merge	2014-10-17 16:05:22 -07:00
Victoria Wang	2a73fac5d3	Initial stab at making plan charts look okay at small screen sizes	2014-10-17 15:57:07 -07:00
Kyle Drake	6448cc2363	big updates to text on index	2014-10-17 15:53:28 -07:00
Victoria Wang	e917023fe9	Some style and punctuation changes to pricing plans	2014-10-17 14:39:23 -07:00
Kyle Drake	edb2da5f50	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-10-15 19:06:46 -07:00
Kyle Drake	8345b7aa04	update plans for live data and extra fun things	2014-10-15 19:06:39 -07:00
Victoria Wang	1c2433c670	Fixed site portrait in news feed sidebar	2014-10-15 19:04:57 -07:00
Victoria Wang	570db1211b	Removing tips data for now	2014-10-15 18:11:17 -07:00
Victoria Wang	0937bc0306	Header dropdown menu tweaks	2014-10-15 17:49:17 -07:00
Victoria Wang	6bb76f1894	News feed suggestions now using the same site gallery style as the browse page	2014-10-15 17:38:19 -07:00
Victoria Wang	05ea963464	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-10-15 16:53:56 -07:00
Victoria Wang	275314513e	Tweaks to browse page	2014-10-15 16:52:48 -07:00
Kyle Drake	f5bb352032	lil fixes for new index and plans	2014-10-15 16:46:16 -07:00
Victoria Wang	ae2bd68858	Fixes to following/follower lists	2014-10-15 16:17:29 -07:00
Victoria Wang	c1939b5d72	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-10-15 16:04:02 -07:00
Kyle Drake	dbdf55841f	fix tests	2014-10-15 15:43:29 -07:00
Victoria Wang	bc39a77dc0	Changed popover colors	2014-10-15 15:41:08 -07:00
Kyle Drake	f2bf9da535	move new index mockup to main index	2014-10-15 15:33:22 -07:00
Kyle Drake	8cb368e584	fix for tags	2014-10-15 15:24:23 -07:00
Victoria Wang	600eefeecf	Finished up follow button	2014-10-14 23:27:33 -07:00
Victoria Wang	f2e57193dd	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-10-14 22:42:20 -07:00
Victoria Wang	5011d83436	Almost where I want the follow button to be, but not quite	2014-10-14 22:42:13 -07:00
Kyle Drake	8914219a75	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-10-13 18:56:20 -07:00
Kyle Drake	3750e25a7a	more fixes for cleantags	2014-10-13 18:56:12 -07:00
Victoria Wang	8665e70be1	Stopgap fix for long site names breaking the header dropdown, shadow adjustment	2014-10-13 18:46:16 -07:00
Kyle Drake	5db702cf14	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-10-13 18:24:21 -07:00
Kyle Drake	26c27cef49	nsfw tags filtered (for now), fix to tag cleanup	2014-10-13 18:24:14 -07:00
Victoria Wang	a6b01bc004	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-10-13 18:05:57 -07:00
Victoria Wang	ed86705411	Fixed size of screenshot in site profile	2014-10-13 18:05:47 -07:00
Kyle Drake	56f2f5bfb4	add nsfw boolean for tags	2014-10-13 17:39:42 -07:00
Kyle Drake	19bb544b78	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-10-13 17:36:04 -07:00
Kyle Drake	4bfdd9bbc3	fix display of flattr	2014-10-13 17:35:56 -07:00
Victoria Wang	4713c99041	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-10-13 17:33:24 -07:00
Victoria Wang	ffc3d49af7	Fixed notification display for firefox	2014-10-13 17:33:17 -07:00
Kyle Drake	7f5c2a1cfe	fix donation link	2014-10-13 17:30:43 -07:00
Kyle Drake	24d2368f6e	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-10-13 17:15:27 -07:00
Kyle Drake	54376428ef	remove counter	2014-10-13 17:15:15 -07:00
Victoria Wang	86a1d2dcac	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-10-13 17:10:38 -07:00
Victoria Wang	1b75c950bd	Fixing issues with header dropdown menu's submenu	2014-10-13 17:10:22 -07:00
Kyle Drake	47dde508d3	fix news feed display, notifications, fix tag create	2014-10-13 17:09:13 -07:00
Kyle Drake	7f5f028cc5	fix dep injection	2014-10-13 16:37:40 -07:00
Kyle Drake	4bdf43097e	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-10-13 15:22:17 -07:00
Kyle Drake	1d14f973ce	ignore textmate turds	2014-10-13 15:22:11 -07:00
Victoria Wang	a362c89e42	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-10-13 15:20:57 -07:00
Victoria Wang	ed660595df	merge commit	2014-10-13 15:18:00 -07:00
Kyle Drake	b4f04cdab8	update ace editor, auto sizing	2014-10-13 15:16:42 -07:00
Victoria Wang	d0a4991079	Browse page - initial work on adding tags for individual sites, switching to 3 columns at a certain browser width	2014-10-13 15:04:38 -07:00
Kyle Drake	7f7b1fc8d5	pull-right for submenu for switch sites	2014-10-13 14:38:49 -07:00
Kyle Drake	6995409c50	merge parentsites with v2	2014-10-12 09:33:39 -07:00
Kyle Drake	52fde7a0d5	fix supporter plan management	2014-10-12 09:11:20 -07:00