search

ckolderup / postmarks

a single-user bookmarking website designed to live on the Fediverse
https://postmarks.glitch.me
MIT License
459 stars 38 forks source link

Multi-tag (intersection) support. #96

Closed steve-bate closed 10 months ago

steve-bate commented 10 months ago

In a tagged view, the tags include a + (add) and - (remove) control to modify the set of tags being queried. In a single-tag view, the current tag will have no controls. Also supports multi-tag RSS feeds.

ckolderup commented 10 months ago

working on merge conflict resolution now.

ckolderup commented 10 months ago

ah, shoot, can I apply this merge request to the PR somehow when it's coming from a fork I don't have commit access to? 🤔

steve-bate commented 10 months ago

I don't know. Is this a conflict from the eslint integration? I can't take a look at fixing the conflicts on my end.

ckolderup commented 10 months ago

it is, yeah. I tried generating a patchfile that I think might work? https://gist.github.com/ckolderup/f8cdaa9ee0742183c8cb95fc239cbae6

ckolderup commented 10 months ago

hmm, no, maybe not. Can't git am with a clean copy of the PR.

steve-bate commented 10 months ago

I just force-pushed a clean PR with the merge conflicts addressed (and squashed).

ckolderup commented 10 months ago

that works, thanks. I'm seeing a few random eslint warnings but it'll be easier to just address those after merging.

steve-bate commented 10 months ago

Thanks. I'll be sure to run eslint on any future PRs.