1385 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Kyle Drake	6ccabdc5f4	add lsyncd config	2015-03-01 15:29:35 -08:00
Kyle Drake	73adf1f984	clarify revenue after fees	2015-03-01 11:32:08 -08:00
Kyle Drake	251ecc8aca	Merge branch 'master' of github.com:neocities/neocities	2015-03-01 11:30:26 -08:00
Kyle Drake	41c4a5a1ef	calculate the real revenue on stats after credit card fees	2015-03-01 11:30:21 -08:00
Victoria Wang	c8bd1b3d59	Slight change to wording of dashboard welcome dialog #77	2015-02-28 22:39:08 -06:00
Kyle Drake	fbee506f88	fix quartz link	2015-02-28 08:42:00 -08:00
Kyle Drake	a0f02cf2c5	Merge branch 'master' of github.com:neocities/neocities	2015-02-27 20:32:27 -08:00
Kyle Drake	e32bd5d85a	moar press	2015-02-27 20:32:21 -08:00
Victoria Wang	0ef25a55b7	Removed "Neocities" top menu link from signed-in homepage and "About" top menu link from all pages	2015-02-27 21:26:12 -06:00
Kyle Drake	7f8fdb159d	add press	2015-02-27 17:10:13 -08:00
Kyle Drake	314e67adcd	a little bit faster cache recycle	2015-02-27 12:10:29 -08:00
Kyle Drake	e1ef255f84	prohibit third-party form sites that are almost exclusively used for phishing	2015-02-27 09:44:43 -08:00
Kyle Drake	c2978f03f0	admin link if admin	2015-02-26 15:57:11 -08:00
Kyle Drake	05860c2193	XMerge branch 'master' of github.com:neocities/neocities	2015-02-26 11:17:46 -08:00
Kyle Drake	b822d4345b	ability to view individual event #71:close	2015-02-26 11:17:40 -08:00
Victoria Wang	122c9eeb89	Merge branch 'master' of github.com:neocities/neocities	2015-02-26 00:24:30 -06:00
Kyle Drake	c28a72df5c	updated gemfile.lock	2015-02-26 05:12:00 +00:00
Kyle Drake	781e85f908	set mode correctly for ace editor [#93:closed]	2015-02-25 21:10:46 -08:00
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
Riccardo Spagni	67f8573d31	minor readme fix	2015-02-25 13:46:46 +02:00
Victoria Wang	d2daf69167	Added target="_blank" to Twitter and RSS in the share pop up	2015-02-24 23:02:46 -06: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