projects
/
pub
/
Android
/
ownCloud.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Sync user and group shares into database
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
datamodel
/
FileDataStorageManager.java
2015-10-30
David A. Velasco
Sync user and group shares into database
blob
|
commitdiff
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-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-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
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-09
masensio
Merge pull request #1124 from Kernald/new-filetype...
blob
|
commitdiff
|
diff to current
2015-09-04
masensio
Merge branch 'master' into text_file_preview_pr_707_wit...
blob
|
commitdiff
|
diff to current
2015-09-04
masensio
Merge pull request #1102 from owncloud/copy
blob
|
commitdiff
|
diff to current
2015-09-01
David A. Velasco
Merge branch 'master' into copy
blob
|
commitdiff
|
diff to current
2015-08-21
tobiasKaminsky
Merge branch 'develop' of github.com:owncloud/android...
blob
|
commitdiff
|
diff to current
2015-08-18
Jorge Antonio Diaz...
Removes a static modifier that sneaked in
blob
|
commitdiff
|
diff to current
2015-08-18
Jorge Antonio Diaz...
Added copy action
blob
|
commitdiff
|
diff to current
2015-08-18
Jorge Antonio Diaz...
Added copy action
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-07-06
masensio
Merge branch 'release-1.7.2'
blob
|
commitdiff
|
diff to current
2015-06-22
David A. Velasco
Merge branch 'master' into develop
blob
|
commitdiff
|
diff to current
2015-06-15
masensio
Merge branch 'develop' into forbidden_characters_from_s...
blob
|
commitdiff
|
diff to current
2015-06-15
masensio
Merge pull request #995 from owncloud/navigationDrawer_...
blob
|
commitdiff
|
diff to current
2015-06-15
masensio
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
diff to current
2015-06-15
David A. Velasco
Merge branch 'develop' into navigationDrawer_basic
blob
|
commitdiff
|
diff to current
2015-05-27
tobiasKaminsky
Merge branch 'navigationDrawer_update' of github.com...
blob
|
commitdiff
|
diff to current
2015-05-27
masensio
Merge branch 'remove_ActionBarSherlock' into navigation...
blob
|
commitdiff
|
diff to current
2015-05-25
masensio
Disable On Device option in Navigation Drawer
blob
|
commitdiff
|
diff to current
2015-05-21
tobiasKaminsky
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
diff to current
2015-05-05
masensio
Merge branch 'develop' into thumbnailOOM
blob
|
commitdiff
|
diff to current
2015-05-04
purigarcia
Merge branch 'develop' into automationTest
blob
|
commitdiff
|
diff to current
2015-04-28
David A. Velasco
Merge branch 'develop' into pinEnhancement
blob
|
commitdiff
|
diff to current
2015-04-22
David A. Velasco
Merge pull request #957 from owncloud/fix_crash_invalid...
blob
|
commitdiff
|
diff to current
2015-04-22
David A. Velasco
Merge pull request #951 from owncloud/loging_different_...
blob
|
commitdiff
|
diff to current
2015-04-22
David A. Velasco
Fixes after CR
blob
|
commitdiff
|
diff to current
2015-04-22
David A. Velasco
Merge branch 'develop' into loging_different_servers_sa...
blob
|
commitdiff
|
diff to current
2015-04-15
masensio
Update downloaded files
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-16
masensio
Merge branch 'develop' into create_folder_during_upload...
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-02-03
David A. Velasco
Merge branch 'master' into release-1.7.0
blob
|
commitdiff
|
diff to current
2015-02-02
David A. Velasco
Merge branch 'develop' into imageGrid
blob
|
commitdiff
|
diff to current
2015-02-02
David A. Velasco
Merge pull request #844 from owncloud/delete_local_files
blob
|
commitdiff
|
diff to current
2015-02-02
masensio
Changes from comments in PR 844
blob
|
commitdiff
|
diff to current
2015-01-30
masensio
Merge commit 'refs/pr/701' into create_folder_during_up...
blob
|
commitdiff
|
diff to current
2015-01-29
masensio
Fix bug: When renaming a folder, in the photos apps...
blob
|
commitdiff
|
diff to current
2015-01-28
masensio
Merge branch 'develop' into delete_local_files
blob
|
commitdiff
|
diff to current
2015-01-28
masensio
Merge pull request #866 from owncloud/download_folder
blob
|
commitdiff
|
diff to current
2015-01-27
masensio
Fix bug: audio are not refreshed when delete them from...
blob
|
commitdiff
|
diff to current
2015-01-26
masensio
Fix bug (Media Scan) Files are not refreshed when delet...
blob
|
commitdiff
|
diff to current
2015-01-20
David A. Velasco
Merge pull request #851 from owncloud/download_folder_u...
blob
|
commitdiff
|
diff to current
2015-01-20
jabarros
Merge branch 'download_folder__refactoring_observance_o...
blob
|
commitdiff
|
diff to current
2015-01-20
jabarros
Remove is_uploading field from database
blob
|
commitdiff
|
diff to current
2015-01-19
jabarros
Increase db number and added getters and setter for...
blob
|
commitdiff
|
diff to current
2015-01-19
jabarros
Merge branch 'develop' into delete_local_files
blob
|
commitdiff
|
diff to current
2015-01-19
jabarros
Trigger Media Scan on parent folder when deleting a...
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
2015-01-05
tobiasKaminsky
update
blob
|
commitdiff
|
diff to current
2014-12-26
jabarros
Merge branch 'develop' into obeySortOrder_fixmerge
blob
|
commitdiff
|
diff to current
2014-12-26
jabarros
Merge pull request #755 from owncloud/OpenWithInContextMenu
blob
|
commitdiff
|
diff to current
2014-12-19
jabarros
Merge branch 'develop' into thumbnailForUpload
blob
|
commitdiff
|
diff to current
2014-12-12
jabarros
Merge pull request #766 from owncloud/feedbackWithVersi...
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-10
jabarros
Merge pull request #754 from owncloud/RadioListOnAccounts
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-05
Sam
Merge branch 'develop' of https://github.com/owncloud...
blob
|
commitdiff
|
diff to current
2014-12-03
Jorge Antonio Diaz...
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
diff to current
2014-12-03
David A. Velasco
Merge branch 'master' into develop
blob
|
commitdiff
|
diff to current
2014-12-03
jabarros
Merge pull request #773 from owncloud/triggerMediaScan
blob
|
commitdiff
|
diff to current
2014-12-03
David A. Velasco
Removed empty method, and some unused imports
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-12-02
David A. Velasco
Trigger MediaScan for every downloaded file in a rename...
blob
|
commitdiff
|
diff to current
2014-12-02
David A. Velasco
Refactoring: removed old FileDataStorageManager#moveFol...
blob
|
commitdiff
|
diff to current
2014-12-02
David A. Velasco
Bug fixed (and some refactoring): crash on local remova...
blob
|
commitdiff
|
diff to current
2014-12-02
David A. Velasco
Refactoring: move all the intents for MediaScanner...
blob
|
commitdiff
|
diff to current
2014-12-02
David A. Velasco
Refactoring: get MediaScan trigger out of OCFile for...
blob
|
commitdiff
|
diff to current
2014-12-02
jabarros
Merge pull request #662 from tobiasKaminsky/fileCount
blob
|
commitdiff
|
diff to current
2014-11-29
tobiasKaminsky
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
diff to current
2014-11-29
tobiasKaminsky
- trigger mediaScan when files are deleted remote
blob
|
commitdiff
|
diff to current
2014-11-29
tobiasKaminsky
- trigger works when moving files
blob
|
commitdiff
|
diff to current
2014-11-28
jabarros
Merge pull request #661 from owncloudChalmers/gradleWit...
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
next