Commit graph

2008 commits

Author SHA1 Message Date
masensio
7906a9622c Clean code: remove some commented code 2014-05-08 15:58:26 +02:00
masensio
92f403494b Add RemoveOperation to OperationsService 2014-05-08 15:08:27 +02:00
masensio
ffb5702b2d Add RenameOperation to OperationsService 2014-05-08 10:39:55 +02:00
David A. Velasco
26eed9132e Fixed wrong field override breaking options menu in PreviewMediaFragment and PreviewImageFragment 2014-05-07 17:05:33 +02:00
David A. Velasco
e42fcc1e32 Merge remote-tracking branch 'origin/refactor_update_filelist_from_database' into refactor_update_filelist_from_database 2014-05-07 10:03:41 +02:00
masensio
69fa5b9185 Enable necessary refresh in FileDisplayActivity. Delete onFileStateChanged in ContainerActivity 2014-05-07 09:46:25 +02:00
David A. Velasco
3adb39a15e Review and reenable calls to refresh list of files where necessary, for events out of OnRemoteOperationListener flow 2014-05-07 09:46:20 +02:00
David A. Velasco
b86059bf83 Moved UploadFinishReceiver from FileDetailFragment to FileDisplayActivity 2014-05-06 14:07:47 +02:00
masensio
53a168c5a6 Revert "FileListListAdapter is a SimpleCursorAdapter"
This reverts commit 44dae87d2f.

Conflicts:
	src/com/owncloud/android/datamodel/FileDataStorageManager.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2014-05-06 13:28:26 +02:00
