Peters Git server - pub/Android/ownCloud.git/history - src/com/owncloud/android/datamodel/FileDataStorageManager.java

projects / pub / Android / ownCloud.git / history

[pub/Android/ownCloud.git] / src / com / owncloud / android / datamodel / FileDataStorageManager.java

2015-11-13	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/descendI...	blob \| commitdiff
2015-11-13	tobiasKaminsky	Merge remote-tracking branch 'remotes/upstream/master...	blob \| commitdiff
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-06	tobiasKaminsky	Merge branch 'setAsWallpaper' into beta	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	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
2015-09-09	masensio	Merge pull request #1124 from Kernald/new-filetype...	blob \| commitdiff \| diff to current
2015-09-07	Andy Scherzinger	Merge branch 'new-filetype-icons' of https://github...	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	Andy Scherzinger	Merge branch 'material_buttons' of https://github.com...	blob \| commitdiff \| diff to current
2015-09-04	Andy Scherzinger	Merge branch 'master' of https://github.com/owncloud...	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-09-01	masensio	Merge branch 'develop' into uploadWhenCharging	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-14	tobiasKaminsky	Merge remote-tracking branch 'upstream/video_thumbnail...	blob \| commitdiff \| diff to current
2015-08-10	Andy Scherzinger	Merge branch 'master' of https://github.com/owncloud...	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	tobiasKaminsky	Merge remote-tracking branch 'upstream/develop' into...	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-07-01	tobiasKaminsky	Merge remote-tracking branch 'upstream/develop' into...	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
next

ownCloud Android App

RSS Atom