8780 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Hugh Rundle	891b72c79c	update user export file to use ActivityPub objects where possible. (#3109) ... * add more context to user export page * fix BookData fields wrong for files * use to_activity and to_model where possible * fixes for import and export - use AP JSON where possible - minor template wording updates * import fixes and updates tests * minor cleanup * remove todo for mastodon	2023-11-13 21:14:03 +11:00
Hugh Rundle	0a5e1048ce	Add more info to user export page (#3093) ... - match page title to menu - change description on IMPORT page from 'readthroughs' to 'reading history' - provide more information on export page about what is and is not included.	2023-11-07 12:09:06 +11:00
Mouse Reeve	9ddd631549	Merge pull request #3089 from bookwyrm-social/notification-and-download-links ... UI changes for notification and download link in import/export flow	2023-11-06 16:31:09 -08:00
Mouse Reeve	1b958a9b31	Merge pull request #3091 from hughrun/notification-and-download-links ... show filesize on user downloads page	2023-11-06 16:27:14 -08:00
Hugh Rundle	282f7dd8d6	show filesize on user downloads page ... - add column to user download page to display filesize - adds a filter to display file sizes - don't download the user downloads page from notifications ;)	2023-11-07 11:04:11 +11:00
Mouse Reeve	e152b625fa	Merge pull request #3090 from bookwyrm-social/user-migration-instructions ... User migration instructions	2023-11-06 14:34:52 -08:00
Mouse Reeve	3f038b4d67	Moves if to the right place	2023-11-06 09:42:58 -08:00
Mouse Reeve	06d822d9e0	Alternative format for user import guide	2023-11-06 09:35:04 -08:00
Mouse Reeve	85d1760b97	Changes recent exports table ... I thought both dates seemed less necessary (happy to be told otherwise) and the download link should be more explicit	2023-11-06 08:41:36 -08:00
Mouse Reeve	716e64de68	Changes notification links for user import/export ... I found it unexpected that the export notification linked me directly to the file, and wanted the import link to lead me to the import page	2023-11-06 08:27:30 -08:00
Hugh Rundle	15b7b7eaa7	Merge pull request #3088 from hughrun/user-migration ... User migration fixes	2023-11-06 16:06:39 +11:00
Hugh Rundle	d34b70cb7b	remove pointless viewer_aware	2023-11-06 16:01:34 +11:00
Hugh Rundle	2d185dfb8a	remove unnecessary test data files	2023-11-06 14:51:52 +11:00
Hugh Rundle	93a32f4e15	update import/export user templates ... - always explain what export file can be used for - provide more information about overwrite vs upsert when importing	2023-11-06 14:40:19 +11:00
Hugh Rundle	8d3c2d9bd2	Merge pull request #3085 from bookwyrm-social/migration-explicit-imports ... Uses explicit imports to avoid circular import in migrations code	2023-11-06 12:11:59 +11:00
Hugh Rundle	7a6b60772c	Merge pull request #3087 from hughrun/migration-explicit-imports ... update references to bookwyrm models in export job	2023-11-06 12:10:47 +11:00
Hugh Rundle	d2f06e804f	update references to bookwyrm models in export job	2023-11-06 12:07:40 +11:00
Mouse Reeve	9e9e9a9f85	Uses explicit imports to avoid circular import in migrations code	2023-11-05 07:04:05 -08:00
Mouse Reeve	ff2bb513ed	Adds migration for notification types	2023-11-05 06:56:10 -08:00
Mouse Reeve	89b87db1c8	Adds merge migration	2023-11-05 06:54:29 -08:00
Mouse Reeve	67822d3cb0	Merge branch 'main' into user-migration	2023-11-05 06:52:48 -08:00
Mouse Reeve	95ba38524b	Merge pull request #3080 from bookwyrm-social/dependabot/pip/django-3.2.23 ... Bump django from 3.2.20 to 3.2.23	2023-11-02 18:48:30 -07:00
dependabot[bot]	68f1a69b6a	Bump django from 3.2.20 to 3.2.23 ... Bumps [django](https://github.com/django/django) from 3.2.20 to 3.2.23. - [Commits](https://github.com/django/django/compare/3.2.20...3.2.23) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2023-11-02 22:13:52 +00:00
Mouse Reeve	8c950237a4	Merge pull request #3077 from bookwyrm-social/locales ... Fixes plural string, "URL", and updates locales	2023-11-02 15:06:34 -07:00
Mouse Reeve	ae51dcec63	Merge pull request #3039 from dato/ap_image_url ... Fix creation of covers for ActivityPub imports	2023-11-02 14:44:44 -07:00
Mouse Reeve	c1a7e4d9eb	Merge pull request #2201 from bookwyrm-social/header-links ... Adds "Your Books" to the header and removed "Feed"	2023-11-02 14:34:47 -07:00
Mouse Reeve	416bbd4d9e	Fixes plural string, "URL", and updates locales	2023-11-02 14:33:38 -07:00
Mouse Reeve	45fc10e3bf	Merge pull request #3067 from hughrun/2989 ... add defaults of None to optional AWS values	2023-11-02 14:24:58 -07:00
Mouse Reeve	0502f6ba42	Merge pull request #3076 from bookwyrm-social/move ... Add Move activity for user migration (with small change)	2023-11-01 18:19:56 -07:00
Mouse Reeve	86fd62a09e	Merge pull request #3075 from bookwyrm-social/small-migration-fix ... Adds reverse migration for populate sort title	2023-11-01 18:19:34 -07:00
Mouse Reeve	2137737d9b	Small changes to get blocktrans to work as expected in move code	2023-11-01 17:19:57 -07:00
Mouse Reeve	621cfa7ed2	Merge pull request #2970 from hughrun/move ... Add `Move` activity for user migration	2023-11-01 17:14:34 -07:00
Mouse Reeve	6f9c7f39fb	Adds reverse migration for populate sort title ... This doesn't impact much, it just allows you to reverse the migration, which you would probably (hopefully) only want ot do in development.	2023-11-01 16:24:47 -07:00
Mouse Reeve	941efb3f72	Merge pull request #3068 from hughrun/3066 ... make options consistent in celery	2023-10-29 17:30:40 -07:00
Hugh Rundle	d2b2cc0521	make options consistent in celery ... - changes 'broadcasts' to 'broadcast' in Celery page in admin section - re-orders celery queues on admin page to be in English alphabetical order (other than priority levels) - this makes them consistent with the Flower interface - fixes #3066	2023-10-29 11:55:06 +11:00
Hugh Rundle	853b5f28a4	add defaults of None to optional AWS values ... fixes #2989	2023-10-29 11:29:49 +11:00
Hugh Rundle	935779b5e3	Merge pull request #3064 from hughrun/user-migrate ... stop pylint constantly whining in user-migration branch	2023-10-28 06:53:25 +11:00
Hugh Rundle	25a2615d5f	stop pylint constantly whining	2023-10-28 06:51:26 +11:00
Hugh Rundle	50ac691126	add alt tag	2023-10-28 06:28:43 +11:00
Hugh Rundle	4d35fd45df	template and migration fixes	2023-10-27 22:22:58 +11:00
Hugh Rundle	6f3b1b565f	fixes to move layout and notifs ... - make Move notifications less complicated - moved users cannot do anything other than unmove or log out - refactor translations for moved users	2023-10-27 22:00:04 +11:00
Hugh Rundle	5592a8e08b	Merge pull request #3061 from hughrun/user-migrate ... minor pylint and mypy fixes	2023-10-23 21:32:36 +11:00
Hugh Rundle	f30555be0f	minor pylint and mypy fixes	2023-10-23 21:30:17 +11:00
Hugh Rundle	f662e4e049	Merge pull request #3060 from hughrun/user-migrate ... Fix texts & linting plus minor bugfixes	2023-10-23 20:54:41 +11:00
Hugh Rundle	e29c93a1e9	complete jobs more sensibly ... - fix tuple in tar export I accidentally broke by following pylint blindly - just use job.set_status to complete jobs since it does everything we need - fix/avoid Celery "not JSON deserializable" error by not saving whole job including user value	2023-10-23 20:44:52 +11:00
Hugh Rundle	ddec2dbaa9	fix tar types notification docstring	2023-10-23 20:43:49 +11:00
Hugh Rundle	b8fc5c9b7a	fix tests	2023-10-23 20:42:56 +11:00
Hugh Rundle	8477d0b89d	Merge branch 'main' into user-migration	2023-10-22 18:47:41 +11:00
Hugh Rundle	afb5c01947	Merge pull request #3058 from hughrun/user-migrate ... oops import Any	2023-10-22 17:57:57 +11:00
Hugh Rundle	2b6852e7a0	oops import Any	2023-10-22 17:56:46 +11:00