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

Link sharing ui improvements #7318

Merged
merged 5 commits into from
Feb 11, 2020
Merged

Link sharing ui improvements #7318

merged 5 commits into from
Feb 11, 2020

Conversation

ckamm
Copy link
Contributor

@ckamm ckamm commented Jul 17, 2019

@ckamm ckamm added this to the 2.6.1 milestone Jul 17, 2019
@ckamm ckamm requested a review from ogoffart July 17, 2019 12:51
@ckamm ckamm self-assigned this Jul 17, 2019
@ckamm
Link sharing ui improvements
b887cd6 
- Respect fine-grained "password required" capability #7247
- Allow password/expiration to be added to shares that were created
  without these at a time when the server allowed that #7313
@guruz
Copy link
Contributor

guruz commented Nov 18, 2019

Pending discussion in #7564
CC @michaelstingl

@michaelstingl
Copy link
Contributor

Pending discussion in #7564
CC @michaelstingl

"Hybrid" approach planned mid-term, so I think we'll need this before.

@ogoffart
Merge remote-tracking branch 'origin/2.6' into 7247-share-pw-require
38f3a52 
 Conflicts:
	src/gui/sharelinkwidget.cpp
	src/libsync/capabilities.cpp
@ogoffart
Capabilities: adapt new code to the previous refactoring
68887c7 
Some capabilities were added after 6adb686
So they could as well be adapted
@ogoffart
Share: Fix merge conflict
eb86fd3 
Re-apply part of commit f638f33
(for issue #7429) that were gone in the previous merge
@ogoffart
Copy link
Contributor

ogoffart commented Feb 4, 2020

I fixed the merge conflict based on what i think the code was supposed to do, but this should be reviewed again i guess.

@TheOneRing
Copy link
Contributor

I tested the share dilaog and it looks good

could you add a changelog entry?

@ogoffart ogoffart merged commit b9b3eb0 into 2.6 Feb 11, 2020
@delete-merged-branch delete-merged-branch bot deleted the 7247-share-pw-require branch February 11, 2020 14:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ogoffart ogoffart ogoffart approved these changes

@TheOneRing TheOneRing TheOneRing approved these changes

Assignees

@ckamm ckamm

Labels
None yet
Projects
None yet
Milestone
2.6.1
Development

Successfully merging this pull request may close these issues.
5 participants
@ckamm @guruz @michaelstingl @ogoffart @TheOneRing