projects
/
pub
/
Android
/
ownCloud.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge remote-tracking branch 'remotes/upstream/multiSelect' into beta
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
datamodel
/
2015-11-18
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/multiSel...
tree
|
commitdiff
2015-11-18
tobiasKaminsky
Merge remote-tracking branch 'upstream/beta' into beta
tree
|
commitdiff
2015-11-18
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/resizeCa...
tree
|
commitdiff
2015-11-18
Tobias Kaminsky
Merge pull request #1290 from przybylski/bug_1288
tree
|
commitdiff
2015-11-14
tobiasKaminsky
Merge branch 'master' of github.com:owncloud/android...
tree
|
commitdiff
2015-11-13
tobiasKaminsky
show cache size in mb
tree
|
commitdiff
2015-11-13
tobiasKaminsky
Merge branch 'beta' of github.com:owncloud/android...
tree
|
commitdiff
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
tree
|
commitdiff
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/target_m...
tree
|
commitdiff
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/cancelUp...
tree
|
commitdiff
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/material...
tree
|
commitdiff
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/switchLi...
tree
|
commitdiff
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/descendI...
tree
|
commitdiff
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
tree
|
commitdiff
2015-11-12
David A. Velasco
Merge pull request #1254 from owncloud/droid-update
tree
|
commitdiff
2015-11-12
David A. Velasco
Merge pull request #1274 from owncloud/read_capabilitie...
tree
|
commitdiff
2015-11-12
masensio
Read capabilities for showing Share Options
tree
|
commitdiff
2015-11-11
Maria Asensio
Merge pull request #1269 from owncloud/fix_video_not_pr...
tree
|
commitdiff
2015-11-10
Andy Scherzinger
Merge branch 'master' of https://github.com/owncloud...
tree
|
commitdiff
2015-11-10
Andy Scherzinger
Merge branch '1193_uploader_layout' of https://github...
tree
|
commitdiff
2015-11-06
David A. Velasco
Minimal cleaning
tree
|
commitdiff
2015-11-06
tobiasKaminsky
Merge branch 'setAsWallpaper' into beta
tree
|
commitdiff
2015-11-06
David A. Velasco
Fixed local URI to video files passed to VideoView
tree
|
commitdiff
2015-11-06
Andy Scherzinger
Merge branch 'material_fab' of https://github.com/owncl...
tree
|
commitdiff
2015-11-06
Andy Scherzinger
Merge branch 'material_buttons' of https://github.com...
tree
|
commitdiff
2015-11-06
Andy Scherzinger
Merge branch 'master' of https://github.com/owncloud...
tree
|
commitdiff
2015-11-06
Maria Asensio
Merge pull request #1184 from Wikinaut/show-certificate...
tree
|
commitdiff
2015-11-05
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/resizedI...
tree
|
commitdiff
2015-11-05
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
tree
|
commitdiff
2015-11-05
Maria Asensio
Merge pull request #1252 from owncloud/share_with_users
tree
|
commitdiff
2015-11-04
Andy Scherzinger
Merge branch 'material_buttons' of https://github.com...
tree
|
commitdiff
2015-11-04
Andy Scherzinger
Merge branch 'material_buttons' of https://github.com...
tree
|
commitdiff
2015-11-02
Andy Scherzinger
Merge branch 'material_buttons' of https://github.com...
tree
|
commitdiff
2015-11-02
tobiasKaminsky
Merge branch 'setAsWallpaper' into beta
tree
|
commitdiff
2015-11-02
tobiasKaminsky
Merge branch 'setAsWallpaper' into beta
tree
|
commitdiff
2015-11-02
Andy Scherzinger
Merge branch 'master' of https://github.com/owncloud...
tree
|
commitdiff
2015-11-01
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/streamin...
tree
|
commitdiff
2015-11-01
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/video_th...
tree
|
commitdiff
2015-11-01
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/streamin...
tree
|
commitdiff
2015-11-01
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
tree
|
commitdiff
2015-10-31
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
tree
|
commitdiff
2015-10-31
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
tree
|
commitdiff
2015-10-31
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/resizedI...
tree
|
commitdiff
2015-10-31
tobiasKaminsky
fixed storing thumbnails by correct imageKey
tree
|
commitdiff
2015-10-31
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/resizedI...
tree
|
commitdiff
2015-10-30
masensio
Refactor saveSharesInFolder in FileDataStorageManager...
tree
|
commitdiff
2015-10-30
masensio
Fix saveSharesDB, duplicated rows
tree
|
commitdiff
2015-10-30
David A. Velasco
Added operation to create shares with a sharee, separat...
tree
|
commitdiff
2015-10-30
masensio
Get users/group from Server, to fill in 'Share with...
tree
|
commitdiff
2015-10-30
masensio
Use UnshareOperation instead an AsyncTask, for unshare...
tree
|
commitdiff
2015-10-30
masensio
Adapt UnshareLinkOperation to support also ShareType...
tree
|
commitdiff
2015-10-30
tobiasKaminsky
fixed travis bug
tree
|
commitdiff
2015-10-30
masensio
Get shares from Database, fix in insert shares in DB
tree
|
commitdiff
2015-10-30
masensio
Get shares from Database (WIP)
tree
|
commitdiff
2015-10-30
David A. Velasco
Sync user and group shares into database
tree
|
commitdiff
2015-10-30
masensio
Add new attribute to OCFile to know if this file is...
tree
|
commitdiff
2015-10-30
masensio
Add new attribute to OCFile to know if this file is...
tree
|
commitdiff
2015-10-30
Andy Scherzinger
Merge branch 'master' of https://github.com/owncloud...
tree
|
commitdiff
2015-10-30
Andy Scherzinger
Merge branch 'master' of https://github.com/owncloud...
tree
|
commitdiff
2015-10-30
Maria Asensio
Merge pull request #1109 from owncloud/sync_full_folder
tree
|
commitdiff
2015-10-30
David A. Velasco
Merge pull request #1219 from owncloud/sync_full_folder...
tree
|
commitdiff
2015-10-29
David A. Velasco
Merge pull request #1105 from owncloud/fixLegacyTravis
tree
|
commitdiff
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/multiSel...
tree
|
commitdiff
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/avoidDup...
tree
|
commitdiff
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/sortInUp...
tree
|
commitdiff
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/videoBig...
tree
|
commitdiff
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/resizeCa...
tree
|
commitdiff
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/switchOf...
tree
|
commitdiff
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/material...
tree
|
commitdiff
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/material...
tree
|
commitdiff
2015-10-29
tobiasKaminsky
Merge branch 'switchListVsGridMaster' into beta
tree
|
commitdiff
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
tree
|
commitdiff
2015-10-29
Andy Scherzinger
Merge branch 'descendIntoFolder' of https://github...
tree
|
commitdiff
2015-10-27
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/animated...
tree
|
commitdiff
2015-10-27
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
tree
|
commitdiff
2015-10-27
masensio
Fix Select Local Version or Keep Both behaviour when...
tree
|
commitdiff
2015-10-27
masensio
Merge branch 'master' into sync_full_folder
tree
|
commitdiff
2015-10-26
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/resizedI...
tree
|
commitdiff
2015-10-18
tobiasKaminsky
enabled all occurrences.
tree
|
commitdiff
2015-10-18
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
tree
|
commitdiff
2015-10-18
tobiasKaminsky
Merge branch 'uploadWhenCharging' of github.com:ownclou...
tree
|
commitdiff
2015-10-15
masensio
Merge branch 'detailThumbnail' of git://github.com...
tree
|
commitdiff
2015-10-12
tobiasKaminsky
cache size is read from cache on preference start
tree
|
commitdiff
2015-10-12
tobiasKaminsky
cache resize
tree
|
commitdiff
2015-10-09
Andy Scherzinger
Merge branch 'master' of https://github.com/owncloud...
tree
|
commitdiff
2015-10-02
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
tree
|
commitdiff
2015-10-01
masensio
Merge pull request #839 from fluffy88/develop
tree
|
commitdiff
2015-09-30
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/multiSel...
tree
|
commitdiff
2015-09-30
tobiasKaminsky
Merge branch 'master' of github.com:owncloud/android...
tree
|
commitdiff
2015-09-30
masensio
Merge branch 'master' into sync_full_folder
tree
|
commitdiff
2015-09-29
tobiasKaminsky
Merge branch 'master' of github.com:owncloud/android...
tree
|
commitdiff
2015-09-29
tobiasKaminsky
wip
tree
|
commitdiff
2015-09-28
masensio
Merge branch 'release-1.8'
tree
|
commitdiff
2015-09-27
Andy Scherzinger
Merge branch 'notification_coloring' of https://github...
tree
|
commitdiff
2015-09-25
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
tree
|
commitdiff
2015-09-25
David A. Velasco
Clean-up: removed unused imports and methods, and comme...
tree
|
commitdiff
2015-09-25
David A. Velasco
Remove conflict badge from ancestors when conflict...
tree
|
commitdiff
2015-09-25
David A. Velasco
Removed conflict badge when conflict is solved
tree
|
commitdiff
2015-09-25
David A. Velasco
Added conflict icon to folders containing files with...
tree
|
commitdiff
2015-09-25
David A. Velasco
Persist conflicts in local database and show with an...
tree
|
commitdiff
next