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/master' into beta
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
datamodel
/
FileDataStorageManager.java
2015-11-27
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
blob
|
commitdiff
2015-11-25
David A. Velasco
Merge pull request #1307 from owncloud/share_with_passw...
blob
|
commitdiff
|
diff to current
2015-11-25
David A. Velasco
Grant that ShareActivity is correctly refreshed if...
blob
|
commitdiff
|
diff to current
2015-11-25
David A. Velasco
Updated handling of enforced password for public shares...
blob
|
commitdiff
|
diff to current
2015-11-25
masensio
Delete any rest of old public share/unshare flow
blob
|
commitdiff
|
diff to current
2015-11-25
David A. Velasco
Set or clear password to protect public link in ShareFi...
blob
|
commitdiff
|
diff to current
2015-11-22
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/avoidDup...
blob
|
commitdiff
|
diff to current
2015-11-22
tobiasKaminsky
fix NEP
blob
|
commitdiff
|
diff to current
2015-11-21
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/setAsWal...
blob
|
commitdiff
|
diff to current
2015-11-21
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/resizedI...
blob
|
commitdiff
|
diff to current
2015-11-21
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
blob
|
commitdiff
|
diff to current
2015-11-21
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/avoidDup...
blob
|
commitdiff
|
diff to current
2015-11-21
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/switchOf...
blob
|
commitdiff
|
diff to current
2015-11-21
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
blob
|
commitdiff
|
diff to current
2015-11-20
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/bug_1251...
blob
|
commitdiff
|
diff to current
2015-11-20
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/1193_upl...
blob
|
commitdiff
|
diff to current
2015-11-20
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/external...
blob
|
commitdiff
|
diff to current
2015-11-20
Maria Asensio
Merge pull request #1119 from owncloud/strip-index...
blob
|
commitdiff
|
diff to current
2015-11-18
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/multiSel...
blob
|
commitdiff
|
diff to current
2015-11-18
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/resizeCa...
blob
|
commitdiff
|
diff to current
2015-11-18
Tobias Kaminsky
Merge pull request #1290 from przybylski/bug_1288
blob
|
commitdiff
|
diff to current
2015-11-15
Bartosz Przybylski
Code cleanups
blob
|
commitdiff
|
diff to current
2015-11-15
Bartosz Przybylski
Add more migration stuff. cleanup step is still missing
blob
|
commitdiff
|
diff to current
2015-11-14
tobiasKaminsky
Merge branch 'master' of github.com:owncloud/android...
blob
|
commitdiff
|
diff to current
2015-11-13
tobiasKaminsky
Merge branch 'beta' of github.com:owncloud/android...
blob
|
commitdiff
|
diff to current
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
blob
|
commitdiff
|
diff to current
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/target_m...
blob
|
commitdiff
|
diff to current
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/cancelUp...
blob
|
commitdiff
|
diff to current
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/material...
blob
|
commitdiff
|
diff to current
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/switchLi...
blob
|
commitdiff
|
diff to current
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/descendI...
blob
|
commitdiff
|
diff to current
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
blob
|
commitdiff
|
diff to current
2015-11-12
David A. Velasco
Merge pull request #1254 from owncloud/droid-update
blob
|
commitdiff
|
diff to current
2015-11-12
David A. Velasco
Merge pull request #1274 from owncloud/read_capabilitie...
blob
|
commitdiff
|
diff to current
2015-11-12
masensio
Read capabilities for showing Share Options
blob
|
commitdiff
|
diff to current
2015-11-10
Andy Scherzinger
Merge branch 'master' of https://github.com/owncloud...
blob
|
commitdiff
|
diff to current
2015-11-10
Andy Scherzinger
Merge branch '1193_uploader_layout' of https://github...
blob
|
commitdiff
|
diff to current
2015-11-06
tobiasKaminsky
Merge branch 'setAsWallpaper' into beta
blob
|
commitdiff
|
diff to current
2015-11-06
Andy Scherzinger
Merge branch 'material_fab' of https://github.com/owncl...
blob
|
commitdiff
|
diff to current
2015-11-06
Andy Scherzinger
Merge branch 'material_buttons' of https://github.com...
blob
|
commitdiff
|
diff to current
2015-11-06
Andy Scherzinger
Merge branch 'master' of https://github.com/owncloud...
blob
|
commitdiff
|
diff to current
2015-11-06
Maria Asensio
Merge pull request #1184 from Wikinaut/show-certificate...
blob
|
commitdiff
|
diff to current
2015-11-05
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/resizedI...
blob
|
commitdiff
|
diff to current
2015-11-05
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
blob
|
commitdiff
|
diff to current
2015-11-05
Maria Asensio
Merge pull request #1252 from owncloud/share_with_users
blob
|
commitdiff
|
diff to current
2015-11-04
Andy Scherzinger
Merge branch 'material_buttons' of https://github.com...
blob
|
commitdiff
|
diff to current
2015-11-04
Andy Scherzinger
Merge branch 'material_buttons' of https://github.com...
blob
|
commitdiff
|
diff to current
2015-11-02
Andy Scherzinger
Merge branch 'material_buttons' of https://github.com...
blob
|
commitdiff
|
diff to current
2015-11-02
tobiasKaminsky
Merge branch 'setAsWallpaper' into beta
blob
|
commitdiff
|
diff to current
2015-11-02
tobiasKaminsky
Merge branch 'setAsWallpaper' into beta
blob
|
commitdiff
|
diff to current
2015-11-02
Andy Scherzinger
Merge branch 'master' of https://github.com/owncloud...
blob
|
commitdiff
|
diff to current
2015-11-01
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/streamin...
blob
|
commitdiff
|
diff to current
2015-11-01
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/video_th...
blob
|
commitdiff
|
diff to current
2015-11-01
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/streamin...
blob
|
commitdiff
|
diff to current
2015-11-01
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
blob
|
commitdiff
|
diff to current
2015-10-31
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
blob
|
commitdiff
|
diff to current
2015-10-31
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
blob
|
commitdiff
|
diff to current
2015-10-31
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/resizedI...
blob
|
commitdiff
|
diff to current
2015-10-31
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/resizedI...
blob
|
commitdiff
|
diff to current
2015-10-30
masensio
Refactor saveSharesInFolder in FileDataStorageManager...
blob
|
commitdiff
|
diff to current
2015-10-30
masensio
Fix saveSharesDB, duplicated rows
blob
|
commitdiff
|
diff to current
2015-10-30
David A. Velasco
Added operation to create shares with a sharee, separat...
blob
|
commitdiff
|
diff to current
2015-10-30
masensio
Get users/group from Server, to fill in 'Share with...
blob
|
commitdiff
|
diff to current
2015-10-30
masensio
Use UnshareOperation instead an AsyncTask, for unshare...
blob
|
commitdiff
|
diff to current
2015-10-30
masensio
Adapt UnshareLinkOperation to support also ShareType...
blob
|
commitdiff
|
diff to current
2015-10-30
tobiasKaminsky
fixed travis bug
blob
|
commitdiff
|
diff to current
2015-10-30
masensio
Get shares from Database, fix in insert shares in DB
blob
|
commitdiff
|
diff to current
2015-10-30
masensio
Get shares from Database (WIP)
blob
|
commitdiff
|
diff to current
2015-10-30
David A. Velasco
Sync user and group shares into database
blob
|
commitdiff
|
diff to current
2015-10-30
Andy Scherzinger
Merge branch 'master' of https://github.com/owncloud...
blob
|
commitdiff
|
diff to current
2015-10-30
Andy Scherzinger
Merge branch 'master' of https://github.com/owncloud...
blob
|
commitdiff
|
diff to current
2015-10-30
Maria Asensio
Merge pull request #1109 from owncloud/sync_full_folder
blob
|
commitdiff
|
diff to current
2015-10-30
David A. Velasco
Merge pull request #1219 from owncloud/sync_full_folder...
blob
|
commitdiff
|
diff to current
2015-10-29
David A. Velasco
Merge pull request #1105 from owncloud/fixLegacyTravis
blob
|
commitdiff
|
diff to current
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/multiSel...
blob
|
commitdiff
|
diff to current
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/avoidDup...
blob
|
commitdiff
|
diff to current
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/sortInUp...
blob
|
commitdiff
|
diff to current
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/videoBig...
blob
|
commitdiff
|
diff to current
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/resizeCa...
blob
|
commitdiff
|
diff to current
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/switchOf...
blob
|
commitdiff
|
diff to current
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
blob
|
commitdiff
|
diff to current
2015-10-29
Andy Scherzinger
Merge branch 'descendIntoFolder' of https://github...
blob
|
commitdiff
|
diff to current
2015-10-27
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
blob
|
commitdiff
|
diff to current
2015-10-27
masensio
Fix Select Local Version or Keep Both behaviour when...
blob
|
commitdiff
|
diff to current
2015-10-27
masensio
Merge branch 'master' into sync_full_folder
blob
|
commitdiff
|
diff to current
2015-10-26
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/resizedI...
blob
|
commitdiff
|
diff to current
2015-10-18
tobiasKaminsky
enabled all occurrences.
blob
|
commitdiff
|
diff to current
2015-10-18
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
blob
|
commitdiff
|
diff to current
2015-10-18
tobiasKaminsky
Merge branch 'uploadWhenCharging' of github.com:ownclou...
blob
|
commitdiff
|
diff to current
2015-10-15
masensio
Merge branch 'detailThumbnail' of git://github.com...
blob
|
commitdiff
|
diff to current
2015-10-02
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
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
Merge branch 'master' into sync_full_folder
blob
|
commitdiff
|
diff to current
2015-09-25
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
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
Remove conflict badge from ancestors when conflict...
blob
|
commitdiff
|
diff to current
2015-09-25
David A. Velasco
Removed conflict badge when conflict is solved
blob
|
commitdiff
|
diff to current
2015-09-25
David A. Velasco
Added conflict icon to folders containing files with...
blob
|
commitdiff
|
diff to current
2015-09-25
David A. Velasco
Persist conflicts in local database and show with an...
blob
|
commitdiff
|
diff to current
2015-09-19
tobiasKaminsky
#819, part 2: Instant uploads, depends on setting
blob
|
commitdiff
|
diff to current
next