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

Fixed instant upload for photos #111

Closed
wants to merge 2 commits into from
Closed

Fixed instant upload for photos #111

wants to merge 2 commits into from

Conversation

LukeOwlclaw
Copy link

Should work for all Android 4+ devices as well as for all devices for which instant upload worked before.

Luke Owncloud added 2 commits March 18, 2013 07:28
use both unofficial, previously used action
and also offically supported action (requires SDK 14)
@davivel
Copy link
Contributor

davivel commented Mar 18, 2013

Hi @LukeOwncloud ,

Thanks a lot for your pull request. You work is very helpful.

We require a contributor agreement for code contributions.
Here is the information: http://owncloud.org/about/contributor-agreement/
Could you please send the signed agreement to @karlitschek ? You will get write access
to the repo direcly afterwards.

Let us know if you have any questions
Thanks a lot for your great work.

@LukeOwlclaw
Copy link
Author

Is it required for the Android app? I just read on the linked page:

This also doesn´t apply to the mobile apps or the desktop syncing apps or other parts.

@davivel
Copy link
Contributor

davivel commented Apr 15, 2013

@LukeOwncloud , the agreement is updated now in the same link, explicitly including the Android app. Please, send it signed to @karlitschek .

And please, merge the branch owncloud:develop into your code and repeat the pull request into it instead of into owncloud:master. We are sorry about this, but we need to put order in contributions and we think this will help.

@LukeOwlclaw
Copy link
Author

Hi @davivel
I just pushed my changes to owncloud/android/develop. --> 01cc238
Hope I did it right.
Who will check it and merge it to master?

@davivel
Copy link
Contributor

davivel commented Aug 6, 2013

As I told you in the other commit, this is not the right way to merge new stuff. To fix something or add new functionality:

  1. Create a new branch from 'develop'.
  2. When done in that branch, create a PR to android:develop; just use the PR 'button' in Github and click on the 'android:master' link in the top of the description to change it for 'android:develop' before fulfilling the PR.
  3. Wait for masensio or myself review and approve the PR.

@LukeOwlclaw
Copy link
Author

Arrgh, now I see... it's the EDIT button.
image
(Just a reminder for me for next time)

@davivel
Copy link
Contributor

davivel commented Aug 6, 2013

Je, je, OK, no problem.

davigonz pushed a commit that referenced this pull request Feb 10, 2017
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.

2 participants