masensio [Tue, 20 Oct 2015 13:10:40 +0000 (15:10 +0200)]
Use UnshareOperation instead an AsyncTask, for unshare with
masensio [Tue, 20 Oct 2015 11:36:09 +0000 (13:36 +0200)]
Adapt UnshareLinkOperation to support also ShareType: USER or GROUP. UnshareLinkOperation --> UnshareOperation
David A. Velasco [Tue, 20 Oct 2015 11:19:23 +0000 (13:19 +0200)]
Removed option to refine suggestions in edit field
David A. Velasco [Tue, 20 Oct 2015 11:18:47 +0000 (13:18 +0200)]
Grant that any suggestion may be selected without software keyboard overlapping
masensio [Tue, 20 Oct 2015 10:31:12 +0000 (12:31 +0200)]
Change ShareActivity type, now it is a FileActivity
David A. Velasco [Mon, 19 Oct 2015 19:03:15 +0000 (21:03 +0200)]
Removed redundant ArrayList creation
tobiasKaminsky [Mon, 19 Oct 2015 17:08:54 +0000 (19:08 +0200)]
fixed travis bug
masensio [Mon, 19 Oct 2015 13:35:10 +0000 (15:35 +0200)]
Add unshare with users/groups, from Share wiht view
David A. Velasco [Mon, 19 Oct 2015 13:12:24 +0000 (15:12 +0200)]
Users and groups retrieved from server to fill search suggestions
masensio [Mon, 19 Oct 2015 13:10:14 +0000 (15:10 +0200)]
Clean code in ShareFileFragment
masensio [Mon, 19 Oct 2015 12:59:32 +0000 (14:59 +0200)]
Add new string for share_groups_indicator
masensio [Mon, 19 Oct 2015 12:43:25 +0000 (14:43 +0200)]
Animate unshare button
masensio [Mon, 19 Oct 2015 11:52:58 +0000 (13:52 +0200)]
Add unshare with user option to share with view
masensio [Mon, 19 Oct 2015 07:48:05 +0000 (09:48 +0200)]
Get shares from Database, fix in insert shares in DB
David A. Velasco [Thu, 15 Oct 2015 17:24:16 +0000 (19:24 +0200)]
Complete search widget to send search requests to parent activity
masensio [Mon, 19 Oct 2015 07:16:19 +0000 (09:16 +0200)]
Get shares from Database (WIP)
masensio [Fri, 16 Oct 2015 09:02:46 +0000 (11:02 +0200)]
Show users/groups in share with view, getting the data from the server
masensio [Thu, 15 Oct 2015 09:36:07 +0000 (11:36 +0200)]
fix Travis
masensio [Thu, 15 Oct 2015 09:21:07 +0000 (11:21 +0200)]
Remove android.support.widget components from the sharewith view. Waiting for introducing Floating button in the project
David A. Velasco [Thu, 15 Oct 2015 07:26:24 +0000 (09:26 +0200)]
Sync user and group shares into database
masensio [Wed, 14 Oct 2015 10:58:07 +0000 (12:58 +0200)]
Show the 'search' layout in phone and tablet
David A. Velasco [Tue, 13 Oct 2015 14:16:45 +0000 (16:16 +0200)]
Changed title in sharing dialog from 'Share link' to 'Sharing' (seen in web UI)
masensio [Fri, 9 Oct 2015 12:22:56 +0000 (14:22 +0200)]
Create the layout for searching users/groups
masensio [Fri, 9 Oct 2015 10:30:00 +0000 (12:30 +0200)]
Add Get Groups operation
masensio [Fri, 9 Oct 2015 08:02:52 +0000 (10:02 +0200)]
Add Get Users from Server Operation
masensio [Thu, 8 Oct 2015 16:33:40 +0000 (18:33 +0200)]
Add get list of users in the library
masensio [Thu, 8 Oct 2015 13:35:08 +0000 (15:35 +0200)]
Show the layout to hsare with user in phone and tablet
masensio [Mon, 5 Oct 2015 13:17:39 +0000 (15:17 +0200)]
Add new attribute to OCFile to know if this file is shared with users/groups
masensio [Tue, 6 Oct 2015 12:02:18 +0000 (14:02 +0200)]
Create the layout to share with a user
masensio [Mon, 5 Oct 2015 13:17:39 +0000 (15:17 +0200)]
Add new attribute to OCFile to know if this file is shared with users/groups
masensio [Mon, 5 Oct 2015 09:25:24 +0000 (11:25 +0200)]
Show share with users option if the server supports search users function
masensio [Mon, 5 Oct 2015 07:43:30 +0000 (09:43 +0200)]
Add 'Share with users/groups' to long press menu
Maria Asensio [Fri, 30 Oct 2015 13:14:52 +0000 (14:14 +0100)]
Merge pull request #1109 from owncloud/sync_full_folder
Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder
masensio [Fri, 30 Oct 2015 13:11:01 +0000 (14:11 +0100)]
Update library reference, sync_full_folder
David A. Velasco [Fri, 30 Oct 2015 12:59:02 +0000 (13:59 +0100)]
Merge pull request #1219 from owncloud/sync_full_folder__fix_conflict_save_local_version
Fixed "Select Local Version" or "Keep Both behaviour" in conflict dialog
Maria Asensio [Fri, 30 Oct 2015 09:38:14 +0000 (10:38 +0100)]
Merge pull request #1200 from owncloud/fix_1192_date_time
fix for #1192
Jenkins for ownCloud [Fri, 30 Oct 2015 05:13:47 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
LukeOwncloud [Thu, 29 Oct 2015 20:03:32 +0000 (21:03 +0100)]
MC: Updated comment only
Comment did not reflect last commit change.
David A. Velasco [Thu, 29 Oct 2015 18:03:41 +0000 (19:03 +0100)]
Merge pull request #1105 from owncloud/fixLegacyTravis
Switch from Travis legacy infrastructure to container-based
masensio [Thu, 29 Oct 2015 16:13:24 +0000 (17:13 +0100)]
Detect conflict when local and server version are changed
Andy Scherzinger [Thu, 29 Oct 2015 09:24:15 +0000 (10:24 +0100)]
return standard date string as fallback
Jenkins for ownCloud [Thu, 29 Oct 2015 05:13:42 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Tue, 27 Oct 2015 13:32:42 +0000 (14:32 +0100)]
Fix Select Local Version or Keep Both behaviour when solving file coflict
masensio [Tue, 27 Oct 2015 07:52:17 +0000 (08:52 +0100)]
Merge branch 'master' into sync_full_folder
Conflicts:
owncloud-android-library
src/com/owncloud/android/files/services/FileUploader.java
Jenkins for ownCloud [Tue, 27 Oct 2015 05:13:47 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 23 Oct 2015 05:13:41 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Thu, 22 Oct 2015 07:10:10 +0000 (09:10 +0200)]
Merge pull request #1177 from owncloud/notification_coloring
Add ownCloud color to notifications for lollipop
Andy Scherzinger [Wed, 21 Oct 2015 09:31:58 +0000 (11:31 +0200)]
removed primary color usage for textColor of the input fields on the loginscreen
Jenkins for ownCloud [Wed, 21 Oct 2015 05:13:40 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 20 Oct 2015 05:13:41 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 19 Oct 2015 05:13:44 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 18 Oct 2015 05:13:42 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 17 Oct 2015 05:13:48 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Andy Scherzinger [Fri, 16 Oct 2015 09:41:26 +0000 (11:41 +0200)]
flipped the if/else for performance optimization
Andy Scherzinger [Fri, 16 Oct 2015 08:42:02 +0000 (10:42 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into fix_1192_date_time
Maria Asensio [Fri, 16 Oct 2015 07:03:34 +0000 (09:03 +0200)]
Merge pull request #1199 from owncloud/display_thumbnails_details_view_PR_1065
Display thumbnails details view pr 1065
tobiasKaminsky [Wed, 14 Oct 2015 18:10:01 +0000 (20:10 +0200)]
fixed missing refresh of thumbnail after sync
masensio [Thu, 15 Oct 2015 14:17:32 +0000 (16:17 +0200)]
Merge remote-tracking branch 'origin/develop'
masensio [Thu, 15 Oct 2015 14:12:06 +0000 (16:12 +0200)]
Merge branch 'zmatsuo-detailThumbnail' into develop
masensio [Thu, 15 Oct 2015 14:10:55 +0000 (16:10 +0200)]
Merge branch 'detailThumbnail' of git://github.com/zmatsuo/android into zmatsuo-detailThumbnail
Conflicts:
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
Andy Scherzinger [Thu, 15 Oct 2015 12:04:56 +0000 (14:04 +0200)]
fix for #1192
Andy Scherzinger [Wed, 14 Oct 2015 08:34:48 +0000 (10:34 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into notification_coloring
Jenkins for ownCloud [Wed, 14 Oct 2015 05:13:38 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 13 Oct 2015 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 12 Oct 2015 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 11 Oct 2015 05:13:36 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 10 Oct 2015 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Andy Scherzinger [Fri, 9 Oct 2015 13:46:35 +0000 (15:46 +0200)]
actual lib reference
Andy Scherzinger [Fri, 9 Oct 2015 13:04:39 +0000 (15:04 +0200)]
directly link owncloud_blue color ID to setup.xml's actionbar_start_color to enable proper color manipulation. Technical debt: setup should rename the actionbar_start_color (and actionbar_end_color) since it is basically the primary-oiiod value due to material design terms.
Andy Scherzinger [Fri, 9 Oct 2015 12:45:32 +0000 (14:45 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into notification_coloring
Jenkins for ownCloud [Fri, 9 Oct 2015 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Maria Asensio [Wed, 7 Oct 2015 09:19:16 +0000 (11:19 +0200)]
Merge pull request #1190 from owncloud/1182_Open_With_Fix
Fix for #1182 on Android 5
Jenkins for ownCloud [Wed, 7 Oct 2015 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Maria Asensio [Tue, 6 Oct 2015 12:51:14 +0000 (14:51 +0200)]
Merge pull request #1117 from owncloud/sortAccents
Sort accents
Andy Scherzinger [Tue, 6 Oct 2015 07:58:16 +0000 (09:58 +0200)]
Code review
Jenkins for ownCloud [Tue, 6 Oct 2015 05:13:31 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Andy Scherzinger [Mon, 5 Oct 2015 16:44:50 +0000 (18:44 +0200)]
Fix for #1182 on Android 5
Jenkins for ownCloud [Sun, 4 Oct 2015 05:13:38 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 3 Oct 2015 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
tobiasKaminsky [Fri, 2 Oct 2015 14:04:18 +0000 (16:04 +0200)]
Merge remote-tracking branch 'remotes/upstream/master' into sortAccents
masensio [Thu, 1 Oct 2015 16:45:01 +0000 (18:45 +0200)]
Merge pull request #839 from fluffy88/develop
Trigger media scan after file upload
masensio [Thu, 1 Oct 2015 08:37:37 +0000 (10:37 +0200)]
Fix: Long press menu shows two extra options: old cancel download and old cancel upload
masensio [Wed, 30 Sep 2015 15:59:12 +0000 (17:59 +0200)]
Use SYNC_CONFLICT instead CONFLICT for conflicts in UploadFileOperation
masensio [Wed, 30 Sep 2015 10:24:01 +0000 (12:24 +0200)]
Merge branch 'master' into sync_full_folder
Conflicts:
src/com/owncloud/android/providers/FileContentProvider.java
masensio [Wed, 30 Sep 2015 08:49:47 +0000 (10:49 +0200)]
Merge branch 'master' of github.com:owncloud/android
Conflicts:
CHANGELOG.md
masensio [Wed, 30 Sep 2015 08:45:20 +0000 (10:45 +0200)]
Merge branch 'stable'
masensio [Wed, 30 Sep 2015 08:43:56 +0000 (10:43 +0200)]
Update Changelog for 1.8 version
Raquel Pérez Bartolomé [Tue, 29 Sep 2015 13:53:57 +0000 (15:53 +0200)]
Update CHANGELOG.md
Updated 1.8.0 changelog
Jenkins for ownCloud [Tue, 29 Sep 2015 05:13:58 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Mon, 28 Sep 2015 11:57:22 +0000 (13:57 +0200)]
Remove strings for values-en_DE
masensio [Mon, 28 Sep 2015 10:33:47 +0000 (12:33 +0200)]
Merge branch 'release-1.8'
David A. Velasco [Mon, 28 Sep 2015 09:21:33 +0000 (11:21 +0200)]
Upload operations end in conflict if overriding a version different than the last known
Jenkins for ownCloud [Mon, 28 Sep 2015 06:33:53 +0000 (02:33 -0400)]
[tx-robot] updated from transifex
Andy Scherzinger [Sun, 27 Sep 2015 19:40:52 +0000 (21:40 +0200)]
Add ownCloud color to notifications (only works on lollipop and up) for progress bar and icon background
David A. Velasco [Fri, 25 Sep 2015 13:15:17 +0000 (15:15 +0200)]
Updated reference to library after rebase
David A. Velasco [Fri, 28 Aug 2015 16:19:20 +0000 (18:19 +0200)]
Updated error message for failed folder synchronization ('download' not anymore)
David A. Velasco [Mon, 24 Aug 2015 10:43:32 +0000 (12:43 +0200)]
Removed some logs
David A. Velasco [Mon, 24 Aug 2015 10:37:47 +0000 (12:37 +0200)]
Clean-up: removed unused imports and methods, and commented code
David A. Velasco [Mon, 24 Aug 2015 10:14:54 +0000 (12:14 +0200)]
Removed separated 'download folder' in contextual menu and unused DownloadFolderOperation class
David A. Velasco [Fri, 21 Aug 2015 12:55:52 +0000 (14:55 +0200)]
Fixed permanent 'uploading' icon on files that are automatically renamed during the upload