masensio
f119a13a30 Revert "Add mCursor to FileListListAdapter"
This reverts commit 85b6d7a987.

Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
2014-05-06 13:22:59 +02:00
masensio
4e9becbc97 Revert "FileListListAdapter based in CursorAdapter instead of SimpleCursorAdapter for more flexible integration"
This reverts commit 65c7d5d5ba.

Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2014-05-06 13:15:04 +02:00
masensio
f2d4ae877f Revert "Add FileListCursorLoader. Update data using CursorLoader and LoaderManager. Update filelist when a file/folder is deleted"
This reverts commit c9626772a1.

Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2014-05-06 13:04:23 +02:00
masensio
9804b40839 Revert "Update filelist for insert actions, sent notification to uri in FileContenProvider"
This reverts commit 4834fe15c7.
2014-05-06 12:56:42 +02:00
masensio
97e4d690da Revert "Update filelist for update actions, sent notification to uri in FileContenProvider"
This reverts commit 8283b301e1.
2014-05-06 12:56:19 +02:00
masensio
e5c3f2eaa5 Revert "Grant that the content of the previous adapter is updated with rotations"
This reverts commit 9820893fd9.
2014-05-06 12:55:21 +02:00
masensio
40b5fb8156 Revert commit 6cdd830a7b 2014-05-06 12:54:13 +02:00
David A. Velasco
c6edcab5a2 Merge remote-tracking branch 'origin/refactor_update_filelist_from_database' into refactor_update_filelist_from_database 2014-05-06 10:58:19 +02:00
David A. Velasco
bea36f23b0 Refactoring relationship between FileActivities and FileFragments (WIP) 2014-05-06 10:54:23 +02:00
masensio
6cdd830a7b Additional changes to apply the new code to the other FileFragments: PreviewMediaFragment, DetailsFragment, PreviewImageFragment 2014-05-05 14:10:15 +02:00
masensio
9820893fd9 Grant that the content of the previous adapter is updated with rotations 2014-05-05 10:44:43 +02:00
masensio
3e1aefb9e0 Merge branch 'develop' into refactor_update_filelist_from_database 2014-05-05 08:48:19 +02:00
Jenkins for ownCloud
20a15a8de2 [tx-robot] updated from transifex 2014-05-04 01:14:33 -04:00
Jenkins for ownCloud
7de62fe300 [tx-robot] updated from transifex 2014-05-03 01:14:34 -04:00
masensio
8283b301e1 Update filelist for update actions, sent notification to uri in FileContenProvider 2014-05-02 14:33:23 +02:00
masensio
4834fe15c7 Update filelist for insert actions, sent notification to uri in FileContenProvider 2014-05-02 14:32:01 +02:00
masensio
c9626772a1 Add FileListCursorLoader. Update data using CursorLoader and LoaderManager. Update filelist when a file/folder is deleted 2014-05-02 14:24:00 +02:00
Jenkins for ownCloud
4dbbbea943 [tx-robot] updated from transifex 2014-05-01 01:13:49 -04:00
David A. Velasco
5b32faae4d Refactoring to reduce dependencies and duplicated code (WIP) 2014-04-30 18:37:55 +02:00
Jenkins for ownCloud
9dcc5ce524 [tx-robot] updated from transifex 2014-04-30 01:13:45 -04:00
David A. Velasco
6c33cefba0 WIP - commented pull-refreshes of list view as previous step to trust refresh to observer registered by Cursor 2014-04-29 13:53:11 +02:00
David A. Velasco
65c7d5d5ba FileListListAdapter based in CursorAdapter instead of SimpleCursorAdapter for more flexible integration 2014-04-29 13:17:33 +02:00
masensio
58e65036c1 Update library reference 2014-04-29 10:44:02 +02:00
masensio
85b6d7a987 Add mCursor to FileListListAdapter 2014-04-28 13:56:17 +02:00
masensio
77ead554d4 Merge branch 'develop' into refactor_update_filelist_from_database 2014-04-28 12:10:37 +02:00
masensio
44dae87d2f FileListListAdapter is a SimpleCursorAdapter 2014-04-28 12:09:07 +02:00
Jenkins for ownCloud
05abbd857f [tx-robot] updated from transifex 2014-04-28 01:13:44 -04:00
Jenkins for ownCloud
3769851ef6 [tx-robot] updated from transifex 2014-04-26 01:13:45 -04:00
Jenkins for ownCloud
c2a523f8d1 [tx-robot] updated from transifex 2014-04-25 01:13:45 -04:00
David A. Velasco
af410430c3 Update reference to owncloud-android-library 2014-04-24 11:12:01 +02:00
Jenkins for ownCloud
6c332a15c0 [tx-robot] updated from transifex 2014-04-24 01:13:43 -04:00
Jenkins for ownCloud
1bf039dfbd [tx-robot] updated from transifex 2014-04-23 01:13:48 -04:00
Javier Gonzalez
d60ddd81a0 Merge pull request #149 from owncloud/videoInstandUploads
Issue #136  [Feature] Instant upload of videos
2014-04-22 12:47:26 +02:00
David A. Velasco
e7a6a68531 Minimized imports 2014-04-22 12:30:15 +02:00
Jenkins for ownCloud
f5b6a68b62 [tx-robot] updated from transifex 2014-04-22 01:13:43 -04:00
David A. Velasco
e2f0af1c26 Fixed lost automatic check of OC server on enforced update of password 2014-04-21 14:49:00 +02:00
David A. Velasco
37b44a551a Fixed crash when browsing app from instantUploads folder after entering into the app from a notification 2014-04-21 14:27:06 +02:00
David A. Velasco
68f4ceb5a7 Separate options to enable & disable instant upload of new pictures and new videos 2014-04-21 10:49:31 +02:00
Jenkins for ownCloud
780c7e89a0 [tx-robot] updated from transifex 2014-04-21 01:14:57 -04:00
Jenkins for ownCloud
cc95c1321b [tx-robot] updated from transifex 2014-04-20 01:14:56 -04:00
David A. Velasco
ffdc77f8d8 Fixed crash when clicking on an error notification due to wrong credentials 2014-04-16 20:13:35 +02:00