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.

Sign up for GitHub

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

Jump to bottom

[stable25] Add public link logic #1321

Merged
merged 15 commits into from
Oct 20, 2022
Merged

[stable25] Add public link logic #1321

merged 15 commits into from
Oct 20, 2022

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Oct 10, 2022 •
edited by artonge
Loading

  • ⚠️ This backport had conflicts and is incomplete

backport of #1278

@backportbot-nextcloud backportbot-nextcloud bot added the feature: albums Related to the albums section label Oct 10, 2022
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 25 milestone Oct 10, 2022
@artonge
Copy link
Collaborator

artonge commented Oct 10, 2022

/compile /

@blizzz blizzz mentioned this pull request Oct 10, 2022
Merged
2 tasks
@skjnldsv
Copy link
Member

Do we have to wait for next 25 version?

@artonge
Copy link
Collaborator

artonge commented Oct 11, 2022

Do we have to wait for next 25 version?

Yes, I think the change is too big for a RC

skjnldsv
skjnldsv requested changes Oct 11, 2022
View reviewed changes
Copy link
Member

@skjnldsv skjnldsv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Blocking until 25.1.0

@artonge artonge self-assigned this Oct 11, 2022
@blizzz blizzz modified the milestones: Nextcloud 25, Nextcloud 25.0.1 Oct 11, 2022
@blizzz
Copy link
Member

blizzz commented Oct 11, 2022

Blocking until 25.1.0

adjusted the milestone 🚩

@blizzz blizzz added the 3. to review Waiting for reviews label Oct 11, 2022
This was referenced Oct 14, 2022
Merged
Merged
artonge
artonge previously requested changes Oct 17, 2022
View reviewed changes
Copy link
Collaborator

@artonge artonge left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will need stable25 versions of the following after merging:

@skjnldsv
Copy link
Member

So we can merge now @artonge ?

artonge added 10 commits October 20, 2022 11:54
@artonge
Add public link logic
3d024be 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
Remove separator in action menu
e14b0bc 
As there is nothing to separate for public album

Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
Remove file picker button in public albums
e721cd5 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
Display album's name instead of token
37e94bc 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
Apply review suggestions
8741855 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
Generate token in the backend
bfaab63 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
Revert "Display album's name instead of token"
57b02f1 
This reverts commit 2de383f.

Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
Cleaning before review
4f751b5 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
Apply suggestions
36930fc 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
Remove useless initial state
47697b4 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
Refactor getting album storage folder
01f33ad 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
Make public pages work
defdb69 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
Remove public upload code
e23db94 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
compile assets
93c1320 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
Correctly assign albumName
0e8cc37 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge artonge force-pushed the backport/1278/stable25 branch from e8c034e to 0e8cc37 Compare October 20, 2022 10:15
@artonge artonge enabled auto-merge October 20, 2022 10:15
@artonge artonge mentioned this pull request Oct 20, 2022
Closed
1 task
@artonge artonge dismissed their stale review October 20, 2022 11:47

This is blocking the merge

@artonge artonge merged commit fb6b132 into stable25 Oct 20, 2022
@artonge artonge deleted the backport/1278/stable25 branch October 20, 2022 11:47
@skjnldsv skjnldsv mentioned this pull request Oct 27, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skjnldsv skjnldsv skjnldsv approved these changes

@artonge artonge artonge left review comments

@CarlSchwan CarlSchwan Awaiting requested review from CarlSchwan

Assignees

@artonge artonge

Labels
3. to review Waiting for reviews feature: albums Related to the albums section
Projects
None yet
Milestone
Nextcloud 25.0.1
Development

Successfully merging this pull request may close these issues.
3 participants
@artonge @skjnldsv @blizzz