1995 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Joel Bradshaw	57607c3590	Regenerate merge migration	2021-01-19 23:53:42 -08:00
Joel Bradshaw	85edee42ef	Merge branch 'main' into progress_update	2021-01-19 23:49:35 -08:00
Joel Bradshaw	070fa04b63	Add validators and more tests ... I don't think these validators will do anything unless we use them or are submitting a form, but they're there nonetheless	2021-01-19 23:40:11 -08:00
Joel Bradshaw	edba55f7c2	Flatten and rework sidebar update	2021-01-19 23:04:08 -08:00
Joel Bradshaw	32346cf9a3	Cascade-delete progress updates ... Add a warning about it, and update test to confirm it works	2021-01-19 22:36:44 -08:00
Mouse Reeve	9f2ca73a58	Tests terminal space in mentions string	2021-01-19 16:48:06 -08:00
Mouse Reeve	2411b4fe79	puts @'mentions directly in compose box	2021-01-19 16:16:22 -08:00
Mouse Reeve	0700a71803	Merge pull request #538 from mouse-reeve/polling ... Polling to update notification count	2021-01-19 15:13:37 -08:00
Mouse Reeve	1778e8dd46	Uses timeout instead of interval	2021-01-19 14:59:46 -08:00
Mouse Reeve	94a41498cf	Remove counts when notifications are deleted	2021-01-19 14:32:08 -08:00
Mouse Reeve	3fce67a60d	Only update on change	2021-01-19 14:25:04 -08:00
Mouse Reeve	b82aa54c6e	Merge pull request #547 from mouse-reeve/form-clash ... Fixes clashing form ids in rate/review	2021-01-19 09:53:37 -08:00
Mouse Reeve	f049c7c3d9	Fixes clashing form ids in rate/review	2021-01-19 09:31:01 -08:00
Mouse Reeve	243e998fbf	Merge pull request #545 from mouse-reeve/goal-min-2 ... Goal min	2021-01-19 07:49:28 -08:00
Mouse Reeve	c1c7b68fc1	Fixes error state for goal	2021-01-19 07:40:37 -08:00
Mouse Reeve	589c128793	Sets min in html	2021-01-19 07:38:18 -08:00
Mouse Reeve	328ebc39c1	Adds migration	2021-01-19 07:38:12 -08:00
Mouse Reeve	6efe4d54f0	Sets minimum goal	2021-01-19 07:30:35 -08:00
Mouse Reeve	146e92480b	Merge pull request #543 from mouse-reeve/import-url ... Fixes import paths	2021-01-19 07:19:14 -08:00
Mouse Reeve	1048688284	Fixes import paths	2021-01-19 07:15:08 -08:00
Joel Bradshaw	60b42827f4	Mock the AP publishing to stop hanging tests	2021-01-18 20:00:04 -08:00
Joel Bradshaw	79e284e5be	Just scootch the migration merge up	2021-01-18 19:59:40 -08:00
Joel Bradshaw	29140be78e	Merge branch 'main' into progress_update	2021-01-18 19:41:06 -08:00
Mouse Reeve	1c1492d468	Merge pull request #541 from mouse-reeve/markdown-trimmed-text ... Render markdown to html in the right order	2021-01-18 18:55:34 -08:00
Mouse Reeve	0d00857ef8	Render markdown to html in the right order	2021-01-18 17:54:36 -08:00
Mouse Reeve	128dc3be44	Remove a div	2021-01-18 16:52:51 -08:00
Mouse Reeve	e04b5b7df8	Merge pull request #537 from mouse-reeve/edit-shelf-fix ... Fixes edit shelf view	2021-01-18 16:46:45 -08:00
Mouse Reeve	a7620c07cb	Fixes edit shelf view	2021-01-18 16:38:04 -08:00
Mouse Reeve	394666357f	Poll for notifications	2021-01-18 16:32:02 -08:00
Mouse Reeve	dda4698a84	Merge pull request #536 from mouse-reeve/reply-privacy ... Set reply privacy to parent privacy	2021-01-18 13:51:57 -08:00
Mouse Reeve	fc218c5d48	Set reply privacy to parent privacy	2021-01-18 13:02:30 -08:00
Mouse Reeve	043c1f75a6	Merge pull request #534 from mouse-reeve/post-release-ui-fixes ... UI fixes for latest release	2021-01-18 12:54:37 -08:00
Mouse Reeve	7a153a9942	Collapse status content box for empty status (like goal) ... this is janky... oh well	2021-01-18 12:36:34 -08:00
Mouse Reeve	2a6c67c427	Correct placement of shelve pulldown	2021-01-18 12:25:26 -08:00
Mouse Reeve	69b38bfe91	Show latest read books first in goals page	2021-01-18 12:22:36 -08:00
Mouse Reeve	25643faf72	Fixes misplaced close diff causing cascading nesting on editions page	2021-01-18 12:22:11 -08:00
Mouse Reeve	ba536270d6	Merge pull request #533 from mouse-reeve/fixes-email ... Fixes email migration	2021-01-18 12:01:04 -08:00
Mouse Reeve	96cc9d44db	Fixes email migration	2021-01-18 11:57:20 -08:00
Mouse Reeve	8a00c7741a	Nullable email	2021-01-18 11:51:51 -08:00
Mouse Reeve	da81e25022	Merge pull request #532 from mouse-reeve/email-login ... Allow users to log in with email or username	2021-01-18 11:45:02 -08:00
Mouse Reeve	d8ace7e417	Fixes html error on edit user page	2021-01-18 11:19:30 -08:00
Mouse Reeve	11dd8c8f82	Allow users to log in with email or username	2021-01-18 11:06:28 -08:00
Mouse Reeve	f825709599	Merge pull request #529 from mouse-reeve/html-cleanup ... Html cleanup	2021-01-18 10:25:31 -08:00
Mouse Reeve	ca1de5478d	Merge pull request #530 from mouse-reeve/rate ... Fixes rate action	2021-01-18 10:05:37 -08:00
Mouse Reeve	c7b03fec5a	Fixes rate action	2021-01-18 09:57:44 -08:00
Mouse Reeve	debc9696e1	Sets focus for editing and deleting readthroughs	2021-01-18 09:03:21 -08:00
Mouse Reeve	8f0eb84172	Uses actual label text in toggle button, not the word "label"	2021-01-18 08:54:25 -08:00
Mouse Reeve	c3781e7f51	Sets hover to modal header when opened	2021-01-18 08:54:00 -08:00
Mouse Reeve	7308d8d1e9	javascript cleanup ... I got my linter working!	2021-01-18 08:26:04 -08:00
Mouse Reeve	d6f2740bc8	unneeded classnames	2021-01-17 20:40:33 -08:00