projects
/
pub
/
Android
/
ownCloud.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
[tx-robot] updated from transifex
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
operations
/
UploadFileOperation.java
2015-12-03
masensio
Merge branch 'release-1.9' into stable
oc-android-1.9
blob
|
commitdiff
2015-11-20
Maria Asensio
Merge pull request #1119 from owncloud/strip-index...
blob
|
commitdiff
2015-11-06
Maria Asensio
Merge pull request #1184 from Wikinaut/show-certificate...
blob
|
commitdiff
2015-10-30
Maria Asensio
Merge pull request #1109 from owncloud/sync_full_folder
blob
|
commitdiff
2015-10-30
David A. Velasco
Merge pull request #1219 from owncloud/sync_full_folder...
blob
|
commitdiff
2015-10-27
masensio
Fix Select Local Version or Keep Both behaviour when...
blob
|
commitdiff
2015-10-27
masensio
Merge branch 'master' into sync_full_folder
blob
|
commitdiff
|
diff to current
2015-10-15
masensio
Merge branch 'detailThumbnail' of git://github.com...
blob
|
commitdiff
|
diff to current
2015-10-01
masensio
Merge pull request #839 from fluffy88/develop
blob
|
commitdiff
|
diff to current
2015-09-30
masensio
Use SYNC_CONFLICT instead CONFLICT for conflicts in...
blob
|
commitdiff
|
diff to current
2015-09-30
masensio
Merge branch 'master' into sync_full_folder
blob
|
commitdiff
|
diff to current
2015-09-28
David A. Velasco
Upload operations end in conflict if overriding a versi...
blob
|
commitdiff
|
diff to current
2015-09-25
David A. Velasco
Clean-up: removed unused imports and methods, and comme...
blob
|
commitdiff
|
diff to current
2015-09-25
David A. Velasco
ETag used to detect changes in remote files (not only...
blob
|
commitdiff
|
diff to current
2015-09-25
David A. Velasco
Fixed NullPointerExceptionS in upload cancelations
blob
|
commitdiff
|
diff to current
2015-08-21
tobiasKaminsky
Merge branch 'develop' of github.com:owncloud/android...
blob
|
commitdiff
|
diff to current
2015-08-07
David A. Velasco
Merge branch 'develop'
blob
|
commitdiff
|
diff to current
2015-08-05
masensio
Merge commit 'refs/pr/707' into text_file_preview_pr_70...
blob
|
commitdiff
|
diff to current
2015-07-28
purigarcia
merge develop
blob
|
commitdiff
|
diff to current
2015-07-26
AndyScherzinger
Merge branch 'master' of https://github.com/owncloud...
blob
|
commitdiff
|
diff to current
2015-07-23
David A. Velasco
Merge pull request #1050 from owncloud/favourites_conte...
blob
|
commitdiff
|
diff to current
2015-07-22
purigarcia
change the name of the method from keepInSync to favori...
blob
|
commitdiff
|
diff to current
2015-05-21
tobiasKaminsky
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
diff to current
2015-04-28
David A. Velasco
Merge branch 'develop' into pinEnhancement
blob
|
commitdiff
|
diff to current
2015-04-07
masensio
Merge branch 'release-1.7.1'
oc-android-1.7.1_signed
blob
|
commitdiff
|
diff to current
2015-03-25
purigarcia
Merge branch 'develop' into automationTest
blob
|
commitdiff
|
diff to current
2015-03-25
David A. Velasco
Merge pull request #924 from owncloud/add_user_agent_su...
blob
|
commitdiff
|
diff to current
2015-03-24
masensio
Refactor parameter user_agent out of RemoteOperation...
blob
|
commitdiff
|
diff to current
2015-03-18
masensio
Merge branch 'develop' into add_user_agent_support
blob
|
commitdiff
|
diff to current
2015-03-16
masensio
Merge branch 'develop' into create_folder_during_upload...
blob
|
commitdiff
|
diff to current
2015-03-13
masensio
Add user agent in android project
blob
|
commitdiff
|
diff to current
2015-03-10
masensio
Merge branch 'develop' into accessibility
blob
|
commitdiff
|
diff to current
2015-03-09
David A. Velasco
Merge branch 'develop' into update_propfind_for_server_8.1
blob
|
commitdiff
|
diff to current
2015-03-06
masensio
Merge branch 'develop' into share_password_support
blob
|
commitdiff
|
diff to current
2015-03-06
David A. Velasco
Merge pull request #912 from owncloud/review_license
blob
|
commitdiff
|
diff to current
2015-03-05
masensio
Update year in license
blob
|
commitdiff
|
diff to current
2015-03-05
masensio
Add author's line in license
blob
|
commitdiff
|
diff to current
2015-02-25
David A. Velasco
Merge pull request #886 from owncloud/cancel_transfer_f...
blob
|
commitdiff
|
diff to current
2015-02-25
masensio
Bug fixed: Upload fails
blob
|
commitdiff
|
diff to current
2015-02-25
masensio
Merge branch 'develop' into cancel_transfer_for_deleted...
blob
|
commitdiff
|
diff to current
2015-02-24
masensio
Merge remote-tracking branch 'origin/cancel_transfer_fo...
blob
|
commitdiff
|
diff to current
2015-02-24
David A. Velasco
Grant that the proper RemoteOperationResult is built...
blob
|
commitdiff
|
diff to current
2015-02-24
masensio
Merge branch 'develop' into cancel_transfer_for_deleted...
blob
|
commitdiff
|
diff to current
2015-02-19
masensio
Changes from Comments in PR#886
blob
|
commitdiff
|
diff to current
2015-02-19
masensio
Merge branch 'develop' into cancel_transfer_for_deleted...
blob
|
commitdiff
|
diff to current
2015-02-18
masensio
Merge branch 'develop' into cancel_transfer_for_deleted...
blob
|
commitdiff
|
diff to current
2015-02-16
masensio
Cancel the current upload when it hasn't started yet
blob
|
commitdiff
|
diff to current
2015-02-16
masensio
Merge branch 'develop' into cancel_transfer_for_deleted...
blob
|
commitdiff
|
diff to current
2015-02-13
masensio
Merge branch 'develop' into cancel_transfer_for_deleted...
blob
|
commitdiff
|
diff to current
2015-02-05
masensio
Cancel the transfers of an account when the account...
blob
|
commitdiff
|
diff to current
2015-02-04
masensio
Cancel the transfers of an account when the account...
blob
|
commitdiff
|
diff to current
2015-01-18
tobiasKaminsky
Merge branch 'develop2' into imageGrid2
blob
|
commitdiff
|
diff to current
2015-01-08
tobiasKaminsky
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
diff to current
2014-12-26
jabarros
Merge branch 'develop' into obeySortOrder_fixmerge
blob
|
commitdiff
|
diff to current
2014-12-11
jabarros
Merge branch 'develop' into community_image-preview...
blob
|
commitdiff
|
diff to current
2014-12-11
jabarros
Merge branch 'develop' into community_rotateImage
blob
|
commitdiff
|
diff to current
2014-12-10
jabarros
Merge branch 'fix_protocol_send_mail' into fix_logs_cha...
blob
|
commitdiff
|
diff to current
2014-12-09
David A. Velasco
Merge remote-tracking branch 'rhabbachi/feature/308_syn...
blob
|
commitdiff
|
diff to current
2014-12-03
Sam
Merged with owncloud develop
blob
|
commitdiff
|
diff to current
2014-12-03
jabarros
Merge branch 'release-1.6.2'
oc-android-1.6.2
blob
|
commitdiff
|
diff to current
2014-11-24
Jorge Antonio Diaz...
Merge branch 'gradleWithInternalDependency' into us4_vi...
blob
|
commitdiff
|
diff to current
2014-11-21
tobiasKaminsky
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
diff to current
2014-11-21
tobiasKaminsky
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
diff to current
2014-11-21
tobiasKaminsky
Merge branch 'develop' of git@github.com:owncloud/andro...
blob
|
commitdiff
|
diff to current
2014-11-21
Jorge Antonio Diaz...
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
diff to current
2014-11-21
David A. Velasco
Merge pull request #740 from owncloud/revert-669-master
blob
|
commitdiff
|
diff to current
2014-11-21
jabarros
Merge pull request #722 from ogasser/idn_share_fix
blob
|
commitdiff
|
diff to current
2014-11-19
jabarros
Merge branch 'develop' into instant_uploads_set_path
blob
|
commitdiff
|
diff to current
2014-11-19
David A. Velasco
Merge pull request #721 from owncloud/nea_upload_files
blob
|
commitdiff
|
diff to current
2014-11-19
David A. Velasco
Merge branch 'develop' into nea_upload_files
blob
|
commitdiff
|
diff to current
2014-11-18
jabarros
Merge branch 'develop' into nea_upload_files
blob
|
commitdiff
|
diff to current
2014-11-17
jabarros
Merge branch 'develop' into nea_upload_files
blob
|
commitdiff
|
diff to current
2014-11-17
jabarros
Refactoring to avoid maintenance after CR
blob
|
commitdiff
|
diff to current
2014-11-12
jabarros
Get file mimeType and pass it for being checked on...
blob
|
commitdiff
|
diff to current
2014-11-11
jabarros
Add workaround for Drive app in which a creation of...
blob
|
commitdiff
|
diff to current
2014-11-05
tobiasKaminsky
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
diff to current
2014-10-29
grecep
Merge pull request #669 from grecep/master
blob
|
commitdiff
|
diff to current
2014-10-24
tobiasKaminsky
Merge remote-tracking branch 'upstream/develop' into
blob
|
commitdiff
|
diff to current
2014-10-24
tobiasKaminsky
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
diff to current
2014-10-24
jabarros
Merge branch 'thumbnails_from_server' of https://github...
blob
|
commitdiff
|
diff to current
2014-10-23
jabarros
Merge branch 'sortingFiles' of https://github.com/tobia...
blob
|
commitdiff
|
diff to current
2014-10-22
tobiasKaminsky
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
diff to current
2014-10-17
MMMarcy
Merge remote-tracking branch 'theirs/develop' into...
blob
|
commitdiff
|
diff to current
2014-10-17
Magnus Sjoqvist
Merge with develop
blob
|
commitdiff
|
diff to current
2014-10-15
jabarros
Merge branch 'idn_hosts' of https://github.com/ogasser...
blob
|
commitdiff
|
diff to current
2014-10-09
jabarros
Merge branch 'sortingFiles' of https://github.com/tobia...
blob
|
commitdiff
|
diff to current
2014-10-06
jabarros
Merge branch 'master' of https://github.com/loripino21...
blob
|
commitdiff
|
diff to current
2014-10-01
Javier Gonzalez
Merge pull request #641 from owncloud/thumbnails_for_do...
blob
|
commitdiff
|
diff to current
2014-09-18
David A. Velasco
Merge branch 'develop' into release-1.6.0
blob
|
commitdiff
|
diff to current
2014-09-18
David A. Velasco
Merge pull request #627 from owncloud/better_loggin_system
blob
|
commitdiff
|
diff to current
2014-09-18
David A. Velasco
Fixed conflict - Merge branch 'develop' into better_log...
blob
|
commitdiff
|
diff to current
2014-09-17
jabarros
Merge branch 'develop' into better_loggin_system
blob
|
commitdiff
|
diff to current
2014-09-11
jabarros
Move Logger class to owncloud library and update refere...
blob
|
commitdiff
|
diff to current
2014-04-08
masensio
Merge branch 'develop' into videoInstandUploads
blob
|
commitdiff
|
diff to current
2014-04-03
masensio
Merge pull request #392 from pmarasse/pullup
blob
|
commitdiff
|
diff to current
2014-03-31
masensio
Merge commit 'refs/pr/392' into improve_action_bar_pr_3...
blob
|
commitdiff
|
diff to current
2014-03-18
masensio
Merge pull request #395 from dontcallmedom/master
blob
|
commitdiff
|
diff to current
2014-03-13
Thomas Müller
Merge branch 'develop' into introduce-travis-ci
blob
|
commitdiff
|
diff to current
2014-03-13
masensio
Merge branch 'pr/395' into allow_multiline_checkbox_pre...
blob
|
commitdiff
|
diff to current
2014-02-24
masensio
Merge branch 'master' into develop
blob
|
commitdiff
|
diff to current
next