1132 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Kyle Drake	2c9029c998	Update cat-larger.png and use SVG for not found logo	2015-02-03 20:40:43 -08:00
Kyle Drake	0d72dea0d7	Merge pull request #46 from neocities/markup-accessibility ... markup & accessibility updates	2015-02-03 20:36:02 -08:00
Scott	42820c848b	markup & accessibility updates ... quick pass through some files to get some low hanging accessibility & markup semantic updates.	2015-02-02 20:54:35 -05:00
Kyle Drake	963bb29d9d	fix stats (i think)	2015-02-02 14:27:54 -08:00
Kyle Drake	4da6fe9da4	admin interface baked into browse	2015-02-02 12:50:04 -08:00
Kyle Drake	847f28c6af	missing views limit	2015-01-31 16:12:16 -08:00
Kyle Drake	981118b9fd	minimum 100 views for browse to reduce noise	2015-01-31 16:07:55 -08:00
Kyle Drake	9038141e28	Vagrantfile and provision scripts for development	2015-01-31 15:50:12 -08:00
Kyle Drake	46883b2bdd	Merge branch 'master' of github.com:neocities/neocities	2015-01-30 16:53:58 -08:00
Kyle Drake	042e3e11e6	Fix for ruby 2.2.0	2015-01-30 16:53:40 -08:00
Kyle Drake	5296e486e6	Plug a leak for customers with no subscription	2015-01-30 16:34:00 -08:00
Kyle Drake	f5faa8877c	Clean up valid data test	2015-01-29 15:11:51 -08:00
Victoria Wang	d3c5e0f765	Merge branch 'master' of github.com:neocities/neocities	2015-01-20 23:52:00 -06:00
Kyle Drake	1553229b95	exclude banned and nsfw sites from suggestions	2015-01-20 16:30:22 -08:00
Kyle Drake	ded6275c71	use send_email for welcome email	2015-01-20 16:26:31 -08:00
Victoria Wang	63a7d1edb5	Fix stray password field appearing on small screens	2015-01-19 23:34:29 -06:00
Kyle Drake	54a5a8b30f	unused code in signin test	2015-01-19 10:28:36 -08:00
Kyle Drake	73f29bf9cc	deprecate the black box and the questions	2015-01-19 10:21:45 -08:00
Kyle Drake	b9530b3d43	a start on the index tests	2015-01-19 10:20:04 -08:00
Kyle Drake	9a31ecb1a1	remove unneeded code from test	2015-01-19 08:52:05 -08:00
Kyle Drake	779b44c121	acceptance tests for supporter upgrade	2015-01-19 08:46:10 -08:00
Kyle Drake	81c9a4c94c	initial implementation of stripe mocking	2015-01-18 17:07:09 -08:00
Kyle Drake	af2c4eea26	move the license	2015-01-18 16:24:21 -08:00
Kyle Drake	5085e3ccbf	fix for mount info	2015-01-18 00:46:01 -08:00
Kyle Drake	be34383627	Merge 'em changes	2015-01-18 00:35:47 -08:00
Kyle Drake	d42c4a3c7e	special upgrade machine	2015-01-18 00:35:41 -08:00
Kyle Drake	8e31f06818	preload was working, I needed to use USR2	2015-01-17 10:07:37 +00:00
Kyle Drake	4271a5e223	fix for followers pluralization	2015-01-17 02:07:11 -08:00
Kyle Drake	bd43c38753	preload_app prevents graceful restarts of code changes	2015-01-16 17:19:12 -08:00
Kyle Drake	70f2057854	fix for titles coming from subdir indexes	2015-01-16 17:10:37 -08:00
Kyle Drake	8ed3183c5f	a pretty good template for email sending in a fever	2015-01-15 23:14:32 -08:00
Kyle Drake	f88c81b54a	fix for mount info without login	2015-01-12 09:43:09 -08:00
Kyle Drake	126ad0c494	fix for stats runner (i think)	2015-01-09 23:23:50 -08:00