projects / pub / Android / ownCloud.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge remote-tracking branch 'remotes/upstream/video_thumbnail' into beta
[pub/Android/ownCloud.git] / src / com / owncloud / android / operations /
2015-11-01 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/video_th... tree | commitdiff
2015-11-01 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/streamin... tree | commitdiff
2015-11-01 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master... tree | commitdiff
2015-10-31 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master... tree | commitdiff
2015-10-31 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master... tree | commitdiff
2015-10-31 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizedI... tree | commitdiff
2015-10-31 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizedI... tree | commitdiff
2015-10-30 Maria AsensioMerge pull request #1109 from owncloud/sync_full_folder tree | commitdiff
2015-10-30 David A. VelascoMerge pull request #1219 from owncloud/sync_full_folder... tree | commitdiff
2015-10-29 David A. VelascoMerge pull request #1105 from owncloud/fixLegacyTravis tree | commitdiff
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/multiSel... tree | commitdiff
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/avoidDup... tree | commitdiff
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/sortInUp... tree | commitdiff
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/videoBig... tree | commitdiff
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizeCa... tree | commitdiff
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/switchOf... tree | commitdiff
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master... tree | commitdiff
2015-10-29 masensioDetect conflict when local and server version are changed tree | commitdiff
2015-10-27 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master... tree | commitdiff
2015-10-27 masensioFix Select Local Version or Keep Both behaviour when... tree | commitdiff
2015-10-27 masensioMerge branch 'master' into sync_full_folder tree | commitdiff
2015-10-26 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizedI... tree | commitdiff
2015-10-18 tobiasKaminskyenabled all occurrences. tree | commitdiff
2015-10-18 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master... tree | commitdiff
2015-10-18 tobiasKaminskyMerge branch 'uploadWhenCharging' of github.com:ownclou... tree | commitdiff
2015-10-15 masensioMerge branch 'detailThumbnail' of git://github.com... tree | commitdiff
2015-10-02 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master... tree | commitdiff
2015-10-01 masensioMerge pull request #839 from fluffy88/develop tree | commitdiff
2015-09-30 masensioUse SYNC_CONFLICT instead CONFLICT for conflicts in... tree | commitdiff
2015-09-30 masensioMerge branch 'master' into sync_full_folder tree | commitdiff
2015-09-28 David A. VelascoUpload operations end in conflict if overriding a versi... tree | commitdiff
2015-09-25 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master... tree | commitdiff
2015-09-25 David A. VelascoClean-up: removed unused imports and methods, and comme... tree | commitdiff
2015-09-25 David A. VelascoRemoved separated 'download folder' in contextual menu... tree | commitdiff
2015-09-25 David A. VelascoSafe blanket to clean DB if wrong conflicts keep stored tree | commitdiff
2015-09-25 David A. VelascoAdded conflict icon to folders containing files with... tree | commitdiff
2015-09-25 David A. VelascoPersist conflicts in local database and show with an... tree | commitdiff
2015-09-25 David A. VelascoETag used to detect changes in remote files (not only... tree | commitdiff
2015-09-25 David A. VelascoFixed NullPointerExceptionS in upload cancelations tree | commitdiff
2015-09-25 David A. VelascoKeep the old operation to sync folder as DownloadFolder... tree | commitdiff
2015-09-25 David A. VelascoExtend SyncFolderOperation to check local changes of... tree | commitdiff
2015-09-19 tobiasKaminsky#819, part 2: Instant uploads, depends on setting tree | commitdiff
2015-09-09 masensioMerge pull request #1124 from Kernald/new-filetype... tree | commitdiff
2015-09-07 Andy ScherzingerMerge branch 'new-filetype-icons' of https://github... tree | commitdiff
2015-09-04 masensioMerge branch 'master' into text_file_preview_pr_707_wit... tree | commitdiff
2015-09-04 Andy ScherzingerMerge branch 'material_buttons' of https://github.com... tree | commitdiff
2015-09-04 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud... tree | commitdiff
2015-09-04 masensioMerge pull request #1102 from owncloud/copy tree | commitdiff
2015-09-02 masensioMerge branch 'text_file_preview_pr_707_with_develop... tree | commitdiff
2015-09-02 masensioMerge remote-tracking branch 'origin/master' into text_... tree | commitdiff
2015-09-01 David A. VelascoMerge branch 'master' into copy tree | commitdiff
2015-09-01 masensioMerge branch 'develop' into uploadWhenCharging tree | commitdiff
2015-08-25 masensioMerge branch 'master' into create_folder_button_on_acti... tree | commitdiff
2015-08-24 masensioMerge pull request #1082 from owncloud/ignoreHiddenFiles tree | commitdiff
2015-08-24 masensioMerge branch 'develop' tree | commitdiff
2015-08-24 masensioMerge pull request #1078 from gstraube/develop tree | commitdiff
2015-08-21 gstraubeMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2015-08-21 tobiasKaminskyMerge branch 'develop' of github.com:owncloud/android... tree | commitdiff
2015-08-21 purigarciaMerge branch 'develop' into ignoreHiddenFiles tree | commitdiff
2015-08-18 Jorge Antonio Diaz... Fixes the last reported bugs tree | commitdiff
2015-08-18 Jorge Antonio Diaz... Updated copy action tree | commitdiff
2015-08-18 Jorge Antonio Diaz... Added copy action tree | commitdiff
2015-08-18 Jorge Antonio Diaz... Added CopyActivity tree | commitdiff
2015-08-14 tobiasKaminskyMerge remote-tracking branch 'upstream/video_thumbnail... tree | commitdiff
2015-08-10 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud... tree | commitdiff
2015-08-07 David A. VelascoMerge branch 'develop' tree | commitdiff
2015-08-06 Andy ScherzingerMerge branch 'develop' of https://github.com/owncloud... tree | commitdiff
2015-08-06 masensioMerge pull request #1052 from owncloud/change_subject_w... tree | commitdiff
2015-08-06 purigarciachange the subject tree | commitdiff
2015-08-05 masensioMerge commit 'refs/pr/707' into text_file_preview_pr_70... tree | commitdiff
2015-07-28 gstraubeCheck if ETag for remote folder is null, i.e. it was... tree | commitdiff
2015-07-28 purigarciamerge develop tree | commitdiff
2015-07-26 AndyScherzingerMerge branch 'master' of https://github.com/owncloud... tree | commitdiff
2015-07-23 David A. VelascoMerge pull request #1050 from owncloud/favourites_conte... tree | commitdiff
2015-07-22 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2015-07-22 purigarciachange the name of the method from keepInSync to favori... tree | commitdiff
2015-07-06 masensioMerge branch 'release-1.7.2' tree | commitdiff
2015-07-01 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2015-06-22 David A. VelascoMerge remote-tracking branch 'origin/release-1.7.2... tree | commitdiff
2015-06-22 David A. VelascoMerge pull request #1024 from owncloud/fix_shared_by_li... tree | commitdiff
2015-06-22 masensioMerge branch 'develop' into fix_shared_by_link_for_serv... tree | commitdiff
2015-06-22 David A. VelascoMerge branch 'master' into develop tree | commitdiff
2015-06-19 masensioUpdate string subject_token and update library reference tree | commitdiff
2015-06-15 masensioMerge branch 'develop' into forbidden_characters_from_s... tree | commitdiff
2015-06-15 masensioMerge pull request #995 from owncloud/navigationDrawer_... tree | commitdiff
2015-06-15 masensioMerge remote-tracking branch 'origin/develop' into... tree | commitdiff
2015-06-15 David A. VelascoMerge branch 'develop' into navigationDrawer_basic tree | commitdiff
2015-05-27 tobiasKaminskyMerge branch 'navigationDrawer_update' of github.com... tree | commitdiff
2015-05-27 masensioMerge branch 'remove_ActionBarSherlock' into navigation... tree | commitdiff
2015-05-25 masensioDisable On Device option in Navigation Drawer tree | commitdiff
2015-05-23 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2015-05-21 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2015-05-05 masensioMerge branch 'develop' into thumbnailOOM tree | commitdiff
2015-05-04 purigarciaMerge branch 'develop' into automationTest tree | commitdiff
2015-04-28 David A. VelascoMerge branch 'develop' into pinEnhancement tree | commitdiff
2015-04-22 David A. VelascoMerge pull request #957 from owncloud/fix_crash_invalid... tree | commitdiff
2015-04-22 David A. VelascoMerge pull request #951 from owncloud/loging_different_... tree | commitdiff
2015-04-22 David A. VelascoMerge branch 'develop' into loging_different_servers_sa... tree | commitdiff
2015-04-15 masensioMerge pull request #946 from owncloud/upgrading_account... tree | commitdiff
2015-04-15 David A. VelascoMerge branch 'develop' into upgrading_account_manager tree | commitdiff
next
ownCloud Android App