Skip to content

⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.

Merge branch 'dev' into tags-in-public-collection

Daniel394251c1f19e
diff --cc lib/api/controllers/collections/collectionId/updateCollectionById.ts
index 2aed55f3,2f78d1c9..c942eb05
--- a/lib/api/controllers/collections/collectionId/updateCollectionById.ts
+++ b/lib/api/controllers/collections/collectionId/updateCollectionById.ts
@@@ -78,9 -84,8 +84,9 @@@ export default async function updateCol
icon: data.icon,
iconWeight: data.iconWeight,
isPublic: data.isPublic,
+ tagsArePublic: data.tagsArePublic,
parent:
- data.parentId && data.parentId !== ("root" as any)
+ data.parentId && data.parentId !== "root"
? {
connect: {
id: data.parentId,
diff --cc public/locales/en/common.json
index d07d66bf,16f4d124..849cd11d
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@@ -397,5 -397,24 +397,25 @@@
"invalid_url_guide":"Please enter a valid Address for the Link. (It should start with http/https)",
"email_invalid": "Please enter a valid email address.",
"username_invalid_guide": "Username has to be at least 3 characters, no spaces and special characters are allowed.",
- "browse_by_topic": "Browse by topic"
++ "browse_by_topic": "Browse by topic",
+ "team_management": "Team Management",
+ "invite_user": "Invite User",
+ "invite_users": "Invite Users",
+ "invite_user_desc": "To invite someone to your team, please enter their email address below:",
+ "invite_user_note": "Please note that once the invitation is accepted, an additional seat will be purchased and your account will automatically be billed for this addition.",
+ "send_invitation": "Send Invitation",
+ "learn_more": "Learn more",
+ "invitation_desc": "{{owner}} invited you to join Linkwarden. \nTo continue, please finish setting up your account.",
+ "invitation_accepted": "Invitation Accepted!",
+ "status": "Status",
+ "pending": "Pending",
+ "active": "Active",
+ "manage_seats": "Manage Seats",
+ "seats_purchased": "{{count}} seats purchased",
+ "date_added": "Date Added",
+ "resend_invite": "Resend Invitation",
+ "resend_invite_success": "Invitation Resent!",
+ "remove_user": "Remove User",
+ "continue_to_dashboard": "Continue to Dashboard",
+ "confirm_user_removal_desc": "They will need to have a subscription to access Linkwarden again."
}