1165 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Kyle Drake	fe9b051c87	fix for derpie behavior of successmultiple firing for each upload	2015-02-25 20:49:46 -08:00
Kyle Drake	ca2a0c057b	missing file for empty js test #85	2015-02-25 14:28:15 -08:00
Kyle Drake	79b2d2322e	Merge branch 'master' of github.com:neocities/neocities	2015-02-25 14:25:54 -08:00
Kyle Drake	d0d6cec34e	permit uploading of empty files #85	2015-02-25 14:24:52 -08:00
Victoria Wang	671f5af493	Site profile - fixed pluralization of values in header, moved Number of Updates from sidebar to header #64	2015-02-24 22:58:24 -06:00
Victoria Wang	804067d9c3	Quick conversion of Global Activity page into the standard one-column layout. This will eventually be turned into a two-col layout.	2015-02-24 22:33:22 -06:00
Victoria Wang	fbf66be7b0	Assuming "websome" was a typo ;)	2015-02-24 21:44:42 -06:00
Victoria Wang	14ebe8128a	Misc header tweaks	2015-02-24 21:43:07 -06:00
Kyle Drake	762b3c7ba6	Merge branch 'master' of github.com:neocities/neocities	2015-02-24 18:14:01 -08:00
Kyle Drake	3c40fb6503	touch up the alternate payment page, switch to new paypal account	2015-02-24 18:13:44 -08:00
Victoria Wang	9aa0f245ea	Merge branch 'master' of github.com:neocities/neocities	2015-02-24 16:46:52 -06:00
Victoria Wang	2209c54fc3	More tweaks to /welcome styles and copy	2015-02-24 16:46:32 -06:00
Kyle Drake	474f5be8e7	disable cache on stats until I can figure out the top bar problem	2015-02-24 13:51:19 -08:00
Victoria Wang	ac44a0419d	Fix font problem with skeuocard on /welcome	2015-02-24 15:33:48 -06:00
Kyle Drake	029eb57b85	New welcome page #54	2015-02-24 13:23:15 -08:00
Kyle Drake	7390dbbd4c	push back byebug for mri	2015-02-24 08:14:10 -08:00
Kyle Drake	d500721788	gemfile deps fixes for Rubinius	2015-02-24 07:57:18 -08:00
Kyle Drake	016de5f983	push daily limit to 1000	2015-02-23 08:02:02 -08:00
Kyle Drake	478156ea88	Merge branch 'master' of github.com:neocities/neocities	2015-02-23 07:54:58 -08:00
Kyle Drake	c01d130e4d	up limits for ips	2015-02-23 07:54:34 -08:00
Victoria Wang	23c8fc9ed7	Welcome pricing margin tweaks	2015-02-21 16:51:57 -06:00
Victoria Wang	4849a0cefb	Welcome signup improvements for large and small screen widths	2015-02-21 16:24:30 -06:00
Kyle Drake	d56edd80ec	better error reporting to help fix bugs	2015-02-21 14:08:27 -08:00
Kyle Drake	b782632b69	Merge branch 'master' of github.com:neocities/neocities	2015-02-21 09:00:27 -08:00
Kyle Drake	cb1bb24d86	attempted fix for weird encoding problem	2015-02-21 09:00:17 -08:00
Victoria Wang	ef404e4d20	More progress on welcome signup	2015-02-20 00:00:00 -06:00
Victoria Wang	c3b58beb68	Merge branch 'master' of github.com:neocities/neocities	2015-02-18 00:00:35 -06:00
Victoria Wang	bf48e03b9a	Initial styles for the welcome pricing page	2015-02-17 23:59:47 -06:00
Kyle Drake	1f01baf664	non https for hosts	2015-02-17 18:00:00 -08:00
Kyle Drake	78a5791e5a	disable cache for now on activity closes #72	2015-02-17 17:57:46 -08:00
Kyle Drake	12b7a2830e	tweak numbers	2015-02-15 13:21:34 -08:00
Kyle Drake	60f9b5b589	cached global activity feed, publicly acessible #69	2015-02-15 13:18:54 -08:00
Kyle Drake	41a7cb763d	tweaks to global feed	2015-02-15 12:01:17 -08:00
Kyle Drake	d53b6584d5	global activity feed	2015-02-14 13:16:46 -08:00
Kyle Drake	8fba5e7a9b	Merge branch 'master' into supporter_plan_display_after_signup	2015-02-13 15:20:50 -08:00
Kyle Drake	a8edcc8ab6	disable email spam notifications for now	2015-02-13 12:06:22 -08:00
Kyle Drake	fbe00f6f9c	delete nested site_files when directory is deleted	2015-02-13 11:54:18 -08:00
Kyle Drake	e6aaba74fb	link to site within following text	2015-02-12 16:02:48 -08:00
Kyle Drake	af2b7a3f86	switch to manual is_delete checking to prevent derpie errors from sites deleting	2015-02-12 15:55:38 -08:00
Kyle Drake	0552b4e9b7	Merge branch 'master' of github.com:neocities/neocities	2015-02-12 15:35:53 -08:00
Kyle Drake	0d73682ba1	remove events when site is deleted	2015-02-12 15:34:02 -08:00
Victoria Wang	e9bbb20c48	Small fix to heart in header nav	2015-02-11 14:15:01 -06:00
Kyle Drake	84f4c3b3aa	Welcome screen for new users	2015-02-10 19:15:49 -08:00
Victoria Wang	91aad73da5	Merge branch 'master' of github.com:neocities/neocities	2015-02-08 16:34:07 -06:00
Kyle Drake	c66a935cb1	Ability to delete sites, #29	2015-02-07 20:44:52 -08:00
Victoria Wang	6a59cb65cf	Merge branch 'master' of github.com:neocities/neocities	2015-02-06 14:00:28 -06:00
Victoria Wang	8b1f7f1e8c	Fixes to browse page/site suggestions screenshot galleries on mobile	2015-02-06 14:00:19 -06:00
Kyle Drake	a5307448bb	file delete fix for apostrophes fixes #40	2015-02-04 14:24:43 -08:00
Kyle Drake	cf4edffbe0	fix for travis	2015-02-03 20:49:12 -08:00
Kyle Drake	5fb16d967f	Merge branch 'markup-accessibility'	2015-02-03 20:41:13 -08:00