461 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Victoria Wang	808ca37c31	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-04-19 15:49:00 -07:00
Kyle Drake	4b19f3c091	fix file save	2014-04-19 15:45:20 -07:00
Victoria Wang	c49c1f961f	Dashboard tweaks	2014-04-19 15:30:06 -07:00
Victoria Wang	bcc9540874	Changes to .interior and .footer-Base to fix up-bleeding scrunched up footer bug on dashboard	2014-04-19 15:19:25 -07:00
Victoria Wang	3da25c1297	Clean up errant tag	2014-04-19 15:18:06 -07:00
Kyle Drake	11ec36035c	fix delete dialog	2014-04-19 14:30:53 -07:00
Kyle Drake	070d8f1218	no ads, ever.	2014-04-19 14:19:34 -07:00
Kyle Drake	051dc69aa6	few more supporter copy fixes	2014-04-19 14:09:28 -07:00
Kyle Drake	658f542e51	fixes for copy for support us page	2014-04-19 14:07:28 -07:00
Kyle Drake	488ed776c6	add in victoria's fixes	2014-04-19 14:03:02 -07:00
Kyle Drake	98496698cb	This completes the stripe integration for existing sites	2014-04-19 14:02:19 -07:00
Victoria Wang	5052b34987	Fixed css issue with homepage signup box	2014-04-19 13:26:31 -07:00
Victoria Wang	c7f342f590	Initial site profile design	2014-04-19 00:34:33 -07:00
Victoria Wang	bb77447e7f	More dashboard tweaks	2014-04-19 00:32:52 -07:00
Victoria Wang	4aa57086e0	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-04-18 16:54:18 -07:00
Victoria Wang	225c6f087c	More CSS for the new interior page style. Starting to convert some of the interior pages over.	2014-04-18 16:54:00 -07:00
Kyle Drake	410acd3e7e	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-04-18 16:19:56 -07:00
Kyle Drake	211f34438c	small fixes for signup	2014-04-18 16:19:47 -07:00
Victoria Wang	071300df2f	merge conflict fix	2014-04-18 15:56:15 -07:00
Kyle Drake	1031324920	implement plan code	2014-04-18 15:40:08 -07:00
Victoria Wang	e5d9c01d69	More images for the new dashboard	2014-04-18 13:59:19 -07:00
Victoria Wang	075a37de27	More work on dashboard file listing - added support for non-html/image files	2014-04-18 13:58:04 -07:00
Victoria Wang	6d1d1e31b4	For now at least, designating neo.css as the minified version and linking html files to it. (Way easier sass command line workflow this way)	2014-04-18 13:57:23 -07:00
Kyle Drake	138725d00b	fix acceptance tests	2014-04-17 20:24:32 -07:00
Kyle Drake	66e6a3d38c	fixes for erb templates	2014-04-17 20:21:02 -07:00
Kyle Drake	04ec621dfe	double equals for layout	2014-04-17 19:06:20 -07:00
Victoria Wang	873c2c6467	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-04-17 14:29:21 -07:00
Victoria Wang	e1bf1baca8	Commented out things related to folders, which will not be ready yet. Added an overlaying link box for the filename link that I covered up with the translucent dark overlays.	2014-04-17 14:29:09 -07:00
Kyle Drake	2b004fca1a	fix merge	2014-04-17 14:16:40 -07:00
Kyle Drake	a96f16fded	work on converting slim to erb	2014-04-17 14:12:12 -07:00
Victoria Wang	7b6f796ecb	CSS for files in file listing, with edit/delete overlay.	2014-04-16 22:27:23 -07:00
Victoria Wang	7d1e9d5b4f	compressed CSS changes	2014-04-16 18:32:27 -07:00
Victoria Wang	bce6da0b75	Changed app.rb to reference erb instead of slim for the dashboard	2014-04-16 18:32:09 -07:00
Victoria Wang	a3b7e33af1	Changes to dashboard incl some initial styling/cleaning up of the file listing	2014-04-16 18:31:34 -07:00
Victoria Wang	b0432b3f5f	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-04-16 17:52:56 -07:00
Victoria Wang	57e2a10625	Edits to header css (some related to new dashboard changes)	2014-04-16 17:52:26 -07:00
Victoria Wang	203ad0d2d1	dashboard.erb and related images	2014-04-16 17:50:51 -07:00
Victoria Wang	f9f90b6f6d	CSS and adjusted layout.erb for new dashboard design (non-dashboard pages need to be fixed)	2014-04-16 17:50:01 -07:00
Victoria Wang	1124ab6c87	Added Sass to Gemfile	2014-04-16 17:47:40 -07:00
Kyle Drake	cff94803a9	add social schema, associations	2014-04-16 15:16:36 -07:00
Kyle Drake	c0b362ea43	mockup routes	2014-04-15 16:49:14 -07:00
Kyle Drake	6ecf5539b5	check for empty username	2014-04-15 16:43:13 -07:00
Kyle Drake	c9a2638acf	fix contrib copy	2014-04-14 10:09:36 -07:00
Kyle Drake	f03163e70e	fix contrib copy	2014-04-14 10:08:52 -07:00
Kyle Drake	e799e72c15	contrib info	2014-04-14 10:08:32 -07:00
Kyle Drake	d30ecb5e1d	use a single footer	2014-04-14 10:04:30 -07:00
Kyle Drake	5d931efd7f	fix create page template	2014-04-14 08:46:56 -07:00
Kyle Drake	978219d0e0	http -> https	2014-04-13 21:09:12 -07:00
Kyle Drake	ade9bedc33	https for screenshots	2014-04-13 21:03:37 -07:00
Kyle Drake	21fe0d524b	Merge branch 'master' of github.com:neocities/neocities	2014-04-13 21:03:25 -07:00