589 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Victoria Wang	3048e88685	Changed main body font from Open Sans to Lucida Grande	2014-04-21 19:15:26 -07:00
Kyle Drake	4773973bfe	flash messages for dashboard, remove welcome after 5 changes	2014-04-21 18:33:52 -07:00
Kyle Drake	0a636b2397	code to delete thumbnails and screenshots	2014-04-21 18:30:25 -07:00
Kyle Drake	b0e1a47e19	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-04-21 16:47:51 -07:00
Kyle Drake	869b284425	image thumbnails, catch crashy sites with screenshots	2014-04-21 16:47:43 -07:00
Victoria Wang	74e982c8ee	Improvements to profiles mockup, adding news feed mockup	2014-04-21 14:44:58 -07:00
Victoria Wang	213faa91d7	Merge branch 'v2' of github.com:neocities/neocities into v2	2014-04-21 12:19:47 -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	3ae77e248f	Deleting old "new-Design" directory (from initial conversion from the bootstrap layout)	2014-04-19 16:11:19 -07:00
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