293 commits

Author	SHA1	Message	Date
Victoria Wang	08f95ccebb	Some little tweaks for IE, etc	2014-04-22 16:44:10 -07:00
Kyle Drake	5c438b40c0	remove drag and drop msg after 5 files	2014-04-22 15:54:45 -07:00
Kyle Drake	c3bf65a136	allowed file types	2014-04-22 15:49:47 -07:00
Kyle Drake	258e35cfc0	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-04-22 15:03:36 -07:00
Kyle Drake	e774deb5ca	copy changes, fix links	2014-04-22 15:03:29 -07:00
Victoria Wang	0f9c1fc83c	Added an uploading dialog to dashboard, more tweaks	2014-04-22 14:58:15 -07:00
Victoria Wang	5b1b1003a6	Fixed a bunch of alignment issues with files on the dashboard	2014-04-22 11:55:50 -07:00
Kyle Drake	fa3eba3a22	more and more copy	2014-04-22 10:32:44 -07:00
Kyle Drake	de10d445d2	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-04-22 10:29:14 -07:00
Kyle Drake	d70ef2cb07	more style / copy changes	2014-04-22 10:29:08 -07:00
Victoria Wang	eb40d888ad	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-04-22 01:02:31 -07:00
Victoria Wang	54b1eb363f	Initial progress in coding the new (logged in) home page with news feed	2014-04-22 01:02:19 -07:00
Kyle Drake	ce7289ac0b	copy/layout fixes	2014-04-21 20:03:52 -07:00
Kyle Drake	ae58a59b0e	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-04-21 19:28:53 -07:00
Kyle Drake	67c8fba0db	copy changes	2014-04-21 19:28:50 -07:00
Victoria Wang	fd22635f28	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-04-21 19:21:58 -07:00
Victoria Wang	317f826ec5	css tweak	2014-04-21 19:21:52 -07:00
Kyle Drake	4773973bfe	flash messages for dashboard, remove welcome after 5 changes	2014-04-21 18:33:52 -07:00
Kyle Drake	869b284425	image thumbnails, catch crashy sites with screenshots	2014-04-21 16:47:43 -07:00
Kyle Drake	b488cf4347	refactor screenshots to work for all pages	2014-04-20 19:04:41 -07:00
Kyle Drake	72c971ae98	better last updated	2014-04-19 19:56:02 -07:00
Kyle Drake	dda7e10c38	merge fix	2014-04-19 19:54:16 -07:00
Kyle Drake	1b7430f1db	file uploading for dashboard	2014-04-19 19:52:46 -07:00
Victoria Wang	c49c1f961f	Dashboard tweaks	2014-04-19 15:30:06 -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	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	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	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	a3b7e33af1	Changes to dashboard incl some initial styling/cleaning up of the file listing	2014-04-16 18:31:34 -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
Kyle Drake	d30ecb5e1d	use a single footer	2014-04-14 10:04:30 -07:00