Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Favouriting feature using matrix account data #131

Open
wants to merge 138 commits into
base: main
Choose a base branch
from
Open

Conversation

aofn
Copy link
Member

@aofn aofn commented Jan 23, 2024

Adaptation of #73 using matrix account data to store room id's of spaces.

  • Change name from bookmarks to favourites

Marcel and others added 30 commits August 30, 2023 12:56
…ame variable to be descriptive

chore: add JSDoc
fix: name variable correctly
refactor: add margin between table sections
@aofn aofn changed the title bookmark feature using matrix account data Favouriting feature using matrix account data Jan 31, 2024
fnwbr and others added 17 commits February 2, 2024 13:26
# Conflicts:
#	assets/_globalCss.css
#	components/ContextMultiLevelSelect.js
#	components/UI/ConfirmCancelButtons.js
#	components/UI/DataList.js
#	components/UI/PasswordInputButton.js
#	components/UI/ServiceSubmenu.js
#	jsconfig.json
#	package-lock.json
#	package.json
#	pages/_app.js
#	pages/account.js
#	pages/dashboard/InvitationCard.js
#	pages/dashboard/KnockCard.js
#	pages/dashboard/index.js
#	pages/etherpad/actions/AddExistingPad.js
#	pages/etherpad/actions/CreateAnonymousPad.js
#	pages/etherpad/actions/CreateAuthoredPad.js
#	pages/etherpad/actions/CreatePasswordPad.js
#	pages/login.js
#	pages/spacedeck/actions/AddExistingSketch.js
#	pages/spacedeck/actions/CreateNewSketch.js
#	prettier.config.js
#	stylelint.config.js
This is basically re-doing lots of fdc0044#diff-6943349689854874f761d5e14a35b939fe8580aa78fc32725f83f79a96cb0d85 again, which I accidentally reverted in a previous merge w/ master
# Conflicts:
#	components/UI/DataList.js
components/UI/favourites/AddFavourite.js Fixed Show fixed Hide fixed
components/UI/favourites/AddFavourite.js Fixed Show fixed Hide fixed
pages/dashboard/Favourite.js Fixed Show fixed Hide fixed
pages/dashboard/Favourite.js Fixed Show fixed Hide fixed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants