Commit graph

7542 commits

Author SHA1 Message Date
Hugh Rundle
e1acdd0062 fix migrations
There was a conflict due to the order of migrations. Hopefully this commit fixes it!
2022-07-10 09:53:43 +10:00
Mouse Reeve
a7cc41ce54
Merge pull request #2211 from bookwyrm-social/list-order
Fixes numbering on book lists
2022-07-09 13:44:12 -07:00
Mouse Reeve
591c4d9b75 Fixes numbering on book lists 2022-07-09 13:33:58 -07:00
Mouse Reeve
85f811022f
Merge pull request #2210 from bookwyrm-social/notification-cw
Show content warning in notification status previews
2022-07-09 13:29:22 -07:00
Mouse Reeve
be5e1be5f6 Use content warnings in notifications 2022-07-09 13:12:46 -07:00
Mouse Reeve
27e9eced67
Merge pull request #2208 from bookwyrm-social/follow-bug
Fixes bug in notifications breaking follows
2022-07-09 12:40:38 -07:00
Mouse Reeve
11a0c1691b Move status_preview snippet to notifications directory
That's the only place it's used, always nice to de-clutter the snippets
directory
2022-07-09 12:40:21 -07:00
Mouse Reeve
f92b4548b1 Fixes get_or_create error when multiple matching notifications exist 2022-07-09 12:30:05 -07:00
Mouse Reeve
c092d952bd Adds test to catch notification error 2022-07-09 12:29:29 -07:00
Mouse Reeve
a7553c0b8c Return HttpResponse instead of redirects for AJAX follows
This is more efficient, and most follow activities are ajax
2022-07-09 12:20:18 -07:00
Mouse Reeve
923495e454 More accurate button display
Now, a follow button will show as pending even if the user doesn't
manually approve followers, if that's the state the request is in.
2022-07-09 12:19:28 -07:00
Hugh Rundle
ab5e4128e6 Merge branch 'main' into tour
Also fixes conflict
2022-07-09 20:54:48 +10:00
Hugh Rundle
8fbd634ee8 add id to dm box 2022-07-09 20:52:03 +10:00
Hugh Rundle
48bcb85e24 resolve conflict 2022-07-09 20:12:46 +10:00
Hugh Rundle
02c6932409 lint migration file 2022-07-09 20:10:28 +10:00
Hugh Rundle
245120e7ca resolve git conflict with main branch 2022-07-09 20:08:23 +10:00
Hugh Rundle
baad1314d8 default existing users to no tour 2022-07-09 19:51:05 +10:00
Hugh Rundle
495bac2b50 transfer tour from group to DM 2022-07-09 19:38:44 +10:00
Hugh Rundle
2f2ab5c24a add DM tour
- rearrange script includes on feed pages
- add DM tour to close
2022-07-09 19:27:42 +10:00
Hugh Rundle
791847d75e add timeline info to home tour 2022-07-09 19:27:12 +10:00
Hugh Rundle
c68c7216f3 minor wording updates for tour 2022-07-09 17:49:56 +10:00
Hugh Rundle
6df09eb5d7 update user groups tour
- use strong instead of code
- clean up templates
- use notification styling for actions
- update wording
2022-07-09 17:39:22 +10:00
Hugh Rundle
07a882692c update lists tour
- cleaner templates
- send user directly to their Groups page at end of section
2022-07-09 17:31:04 +10:00
Hugh Rundle
d67c6dc92b user books tour update
- add element highlights
- fix template text
- replace code with strong
2022-07-09 16:56:07 +10:00
Hugh Rundle
e85e4a5467 update book page tour
- styling for next action
- replace code with strong
- clean up wording
- make translation templates cleaner
2022-07-09 15:30:45 +10:00
Hugh Rundle
bb85d3cdb2 update search tour
- action styling
- code to strong
2022-07-09 15:16:27 +10:00
Hugh Rundle
bb4b1a14fd update user profile tour styles 2022-07-09 15:10:52 +10:00
Hugh Rundle
5472cdcad7 update homepage tour
- add highlights to some elements
- consolidate message text for easier translation
- emphasise action with notification style
2022-07-09 15:00:30 +10:00
Hugh Rundle
b36968166e fix import message
import files don't import shelves, only books.
2022-07-09 14:47:31 +10:00
Hugh Rundle
3c317d509d fix sass styles import bug
Using @import caused styles to double up on elements, in some cases preventing the correct override behaviour.
Usint @use instead fixes this, and is recommended by Sass for exactly this reason.
2022-07-09 14:42:42 +10:00
Hugh Rundle
b41c826a0d custom style for highlighting tour anchorpoints 2022-07-09 14:29:04 +10:00
Hugh Rundle
68308aaa79 update tour colour scheme
- use info instead of default
- increase box shadow
- arrows at top should match header colour
2022-07-09 12:35:06 +10:00
Hugh Rundle
56b91f4c6d fix incorrect tour step header 2022-07-09 10:37:08 +10:00
Hugh Rundle
4d843b583d move shelve button tour id to prevent duplicates 2022-07-09 10:32:04 +10:00
Hugh Rundle
389da79af4 fix missing hyphen 2022-07-09 10:31:40 +10:00
Hugh Rundle
53a89f69e7 guided tour only for request.user 2022-07-09 10:23:09 +10:00
Hugh Rundle
3365bb6d35 show_guided_tour is not added to AP serialisation 2022-07-09 10:17:10 +10:00
Mouse Reeve
ed847494ab
Merge pull request #2206 from bookwyrm-social/locales
Adds French notification strings and new admin strings
2022-07-08 15:52:15 -07:00
Mouse Reeve
ef49171c7a Adds French notifiction strings and new admin strings 2022-07-08 15:42:43 -07:00
Mouse Reeve
bd6774fca8
Merge pull request #2202 from bookwyrm-social/settings-warnings
New and improved warnings on the admin dashboard
2022-07-08 15:39:23 -07:00
Mouse Reeve
147d092eac Removes line breaks from warning links 2022-07-08 15:29:55 -07:00
Mouse Reeve
0d05ff348d
Merge pull request #2203 from bookwyrm-social/dms
Improves UI around DMs
2022-07-08 12:30:17 -07:00
Mouse Reeve
36553ef2a9 Suppress protected-access warning on admin dashboard 2022-07-08 12:22:23 -07:00
Mouse Reeve
d0e986c283 Hide DMs from profile page 2022-07-08 12:19:51 -07:00
Mouse Reeve
441fef9e86 Use javascript to send DMs
This fixes the draft cache issue and also the weird redirects
2022-07-08 12:11:00 -07:00
Mouse Reeve
ba7ae46c75 Adds warnings for missing privacy policies and codes of conduct 2022-07-08 11:59:21 -07:00
Mouse Reeve
4a2e191d92 Refactors dashboard warnings
This cleans up the display so that they don't get all squished when a
bunch are present, and creates a layout to make them more DRY
2022-07-08 11:38:27 -07:00
Mouse Reeve
e35ce82052
Merge pull request #2200 from bookwyrm-social/docs-links
Fixes links to documentation pages
2022-07-08 10:26:42 -07:00
Mouse Reeve
b62bb157c0 Fixes links to documentation pages 2022-07-08 09:44:41 -07:00
Mouse Reeve
aedbb6f9e7
Merge pull request #2198 from bookwyrm-social/locales
Locale updates
2022-07-08 09:38:50 -07:00