Skip to content

Add expiration date row #307

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
Closed
MorrisJobke wants to merge 5 commits into from
Closed

Add expiration date row #307

MorrisJobke wants to merge 5 commits into from

Conversation

@MorrisJobke
Copy link
Member

@MorrisJobke MorrisJobke commented Jul 4, 2016

bildschirmfoto 2016-07-04 um 17 18 21

I also added unit tests

@MorrisJobke MorrisJobke added enhancement 3. to review Waiting for reviews labels Jul 4, 2016
@MorrisJobke MorrisJobke added this to the Nextcloud Next milestone Jul 4, 2016
@MorrisJobke
Copy link
Member Author

MorrisJobke commented Jul 4, 2016 •
edited
Loading

It's basically the same as owncloud/core#19513

@MariusBluem
Copy link
Member

MariusBluem commented Jul 4, 2016

Why is owncloud/core not integrating it in the PR you submittied there 😕 I like it 👊

@MorrisJobke
Copy link
Member Author

MorrisJobke commented Jul 4, 2016

Why is owncloud/core not integrating it in the PR you submittied there

Because the unit tests were added just today 😉

@MariusBluem
Copy link
Member

MariusBluem commented Jul 4, 2016

Shouldnt we wait here because we overwrite it via downstream anyway, or do you want to bring in this ASAP 😁

@LukasReschke
Copy link
Member

LukasReschke commented Jul 4, 2016 •
edited
Loading

Yeah. This is a hell for rebasing and merging when we sync (yay! merge conflicts!). It would be way easier to NOT submit stuff upstream if we have it in downstream.

@MariusBluem
Copy link
Member

MariusBluem commented Jul 4, 2016 •
edited
Loading

or we simply close the PR in ownCloud - because @MorrisJobke "owns" it 😈

@MorrisJobke
Copy link
Member Author

MorrisJobke commented Jul 5, 2016

It would be way easier to NOT submit stuff upstream if we have it in downstream.

It was already there. The only thing I added (instead of somebody else) was the unit test. So it was only a matter of time that it is merged upstream.

@LukasReschke
Copy link
Member

LukasReschke commented Jul 5, 2016

or we simply close the PR in ownCloud - because @MorrisJobke "owns" it 😈

I'd say we should do it the other way. Get it merged upstream and then have it included in our downstream syncs. Let's not be evil 😉

@MorrisJobke MorrisJobke closed this Jul 5, 2016
@MorrisJobke MorrisJobke deleted the add-expiration-date-row branch July 5, 2016 10:22
@MorrisJobke
Copy link
Member Author

MorrisJobke commented Jul 5, 2016

@LukasReschke @Mar1u5 Then please review upstream ;)

R0Wi pushed a commit to R0Wi/server that referenced this pull request Nov 22, 2025
@andrey18106
Fix ExApp management state if default Deploy daemon is not available (n…
2387ced 
…extcloud#314)

Resolves: nextcloud#307

- [x] Allow disable and remove actions if default Deploy daemon is not
available.
- [x] Set ping timeout to 3s

---------

Signed-off-by: Andrey Borysenko <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

3. to review Waiting for reviews enhancement

Projects

None yet

Milestone

Nextcloud 10.0

Development

Successfully merging this pull request may close these issues.

4 participants

@MorrisJobke @MariusBluem @LukasReschke