1909 Commits

Author	SHA1	Message	Date
Andrew Brown	104159104a	permi fix	2019-06-11 18:23:27 -05:00
Andrew Brown	11fc55f606	Merge branch 'master' into jun-6	2019-06-11 16:13:28 -07:00
Andrew Brown	a786dd883a	update permissions	2019-06-11 18:04:40 -05:00
Andrew Brown	b66c099c8d	sharing on both editor views	2019-06-11 17:36:14 -05:00
Andrew Brown	cd41220a6e	document sharing from documents#show	2019-06-11 17:34:18 -05:00
Andrew Brown	a06befc32e	fix tristan on empty prompts page	2019-06-06 14:14:42 -05:00
Andrew Brown	0267272dad	show scope notice on content#index pages	2019-06-03 18:29:36 -05:00
Andrew Brown	bab4deb75e	shorten notice just a tiny bit	2019-06-03 17:37:25 -05:00
Andrew Brown	d510682dd3	fix food color	2019-06-01 01:11:02 -05:00
Andrew Brown	fae8a75599	add links to new forums	2019-06-01 01:06:46 -05:00
Andrew Brown	ba43d9b583	allow premium users to contribute premium pages to non-premium universes	2019-06-01 00:40:20 -05:00
Andrew Brown	70684c51a7	Merge pull request #381 from indentlabs/image-audits ... fix viewing image uploads in dev environments	2019-05-31 22:32:41 -07:00
Andrew Brown	6989b041a9	fix 500 on user delete	2019-06-01 00:13:04 -05:00
Andrew Brown	b74907ab69	include link	2019-06-01 00:10:17 -05:00
Andrew Brown	c77b9173f9	attributes + make schools free	2019-05-30 15:53:03 -05:00
Andrew Brown	56ca3132f7	dismissals	2019-05-30 15:26:36 -05:00
Andrew Brown	136d49054d	add notice	2019-05-30 14:20:33 -05:00
Andrew Brown	9f6c9424c9	wip	2019-05-30 12:16:03 -05:00
Andrew Brown	787e0f8b81	category icons	2019-05-30 00:22:20 -05:00
Andrew Brown	683708ec17	top-level icons and colorings	2019-05-29 22:53:33 -05:00
Andrew Brown	1fd1eef0cf	fields for new pages	2019-05-29 22:33:38 -05:00
Andrew Brown	89715f816b	page_type:create for new pages	2019-05-29 22:00:31 -05:00
Andrew Brown	bc5aeeb20f	models for sports, schools, and foods	2019-05-29 21:58:57 -05:00
Andrew Brown	bced6ff725	your friendly neighborhood todo update	2019-05-29 18:49:22 -05:00
Andrew Brown	1000074536	fix viewing image uploads in dev environments	2019-05-29 18:42:49 -05:00
Andrew Brown	a476515d78	some logic readability	2019-05-13 22:33:54 -05:00
Andrew Brown	f37a54046e	fix account deletion	2019-05-13 17:17:32 -05:00
Andrew Brown	e579cdaf24	fix 500 on signed-out users viewing universe	2019-05-13 00:20:42 -05:00
Andrew Brown	0b9e97812c	Merge branch 'master' into case-insensitivity	2019-05-12 23:46:18 -05:00
Andrew Brown	56277b4a3d	Merge branch 'master' into may-11	2019-05-12 22:55:25 -05:00
Andrew Brown	d0f8bab34a	Merge branch 'master' into may-10	2019-05-12 21:47:15 -05:00
Andrew Brown	89bcceeeb2	Merge branch 'master' into may-11	2019-05-12 21:47:11 -05:00
Andrew Brown	f90ed2b153	Merge branch 'master' into may-11	2019-05-12 20:53:08 -05:00
Andrew Brown	ab8fa11d6a	editor js	2019-05-12 20:52:13 -05:00
Andrew Brown	8fa7364e5b	unnecessary hack	2019-05-12 20:28:43 -05:00
Andrew Brown	706f8b59af	unnecessary code	2019-05-12 20:24:59 -05:00
Andrew Brown	afa0748010	whitespace	2019-05-12 20:23:26 -05:00
Andrew Brown	7a732d43e7	only mildly surprised this actually worked	2019-05-12 20:20:54 -05:00
Andrew Brown	dcf8eb2751	oops	2019-05-12 19:52:55 -05:00
Andrew Brown	3e69ae6363	Merge branch 'master' into may-10	2019-05-12 13:25:28 -05:00
Andrew Brown	612809e517	Re-enable linking to universes	2019-05-12 02:59:18 -05:00
Andrew Brown	175038c10c	fix 500 when focused to universe	2019-05-12 02:54:56 -05:00
Andrew Brown	9abffa06af	Merge branch 'master' into may-3	2019-05-12 01:55:50 -05:00
Andrew Brown	f917ccf314	more code cleanup	2019-05-12 01:51:16 -05:00
Andrew Brown	823fd547a0	shaking more trees	2019-05-11 17:31:32 -05:00
Andrew Brown	2fcc5501b7	better flash messages on attribute category/field creations	2019-05-11 17:27:01 -05:00
Andrew Brown	65337dfc58	shaking trees	2019-05-11 16:56:41 -05:00
Andrew Brown	50eff7c273	hmmmmmmmmmmmmmmmmmmmmm	2019-05-11 16:38:29 -05:00
Andrew Brown	65d1cde962	remove redundancy	2019-05-11 16:32:33 -05:00
Andrew Brown	9eac45f80b	oh golly gee	2019-05-11 16:31:56 -05:00