62 commits

Author	SHA1	Message	Date
Kyle Drake	aa56561dff	further cleanups to filtering code	2015-07-15 16:23:58 -07:00
Kyle Drake	a7ee94b0c7	a start on improving reporting	2015-07-13 16:28:15 -07:00
Kyle Drake	3a6ca6c12b	implement the cache purger	2015-07-02 14:23:22 -07:00
Kyle Drake	da4c51e1ef	code to count down date of end of campaign	2015-06-28 21:49:24 -07:00
Kyle Drake	1ae265d184	Merge branch 'master' of github.com:neocities/neocities	2015-06-28 21:41:22 -07:00
Kyle Drake	b986c57577	email newsletter capability	2015-06-28 21:41:08 -07:00
Kyle Drake	91e9acb49d	more efficient queuer	2015-06-26 23:30:58 +00:00
Kyle Drake	179289b8ac	new bundler	2015-06-03 14:52:34 -07:00
Kyle Drake	59feb09928	integrate IPFS using remote ssh for now, views	2015-05-27 16:06:56 -07:00
Kyle Drake	49defcd0c7	fix tag tests, start on education site creation, updated test code	2015-05-06 14:22:55 -07:00
Kyle Drake	434deee366	Update rmagick (and add io/extra for geoip)	2015-04-29 13:37:21 -07:00
Kyle Drake	eba8a307bd	Add GeoIP, will be used for stats	2015-04-18 18:50:51 -07:00
Kyle Drake	3a157b697f	referencing stripe from its repo breaks rubygems install for some reason	2015-03-25 20:03:28 +00:00
Kyle Drake	a2ac84dc42	first attempt at a working surf bar proxy	2015-03-25 12:54:44 -07:00
Kyle Drake	4319bfde05	mistakenly committed namecheap test code, removing	2015-03-06 14:20:13 -05:00
Kyle Drake	7b83db26e3	little copy changes	2015-03-06 14:14:59 -05:00
Kyle Drake	c28a72df5c	updated gemfile.lock	2015-02-26 05:12:00 +00: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	9038141e28	Vagrantfile and provision scripts for development	2015-01-31 15:50:12 -08:00
Kyle Drake	042e3e11e6	Fix for ruby 2.2.0	2015-01-30 16:53:40 -08:00
Kyle Drake	81c9a4c94c	initial implementation of stripe mocking	2015-01-18 17:07:09 -08:00
Kyle Drake	50bedaa442	make the stats public, and cache	2015-01-08 14:06:41 -08:00
root	ad2e60ad1c	Fix for phantomjs	2014-12-21 08:51:13 +00:00
Kyle Drake	4983a9b24e	Cryptographically scramble IPs stored by Neocities ... "There is a time when the operation of the machine becomes so odious, makes you so sick at heart, that you can't take part; you can't even passively take part, and you've got to put your bodies upon the gears and upon the wheels, upon the levers, upon all the apparatus, and you've got to make it stop. And you've got to indicate to the people who run it, to the people who own it, that unless you're free, the machine will be prevented from working at all." Mario Savio Sproul Hall Steps University of California, Berkeley December 3, 1964	2014-11-07 00:41:10 -08:00
Kyle Drake	5403d61ac2	better update screenshot, fix username ref on news comment	2014-09-17 20:40:04 -07:00
Victoria Wang	9628238d91	merging	2014-09-17 18:46:54 -07:00
Kyle Drake	ae867847a5	Use pry-byebug instead of pry-debugger	2014-09-16 17:58:59 -07:00
Kyle Drake	86990f3535	initial plan structure, and some misc fixes	2014-09-12 14:54:53 -07:00
Kyle Drake	7020edc5e7	stats page	2014-09-06 17:50:33 -07:00
Kyle Drake	7520bc70b8	implement WebDAV mount support	2014-08-23 10:56:01 -05:00
Kyle Drake	fbf78f04d6	fixes for screenshot worker	2014-08-20 13:48:20 -07:00
Kyle Drake	2f73732daa	Folders.	2014-08-19 13:44:15 -07:00
Kyle Drake	cc64a57172	Scan for embedded viruses/executables in uploaded files	2014-08-10 18:46:28 -07:00
Kyle Drake	933fb9fcfd	make editor theme stick, and get rid of slim	2014-08-01 22:37:38 -07:00
Kyle Drake	7eee0f062d	remove double-change count, and only increment for actual changes	2014-06-04 18:26:17 -07:00
Kyle Drake	b488cf4347	refactor screenshots to work for all pages	2014-04-20 19:04:41 -07:00
Kyle Drake	1031324920	implement plan code	2014-04-18 15:40:08 -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	1124ab6c87	Added Sass to Gemfile	2014-04-16 17:47:40 -07:00
Kyle Drake	f367ed389e	Merge branch 'master' of github.com:kyledrake/neocities-web	2014-04-05 01:21:10 -04:00
Kyle Drake	314371f70e	sidekiq 3	2014-04-05 01:21:07 -04:00
Kyle Drake	6a36a9e3ac	refactor file logic into models to prepare for API, minor touches.	2014-04-04 22:18:36 -07:00
Kyle Drake	5dfc715148	fix migrations, acceptance testing for auth, 32 char username limit	2014-04-01 16:34:53 -07:00
Kyle Drake	c6d04ecb34	bcrypt rename	2014-03-27 20:30:57 -04:00
Kyle Drake	355a4a1c86	update gems, ruby 2.1.1 support	2014-03-27 15:11:35 -07:00
Kyle Drake	7784a63dbc	update debugger	2013-09-21 08:31:00 -04:00
Kyle Drake	1e1051fd36	what's this? is this password reset???	2013-07-11 23:33:10 -04:00
Kyle Drake	0a618c5895	latest sidekiq	2013-07-11 21:15:31 -04:00