masensio [Fri, 9 May 2014 06:21:48 +0000 (08:21 +0200)]
Merge branch 'develop' into refactor_update_filelist_from_database
Jenkins for ownCloud [Fri, 9 May 2014 05:14:31 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
masensio [Thu, 8 May 2014 15:13:45 +0000 (17:13 +0200)]
Add CreateFolderOperation to OperationsService
David A. Velasco [Thu, 8 May 2014 14:41:16 +0000 (16:41 +0200)]
Removed unneeded casts to FileDisplayActivity
David A. Velasco [Thu, 8 May 2014 14:35:34 +0000 (16:35 +0200)]
Refactored menu filtering in a single class FileMenuFilter
masensio [Thu, 8 May 2014 13:58:26 +0000 (15:58 +0200)]
Clean code: remove some commented code
masensio [Thu, 8 May 2014 13:08:27 +0000 (15:08 +0200)]
Add RemoveOperation to OperationsService
masensio [Thu, 8 May 2014 08:39:55 +0000 (10:39 +0200)]
Add RenameOperation to OperationsService
Jenkins for ownCloud [Thu, 8 May 2014 05:14:30 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Wed, 7 May 2014 15:05:33 +0000 (17:05 +0200)]
Fixed wrong field override breaking options menu in PreviewMediaFragment and PreviewImageFragment
David A. Velasco [Wed, 7 May 2014 08:03:41 +0000 (10:03 +0200)]
Merge remote-tracking branch 'origin/refactor_update_filelist_from_database' into refactor_update_filelist_from_database
masensio [Wed, 7 May 2014 07:46:25 +0000 (09:46 +0200)]
Enable necessary refresh in FileDisplayActivity. Delete onFileStateChanged in ContainerActivity
David A. Velasco [Wed, 7 May 2014 07:46:20 +0000 (09:46 +0200)]
Review and reenable calls to refresh list of files where necessary, for events out of OnRemoteOperationListener flow
Jenkins for ownCloud [Wed, 7 May 2014 05:14:31 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Tue, 6 May 2014 12:07:47 +0000 (14:07 +0200)]
Moved UploadFinishReceiver from FileDetailFragment to FileDisplayActivity
masensio [Tue, 6 May 2014 11:28:26 +0000 (13:28 +0200)]
Revert "FileListListAdapter is a SimpleCursorAdapter"
This reverts commit
44dae87d2f5610108f87018dfa86e01cfc89c259.
Conflicts:
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
masensio [Tue, 6 May 2014 11:22:59 +0000 (13:22 +0200)]
Revert "Add mCursor to FileListListAdapter"
This reverts commit
85b6d7a9870ab0be7512e2a2852ffddb01f27cc0.
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
masensio [Tue, 6 May 2014 11:15:04 +0000 (13:15 +0200)]
Revert "FileListListAdapter based in CursorAdapter instead of SimpleCursorAdapter for more flexible integration"
This reverts commit
65c7d5d5baf3455d02b4a7d9352fcd42d939c669.
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
masensio [Tue, 6 May 2014 11:04:23 +0000 (13:04 +0200)]
Revert "Add FileListCursorLoader. Update data using CursorLoader and LoaderManager. Update filelist when a file/folder is deleted"
This reverts commit
c9626772a19c0f5631ae5b58c09dda39d0baa878.
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
masensio [Tue, 6 May 2014 10:56:42 +0000 (12:56 +0200)]
Revert "Update filelist for insert actions, sent notification to uri in FileContenProvider"
This reverts commit
4834fe15c72bf893441e9d370dc2db4559ce35ac.
masensio [Tue, 6 May 2014 10:56:19 +0000 (12:56 +0200)]
Revert "Update filelist for update actions, sent notification to uri in FileContenProvider"
This reverts commit
8283b301e1ebeafd8f157a54517d4a2cc194f5bd.
masensio [Tue, 6 May 2014 10:55:21 +0000 (12:55 +0200)]
Revert "Grant that the content of the previous adapter is updated with rotations"
This reverts commit
9820893fd91b627fe51b4f61f3b9ebe8dc783a3c.
masensio [Tue, 6 May 2014 10:54:13 +0000 (12:54 +0200)]
David A. Velasco [Tue, 6 May 2014 08:58:19 +0000 (10:58 +0200)]
Merge remote-tracking branch 'origin/refactor_update_filelist_from_database' into refactor_update_filelist_from_database
David A. Velasco [Tue, 6 May 2014 08:54:23 +0000 (10:54 +0200)]
Refactoring relationship between FileActivities and FileFragments (WIP)
masensio [Mon, 5 May 2014 12:10:15 +0000 (14:10 +0200)]
Additional changes to apply the new code to the other FileFragments: PreviewMediaFragment, DetailsFragment, PreviewImageFragment
masensio [Mon, 5 May 2014 08:44:43 +0000 (10:44 +0200)]
Grant that the content of the previous adapter is updated with rotations
masensio [Mon, 5 May 2014 06:48:19 +0000 (08:48 +0200)]
Merge branch 'develop' into refactor_update_filelist_from_database
Jenkins for ownCloud [Sun, 4 May 2014 05:14:33 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 3 May 2014 05:14:34 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
masensio [Fri, 2 May 2014 12:33:23 +0000 (14:33 +0200)]
Update filelist for update actions, sent notification to uri in FileContenProvider
masensio [Fri, 2 May 2014 12:32:01 +0000 (14:32 +0200)]
Update filelist for insert actions, sent notification to uri in FileContenProvider
masensio [Fri, 2 May 2014 12:24:00 +0000 (14:24 +0200)]
Add FileListCursorLoader. Update data using CursorLoader and LoaderManager. Update filelist when a file/folder is deleted
Jenkins for ownCloud [Thu, 1 May 2014 05:13:49 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Wed, 30 Apr 2014 16:37:55 +0000 (18:37 +0200)]
Refactoring to reduce dependencies and duplicated code (WIP)
Jenkins for ownCloud [Wed, 30 Apr 2014 05:13:45 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Tue, 29 Apr 2014 11:53:11 +0000 (13:53 +0200)]
WIP - commented pull-refreshes of list view as previous step to trust refresh to observer registered by Cursor
David A. Velasco [Tue, 29 Apr 2014 11:17:33 +0000 (13:17 +0200)]
FileListListAdapter based in CursorAdapter instead of SimpleCursorAdapter for more flexible integration
masensio [Tue, 29 Apr 2014 08:44:02 +0000 (10:44 +0200)]
Update library reference
masensio [Mon, 28 Apr 2014 11:56:17 +0000 (13:56 +0200)]
Add mCursor to FileListListAdapter
masensio [Mon, 28 Apr 2014 10:10:37 +0000 (12:10 +0200)]
Merge branch 'develop' into refactor_update_filelist_from_database
masensio [Mon, 28 Apr 2014 10:09:07 +0000 (12:09 +0200)]
FileListListAdapter is a SimpleCursorAdapter
Jenkins for ownCloud [Mon, 28 Apr 2014 05:13:44 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 26 Apr 2014 05:13:45 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 25 Apr 2014 05:13:45 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Thu, 24 Apr 2014 09:12:01 +0000 (11:12 +0200)]
Update reference to owncloud-android-library
Jenkins for ownCloud [Thu, 24 Apr 2014 05:13:43 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 23 Apr 2014 05:13:48 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Javier Gonzalez [Tue, 22 Apr 2014 10:47:26 +0000 (12:47 +0200)]
Merge pull request #149 from owncloud/videoInstandUploads
Issue #136 [Feature] Instant upload of videos
David A. Velasco [Tue, 22 Apr 2014 10:30:15 +0000 (12:30 +0200)]
Minimized imports
Jenkins for ownCloud [Tue, 22 Apr 2014 05:13:43 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Mon, 21 Apr 2014 12:49:00 +0000 (14:49 +0200)]
Fixed lost automatic check of OC server on enforced update of password
David A. Velasco [Mon, 21 Apr 2014 12:27:06 +0000 (14:27 +0200)]
Fixed crash when browsing app from instantUploads folder after entering into the app from a notification
David A. Velasco [Mon, 21 Apr 2014 08:49:31 +0000 (10:49 +0200)]
Separate options to enable & disable instant upload of new pictures and new videos
Jenkins for ownCloud [Mon, 21 Apr 2014 05:14:57 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 20 Apr 2014 05:14:56 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Wed, 16 Apr 2014 18:13:35 +0000 (20:13 +0200)]
Fixed crash when clicking on an error notification due to wrong credentials
David A. Velasco [Wed, 16 Apr 2014 17:31:27 +0000 (19:31 +0200)]
Merge branch 'develop' into videoInstandUploads
David A. Velasco [Wed, 16 Apr 2014 17:30:01 +0000 (19:30 +0200)]
Allow instant upload of new videos although not using Wi-Fi, with the same policy as pictures
David A. Velasco [Wed, 16 Apr 2014 16:39:28 +0000 (18:39 +0200)]
Merge pull request #456 from owncloud/fixing_travis
Fixing builds in Travis - last version of android-sdk-installer is failing when updating the SDK; older version is working
David A. Velasco [Wed, 16 Apr 2014 16:37:52 +0000 (18:37 +0200)]
Merge pull request #463 from owncloud/save_position_in_scroll_when_browsing
Save position in scroll when browsing through the list of files
Mr. Jenkins [Wed, 16 Apr 2014 05:15:02 +0000 (01:15 -0400)]
[tx-robot] updated from transifex
Mr. Jenkins [Mon, 14 Apr 2014 05:14:06 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
Mr. Jenkins [Sun, 13 Apr 2014 05:14:05 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
Mr. Jenkins [Fri, 11 Apr 2014 05:14:08 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
masensio [Thu, 10 Apr 2014 07:01:52 +0000 (09:01 +0200)]
Merge branch 'develop' into save_position_in_scroll_when_browsing
Mr. Jenkins [Thu, 10 Apr 2014 05:14:08 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
masensio [Wed, 9 Apr 2014 15:37:57 +0000 (17:37 +0200)]
Fix bug: When accessing an coming back several times, the folder is hidden
masensio [Wed, 9 Apr 2014 08:11:54 +0000 (10:11 +0200)]
Merge branch 'develop' into save_position_in_scroll_when_browsing
masensio [Wed, 9 Apr 2014 06:42:30 +0000 (08:42 +0200)]
Merge branch 'develop' into videoInstandUploads
Mr. Jenkins [Wed, 9 Apr 2014 05:14:36 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
masensio [Tue, 8 Apr 2014 12:58:41 +0000 (14:58 +0200)]
Add some comments for VideoInstantUploads
masensio [Tue, 8 Apr 2014 11:58:27 +0000 (13:58 +0200)]
Fix bug: App crashes when coming back from a folder of second level
masensio [Tue, 8 Apr 2014 11:02:59 +0000 (13:02 +0200)]
Grant InstantUpload feature works as before.
masensio [Tue, 8 Apr 2014 10:50:50 +0000 (12:50 +0200)]
Merge branch 'develop' into videoInstandUploads
David A. Velasco [Tue, 8 Apr 2014 10:31:44 +0000 (12:31 +0200)]
Merge branch 'develop' into fixing_travis
masensio [Tue, 8 Apr 2014 09:28:50 +0000 (11:28 +0200)]
Merge branch 'develop' into save_position_in_scroll_when_browsing
masensio [Tue, 8 Apr 2014 09:27:44 +0000 (11:27 +0200)]
Fix bug: folder is not shown after accessing to it and coming back
Mr. Jenkins [Tue, 8 Apr 2014 08:59:00 +0000 (04:59 -0400)]
[tx-robot] updated from transifex
masensio [Tue, 8 Apr 2014 07:29:47 +0000 (09:29 +0200)]
Merge branch 'develop' into save_position_in_scroll_when_browsing
David A. Velasco [Tue, 8 Apr 2014 07:23:29 +0000 (09:23 +0200)]
Merge remote-tracking branch 'origin/fixing_travis' into fixing_travis
David A. Velasco [Mon, 7 Apr 2014 12:17:14 +0000 (14:17 +0200)]
Trying older version of android-sdk-installer
David A. Velasco [Mon, 7 Apr 2014 09:46:00 +0000 (11:46 +0200)]
Updated travis script according to update instructions of android-sdk-installer
masensio [Tue, 8 Apr 2014 07:17:47 +0000 (09:17 +0200)]
Merge pull request #458 from owncloud/operations_service
Operations started by AuthenticatorActivity are run in OperationsService, and end of operations is granted to be dispatched.
Mr. Jenkins [Tue, 8 Apr 2014 05:15:33 +0000 (01:15 -0400)]
[tx-robot] updated from transifex
masensio [Mon, 7 Apr 2014 13:21:21 +0000 (15:21 +0200)]
Disable extra logs
David A. Velasco [Mon, 7 Apr 2014 12:17:14 +0000 (14:17 +0200)]
Trying older version of android-sdk-installer
David A. Velasco [Mon, 7 Apr 2014 12:09:43 +0000 (14:09 +0200)]
Fixed broken life cicle in FileActivity
David A. Velasco [Mon, 7 Apr 2014 09:46:00 +0000 (11:46 +0200)]
Updated travis script according to update instructions of android-sdk-installer
David A. Velasco [Mon, 7 Apr 2014 09:14:44 +0000 (11:14 +0200)]
Removed commented code and remaining forced exception
David A. Velasco [Mon, 7 Apr 2014 08:24:43 +0000 (10:24 +0200)]
Recovered some extra logs before validating
David A. Velasco [Mon, 7 Apr 2014 08:22:08 +0000 (10:22 +0200)]
Preventing hash colisions in identifier of operations
David A. Velasco [Mon, 7 Apr 2014 07:24:57 +0000 (09:24 +0200)]
Simplified interface to request 'lost results' during rotation of Activity
masensio [Mon, 7 Apr 2014 06:58:42 +0000 (08:58 +0200)]
Merge branch 'develop' into save_position_in_scroll_when_browsing
masensio [Mon, 7 Apr 2014 06:49:01 +0000 (08:49 +0200)]
Merge branch 'develop' into operations_service
Mr. Jenkins [Mon, 7 Apr 2014 05:15:11 +0000 (01:15 -0400)]
[tx-robot] updated from transifex
Mr. Jenkins [Sun, 6 Apr 2014 05:15:09 +0000 (01:15 -0400)]
[tx-robot] updated from transifex
Mr. Jenkins [Sat, 5 Apr 2014 05:15:10 +0000 (01:15 -0400)]
[tx-robot] updated from transifex
masensio [Fri, 4 Apr 2014 13:05:21 +0000 (15:05 +0200)]
Enable extra logs before validation to fix easily any possible bug
masensio [Fri, 4 Apr 2014 12:50:46 +0000 (14:50 +0200)]
Merge remote-tracking branch 'origin/operations_service' into operations_service
projects / pub / Android / ownCloud.git / log