4221 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Andrew Brown	83e0080db6	fix sidelinks for hidden categories	2018-08-18 16:55:15 -05:00
Andrew Brown	fe3ce777ee	deletion logic	2018-08-18 16:49:17 -05:00
Andrew Brown	fb1ebdcb50	create default pages if not existing + toggleable hiddens	2018-08-18 15:43:27 -05:00
Andrew Brown	6678b7a7e2	Merge branch 'master' into attributes-pages	2018-08-16 12:40:58 -05:00
Andrew Brown	c7429de844	add hidden flags to attributes	2018-08-16 12:34:04 -05:00
Andrew Brown	cfa5cf18f7	upgrade thor	2018-08-16 11:28:49 -05:00
Andrew Brown	b3728f39be	add page customization page	2018-08-16 10:58:21 -05:00
Andrew Brown	55b6975f00	standardize borders on row/col	2018-08-16 01:15:35 -05:00
Andrew Brown	680f04c50d	add cta to customize pages	2018-08-16 01:15:17 -05:00
Andrew Brown	df3328a279	fix minor bug	2018-08-16 00:14:47 -05:00
Andrew Brown	349a2fcb44	Merge branch 'master' of github.com:indentlabs/notebook	2018-08-15 21:22:25 -05:00
Andrew Brown	1c8cc0fc44	return the navbar to blue	2018-08-15 21:22:08 -05:00
Andrew Brown	8391b193e3	Merge pull request #280 from indentlabs/ruby-versions-docs ... Update ruby versions	2018-08-15 21:13:34 -05:00
Andrew Brown	c2a686a6af	fix minor bug	2018-08-15 19:54:42 -05:00
Andrew Brown	f2e10b0d6d	Merge pull request #283 from indentlabs/rails5-upgrade ... [WIP] `rake rails:update` & Rails 5 upgrade	2018-08-15 17:51:27 -05:00
Andrew Brown	90990320c1	Merge branch 'rails5-upgrade' of github.com:indentlabs/notebook into rails5-upgrade	2018-08-15 17:43:43 -05:00
Andrew Brown	dab5d5f0ea	Merge branch 'master' into rails5-upgrade	2018-08-15 16:31:37 -05:00
Andrew Brown	534f206f40	restart	2018-08-15 16:25:01 -05:00
Tristan	f67937c937	only show recently edited pages dropdown if page count > 0	2018-08-14 18:32:48 -05:00
Andrew Brown	8c570303bf	restart	2018-08-13 22:59:52 -05:00
Tristan	1a24d00bd1	oops, undo that last bit	2018-08-08 11:50:56 -05:00
Tristan	40d481ed5d	adjust image sizes	2018-08-08 11:46:39 -05:00
Tristan	a816362bcd	fix paperclip polymorphism issue	2018-08-08 11:42:17 -05:00
Andrew Brown	b2f1415e34	restart	2018-08-07 18:17:48 -05:00
Andrew Brown	c619f6f662	restart	2018-08-03 13:49:32 -05:00
Andrew Brown	7600564bd5	restart	2018-07-28 16:41:05 -05:00
Tristan	66dec09d6b	wMerge branch 'master' of https://git.heroku.com/papercut-server into rails5-upgrade	2018-07-25 18:44:16 -05:00
Tristan	1ec410351f	TEMPORARY COMMIT FOR STAGING	2018-07-25 18:41:56 -05:00
Tristan	eb6b77fe09	newer bundler	2018-07-25 16:07:14 -05:00
Tristan	a13efa29c4	update .tool-versions	2018-07-24 17:12:17 -05:00
Andrew Brown	e242e941fc	restart	2018-07-22 23:03:25 -05:00
Andrew Brown	8dd5338774	restart heroku	2018-07-22 00:27:56 -05:00
Andrew Brown	fc9bedf32e	restart	2018-07-22 00:22:10 -05:00
Andrew Brown	6783093d1b	Merge pull request #285 from indentlabs/atheist-religions ... Let users link deities to religions.	2018-07-21 18:53:48 -05:00
Andrew Brown	0e37ee36cf	:(((((((((((((((	2018-07-21 18:48:06 -05:00
Andrew Brown	43528f6f61	Link deities to religions	2018-07-21 18:06:58 -05:00
Andrew Brown	a5784576b6	Add deity link to religions	2018-07-15 13:52:40 -05:00
Andrew Brown	e0f01a6bd2	restart	2018-07-15 13:05:32 -05:00
Andrew Brown	5d09a873c6	bar link	2018-07-14 15:10:29 -05:00
Andrew Brown	b47e76e456	fix nav positioning	2018-07-14 14:18:40 -05:00
Andrew Brown	aca9a94fe4	rip	2018-07-14 14:14:32 -05:00
Andrew Brown	c315ba66b3	Merge branch 'master' into rails5-upgrade	2018-07-12 01:32:17 -05:00
Andrew Brown	0d52bb5eb1	restart server	2018-07-11 21:43:33 -05:00
Andrew Brown	7a4c9dfbc1	update tests for 5.2	2018-07-05 02:07:12 -05:00
Andrew Brown	ec67c23b7d	address deprecations	2018-07-05 01:35:40 -05:00
Andrew Brown	51787a383a	rails 5.2.0	2018-07-05 01:24:00 -05:00
Andrew Brown	1a666a9654	oops	2018-07-05 01:19:03 -05:00
Andrew Brown	59904a861d	rails 5 prep	2018-07-05 01:10:52 -05:00
Andrew Brown	f6d80346df	thredded migrations	2018-07-04 21:01:14 -05:00
Andrew Brown	dea2d24e9b	Check in .tool-versions	2018-07-04 20:58:12 -05:00