masensio [Fri, 13 Feb 2015 14:16:58 +0000 (15:16 +0100)]
Merge branch 'develop' into cancel_transfer_for_deleted_users
Jenkins for ownCloud [Fri, 13 Feb 2015 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 12 Feb 2015 06:13:31 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 11 Feb 2015 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 10 Feb 2015 06:13:32 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 9 Feb 2015 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 8 Feb 2015 06:13:31 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 7 Feb 2015 06:13:34 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 6 Feb 2015 06:13:31 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
masensio [Thu, 5 Feb 2015 08:40:09 +0000 (09:40 +0100)]
Cancel the transfers of an account when the account is deleted: Cancel current upload
Jenkins for ownCloud [Thu, 5 Feb 2015 06:13:34 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
masensio [Wed, 4 Feb 2015 17:38:11 +0000 (18:38 +0100)]
Cancel the transfers of an account when the account is deleted, part 1
Jenkins for ownCloud [Wed, 4 Feb 2015 06:14:14 +0000 (01:14 -0500)]
[tx-robot] updated from transifex
masensio [Tue, 3 Feb 2015 10:25:09 +0000 (11:25 +0100)]
Merge branch 'develop' into cancel_transfer_for_deleted_users
David A. Velasco [Tue, 3 Feb 2015 10:04:32 +0000 (11:04 +0100)]
Merge pull request #731 from owncloud/imageGrid
Automatic grid more in folders with more than 50% of image files.
David A. Velasco [Tue, 3 Feb 2015 08:52:22 +0000 (09:52 +0100)]
Corrections from my own comments
masensio [Mon, 2 Feb 2015 13:51:46 +0000 (14:51 +0100)]
Cancel transfers of an account when it detects that the account doesn't exist
David A. Velasco [Mon, 2 Feb 2015 12:48:30 +0000 (13:48 +0100)]
Merge branch 'develop' into imageGrid
masensio [Mon, 2 Feb 2015 12:23:33 +0000 (13:23 +0100)]
Detect if the account exists before the tranfer starts
David A. Velasco [Mon, 2 Feb 2015 08:39:40 +0000 (09:39 +0100)]
Merge pull request #844 from owncloud/delete_local_files
Removal of media files is notified to MediaProvider directly - MediaScan API does not work properly in Android 4.x
masensio [Mon, 2 Feb 2015 08:34:43 +0000 (09:34 +0100)]
Changes from comments in PR 844
Jenkins for ownCloud [Sun, 1 Feb 2015 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 31 Jan 2015 06:13:34 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
masensio [Fri, 30 Jan 2015 13:37:16 +0000 (14:37 +0100)]
Update some icons
masensio [Fri, 30 Jan 2015 10:00:14 +0000 (11:00 +0100)]
Update some icons
Jenkins for ownCloud [Fri, 30 Jan 2015 06:13:31 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
masensio [Thu, 29 Jan 2015 10:22:47 +0000 (11:22 +0100)]
Fix bug: When renaming a folder, in the photos apps both folder are shown
Jenkins for ownCloud [Thu, 29 Jan 2015 06:13:38 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
masensio [Wed, 28 Jan 2015 09:37:08 +0000 (10:37 +0100)]
Merge branch 'develop' into delete_local_files
David A. Velasco [Wed, 28 Jan 2015 08:40:59 +0000 (09:40 +0100)]
Removed commented code
masensio [Wed, 28 Jan 2015 08:31:25 +0000 (09:31 +0100)]
Merge pull request #866 from owncloud/download_folder
Download a folder
masensio [Wed, 28 Jan 2015 07:59:57 +0000 (08:59 +0100)]
Recover badges: show status icons in grid View ( favoriteIcon, localFileIndicator, shareIcon and shareWithMeIcon
Jenkins for ownCloud [Wed, 28 Jan 2015 06:13:45 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Carla Schroder [Wed, 28 Jan 2015 00:35:45 +0000 (16:35 -0800)]
Update version number
Daniel Molkentin [Tue, 27 Jan 2015 22:41:33 +0000 (23:41 +0100)]
user manual: Fix incorrect line wrapping in config file
Daniel Molkentin [Tue, 27 Jan 2015 22:40:53 +0000 (23:40 +0100)]
Add means to build user manual via make
Daniel Molkentin [Tue, 27 Jan 2015 22:29:49 +0000 (23:29 +0100)]
manual: omit ocdoc/* during doc generation
Carla Schroder [Tue, 27 Jan 2015 20:11:26 +0000 (12:11 -0800)]
add submodule to user manual
Carla Schroder [Tue, 27 Jan 2015 20:07:43 +0000 (12:07 -0800)]
Add Android app manual to develop branch, and Allow building manual in owncloud themes
masensio [Tue, 27 Jan 2015 13:31:44 +0000 (14:31 +0100)]
Fix bug: audio are not refreshed when delete them from the app
masensio [Tue, 27 Jan 2015 12:51:44 +0000 (13:51 +0100)]
Show status icons in gridview
David A. Velasco [Tue, 27 Jan 2015 12:50:14 +0000 (13:50 +0100)]
Fixed download of folder after updating credentials in the app
masensio [Tue, 27 Jan 2015 08:46:19 +0000 (09:46 +0100)]
Add share icons and localFileIndicator to grid_image and grid_item layout
masensio [Mon, 26 Jan 2015 14:15:00 +0000 (15:15 +0100)]
Fix bug (Media Scan) Files are not refreshed when delete from the app)
David A. Velasco [Mon, 26 Jan 2015 12:37:46 +0000 (13:37 +0100)]
Commented excess of logs
David A. Velasco [Mon, 26 Jan 2015 12:32:54 +0000 (13:32 +0100)]
Fixed cancellation of SynchronizeOperationFolder
masensio [Mon, 26 Jan 2015 12:09:07 +0000 (13:09 +0100)]
Fix bug: Footer is not shown correct in the grid view
David A. Velasco [Mon, 26 Jan 2015 08:42:44 +0000 (09:42 +0100)]
Added indexed tree of synchronizing folders to SyncFolderHandler
Jenkins for ownCloud [Mon, 26 Jan 2015 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Fri, 23 Jan 2015 08:34:45 +0000 (09:34 +0100)]
Refactored SyncFolderHandler out of OperationsService
jabarros [Fri, 23 Jan 2015 08:29:11 +0000 (09:29 +0100)]
Merge pull request #825 from owncloud/SettingsGreyedOut
Instant Upload settings hide/show
David A. Velasco [Thu, 22 Jan 2015 21:15:08 +0000 (22:15 +0100)]
Minimize refresh of list of files on reception of events from FileDownloader
David A. Velasco [Thu, 22 Jan 2015 19:01:25 +0000 (20:01 +0100)]
Added cancelation for subtrees
David A. Velasco [Thu, 22 Jan 2015 16:06:09 +0000 (17:06 +0100)]
Added indexed tree of folders downloading anything
jabarros [Thu, 22 Jan 2015 12:49:31 +0000 (13:49 +0100)]
'Fixed. 'Upload pictures via WIFI only' is hidden when going to files and come back to settings
jabarros [Thu, 22 Jan 2015 12:14:57 +0000 (13:14 +0100)]
Fixed. Some message dissapear from list view as 'loading' and 'nothing in here...'
jabarros [Thu, 22 Jan 2015 08:29:36 +0000 (09:29 +0100)]
Fixed. Line behind the folder is not shown in the upload view
jabarros [Wed, 21 Jan 2015 17:03:55 +0000 (18:03 +0100)]
Fixed. Remove size from folders in the Upload view
David A. Velasco [Wed, 21 Jan 2015 17:14:45 +0000 (18:14 +0100)]
Merge pull request #858 from owncloud/imageGrid_footer
Fixed. Footer message should be showed in the list view mode. Also added...
jabarros [Wed, 21 Jan 2015 16:51:16 +0000 (17:51 +0100)]
Move GridViewWithHeaderAndFooter class to third_parties/in/srain/cube/
jabarros [Wed, 21 Jan 2015 12:06:00 +0000 (13:06 +0100)]
Merge branch 'imageGrid' into imageGrid_footer
jabarros [Wed, 21 Jan 2015 11:37:28 +0000 (12:37 +0100)]
Fixed. Size of the folders is shown in the file list when it should not
jabarros [Wed, 21 Jan 2015 11:15:52 +0000 (12:15 +0100)]
Fixed. App crashes when accessing to some folders in upload view
jabarros [Wed, 21 Jan 2015 10:08:15 +0000 (11:08 +0100)]
Fixed. Footer message should be showed in the list view mode. Also added in grid view mode.
Jenkins for ownCloud [Wed, 21 Jan 2015 06:13:32 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Tue, 20 Jan 2015 13:38:32 +0000 (14:38 +0100)]
Fix. Uploads view is not shown correctly
David A. Velasco [Tue, 20 Jan 2015 12:07:50 +0000 (13:07 +0100)]
Merge pull request #851 from owncloud/download_folder_update_database
Download folder update database
jabarros [Tue, 20 Jan 2015 12:00:37 +0000 (13:00 +0100)]
Update unsuccessful downloaded file
jabarros [Tue, 20 Jan 2015 11:42:27 +0000 (12:42 +0100)]
Merge branch 'download_folder__refactoring_observance_of_downloads_in_progress' into download_folder_update_database
jabarros [Tue, 20 Jan 2015 11:27:40 +0000 (12:27 +0100)]
Store file on db with 'downloading' state after adding it to pending downloads
David A. Velasco [Tue, 20 Jan 2015 10:28:36 +0000 (11:28 +0100)]
Revert changes for files uploading
jabarros [Tue, 20 Jan 2015 10:07:44 +0000 (11:07 +0100)]
Remove is_uploading field from database
jabarros [Tue, 20 Jan 2015 09:43:39 +0000 (10:43 +0100)]
Add Scrollview in list fragment layout for showing text message
jabarros [Tue, 20 Jan 2015 08:59:34 +0000 (09:59 +0100)]
Update android library reference
jabarros [Tue, 20 Jan 2015 08:56:45 +0000 (09:56 +0100)]
Merge branch 'develop' into imageGrid
David A. Velasco [Mon, 19 Jan 2015 12:39:32 +0000 (13:39 +0100)]
Removed call to methods to check transfer state of files through binders and replaced with methods on OCFile
jabarros [Tue, 20 Jan 2015 08:25:20 +0000 (09:25 +0100)]
Merge branch 'develop' into SettingsGreyedOut
Jenkins for ownCloud [Tue, 20 Jan 2015 06:13:34 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Mon, 19 Jan 2015 21:24:33 +0000 (22:24 +0100)]
Merge branches 'develop' and 'imageGrid' of github.com:owncloud/android into imageGrid2
Conflicts:
gradle/wrapper/gradle-wrapper.properties
owncloud-android-library
tobiasKaminsky [Mon, 19 Jan 2015 21:13:45 +0000 (22:13 +0100)]
changes as requested
tobiasKaminsky [Mon, 19 Jan 2015 21:10:29 +0000 (22:10 +0100)]
rebased
footer view disabled due to GridView does not support it
tobiasKaminsky [Mon, 19 Jan 2015 20:02:37 +0000 (21:02 +0100)]
Merge branch 'develop2' into imageGrid2
Conflicts:
owncloud-android-library
res/layout/list_fragment.xml
res/values-fr/strings.xml
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
jabarros [Mon, 19 Jan 2015 13:41:34 +0000 (14:41 +0100)]
Increase db number and added getters and setter for new 'uploading' and 'downloading' fields in OCFile
David A. Velasco [Mon, 19 Jan 2015 12:44:30 +0000 (13:44 +0100)]
Merge pull request #798 from LukeOwncloud/develop
On downgrading upload db, delete and re-create
jabarros [Mon, 19 Jan 2015 12:10:21 +0000 (13:10 +0100)]
Added uploading and downloading fields into filelist table
jabarros [Mon, 19 Jan 2015 11:49:28 +0000 (12:49 +0100)]
Merge branch 'develop' into download_folder
David A. Velasco [Mon, 19 Jan 2015 10:29:43 +0000 (11:29 +0100)]
Updated library reference
jabarros [Mon, 19 Jan 2015 10:03:05 +0000 (11:03 +0100)]
Merge branch 'develop' into delete_local_files
jabarros [Mon, 19 Jan 2015 09:44:51 +0000 (10:44 +0100)]
Merge pull request #843 from owncloud/update_Android_Gradle_plug_in
Updated Android Gradle plug-in for compatibility with Android Studio 1.0...
jabarros [Mon, 19 Jan 2015 09:39:23 +0000 (10:39 +0100)]
Trigger Media Scan on parent folder when deleting a file or a folder from locally
David A. Velasco [Mon, 19 Jan 2015 08:58:06 +0000 (09:58 +0100)]
Updated Android Gradle plug-in for compatibility with Android Studio 1.0+
Jenkins for ownCloud [Mon, 19 Jan 2015 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Sun, 18 Jan 2015 16:00:29 +0000 (17:00 +0100)]
Merge branch 'develop2' into imageGrid2
Conflicts:
owncloud-android-library
res/layout/list_fragment.xml
res/values-fr/strings.xml
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
Jenkins for ownCloud [Sun, 18 Jan 2015 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 17 Jan 2015 06:13:31 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 15 Jan 2015 06:13:33 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Wed, 14 Jan 2015 07:25:04 +0000 (08:25 +0100)]
Merge pull request #746 from owncloud/thumbnailForUpload
Thumbnails added to Upload activity
Jenkins for ownCloud [Wed, 14 Jan 2015 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Tue, 13 Jan 2015 19:07:43 +0000 (20:07 +0100)]
Move every sendBroadcast from SynchronizeFolderOperation to SyncFolderHandler scope
Jenkins for ownCloud [Tue, 13 Jan 2015 06:13:31 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
projects / pub / Android / ownCloud.git / log