60 Commits

Author	SHA1	Message	Date
drusepth	36fe52ab65	Merge branch 'master' into rails-6.1	2021-10-26 10:13:17 -07:00
drusepth	1d0c609cb0	include the current user's shared universes in contributable universes cache	2021-10-09 22:46:10 -07:00
Andrew Brown	512bff2aae	move the old doc user includes	2021-08-03 12:02:00 -07:00
Andrew Brown	dd969ba39f	scratch that, lol	2021-08-03 11:27:41 -07:00
Andrew Brown	3db83d9e75	reuse cached universes to fetch ids	2021-08-03 11:27:04 -07:00
Andrew Brown	832bb924bf	remove user#linkable_universes	2021-08-03 01:46:31 -07:00
Andrew Brown	adb063393e	Merge branch 'master' into rails-6.1	2021-07-29 02:12:44 -07:00
Andrew Brown	f56c8bc46b	add text_color helper methods	2021-07-18 18:02:52 -07:00
Andrew Brown	3fa423513a	basic folders plumbing + design	2021-06-23 01:48:10 -07:00
Andrew Brown	bfa9b59100	use linkable images in dropdowns instead of current page's image	2021-05-21 13:13:51 -07:00
Andrew Brown	d0b9a77b58	don't include archived content in linkables lists	2021-05-21 12:44:32 -07:00
Andrew Brown	c47a1ae538	let shared universe owners see the docs in their own universe	2021-05-12 20:14:43 -07:00
Andrew Brown	5b7b191d73	-1 is probably a little safer to use	2021-05-11 00:38:37 -07:00
Andrew Brown	f205390c51	ok, we apparently need this	2021-05-11 00:38:20 -07:00
Andrew Brown	fcd7e29de4	allow @mention linking documents and timelines	2021-05-10 14:37:40 -07:00
Andrew Brown	71dbd7288c	update_attributes -> update	2021-03-07 23:55:32 -08:00
Andrew Brown	cc16f8fcb7	Merge branch 'master' into collections-improvements	2020-10-03 16:58:25 -07:00
Andrew Brown	bc12318ace	Merge branch 'master' into document-ui-improvements	2020-10-02 01:04:52 -07:00
Andrew Brown	3bedd64447	add followed collections to collections#index	2020-10-01 18:10:52 -07:00
Andrew Brown	dd97ba4a62	add paranoid deleted_at fields for recovery and reorganize model hierarchy	2020-08-28 18:31:21 -07:00
Andrew Brown	aeb01c2963	Merge branch 'master' into dev-api	2020-08-10 15:29:19 -07:00
Andrew Brown	b466b3e041	minor user fixes	2020-08-02 22:03:32 -07:00
Andrew Brown	c5bdfcdbb0	allow users to follow/unfollow collections	2020-07-12 02:23:43 -07:00
Andrew Brown	efa18af5f8	add collections tab to some user profiles	2020-07-06 01:47:28 -05:00
Andrew Brown	e2c3c6e160	*whistles*	2020-06-28 22:12:49 -05:00
Andrew Brown	7b81bbbd80	user profile following/followers page	2020-06-28 21:59:13 -05:00
Andrew Brown	d3ae2a9a35	job for notifications + share following	2020-04-26 22:52:11 -05:00
Andrew Brown	9a1c3d8403	stream share form & design	2020-04-24 15:53:29 -05:00
Andrew Brown	f6fa089030	Merge branch 'master' into collaboration-expansion	2020-04-23 16:43:53 -05:00
Andrew Brown	500ede3b16	premium onboarding notification	2020-04-20 21:30:16 -05:00
Andrew Brown	4b2fd1e744	notification designs	2020-04-20 17:56:09 -05:00
Andrew Brown	197a097011	big whoops	2020-04-03 13:15:21 -05:00
Andrew Brown	4a662f4d77	Add some safety checking around image_processing avatar processing ... https://github.com/janko/image_processing/issues/66#issuecomment-608573201	2020-04-03 13:04:58 -05:00
Andrew Brown	fb6e9d5595	allow users to block other users	2020-03-28 18:26:44 -05:00
Andrew Brown	f462831728	Add the ability to follow/unfollow other users	2020-03-28 17:49:17 -05:00
Andrew Brown	84afb58af0	subscription page improvements wrt codes	2020-03-24 16:43:59 -05:00
Andrew Brown	9cceb118f6	add initial application integration page	2020-02-22 10:32:08 -06:00
Andrew Brown	6f9601f60a	Merge branch 'master' into feb-release	2020-01-27 22:23:02 -06:00
Andrew Brown	812951daed	fall back on gravatar if activestorage errors	2020-01-27 22:22:57 -06:00
Andrew Brown	c5ecf6da14	add initial framework for favorite page type themeing profile pages	2020-01-25 13:29:35 -06:00
Andrew Brown	4082bbae2b	Oh hey look it's paypal	2020-01-16 16:54:51 -06:00
Andrew Brown	05394935fd	add some db indices	2020-01-03 13:10:36 -06:00
Andrew Brown	95e370606d	Merge branch 'rails6-features' into template-editor-rework	2020-01-02 01:03:18 -06:00
Andrew Brown	a446c5d14d	only validate username when it is changing	2019-12-25 22:12:47 -06:00
Andrew Brown	c4dbfda438	make avatars optional	2019-12-21 12:59:31 -06:00
Andrew Brown	a43d87dafb	Merge branch 'rails6-features' into template-editor-rework	2019-12-15 14:57:29 -06:00
Andrew Brown	5b06445ead	Merge branch 'master' into template-editor-rework	2019-12-15 14:56:37 -06:00
Andrew Brown	5ffd2bc074	optional belongs_to seem to be enforced now ????	2019-12-15 12:36:19 -06:00
Andrew Brown	adfa20f606	delete avatars before changing to a new one	2019-12-14 18:56:00 -06:00
Andrew Brown	f88707b159	use image variants for user avatars	2019-12-14 18:42:40 -06:00