Andy Scherzinger [Tue, 8 Sep 2015 11:51:21 +0000 (13:51 +0200)]
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
Andy Scherzinger [Tue, 8 Sep 2015 11:50:02 +0000 (13:50 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
Jenkins for ownCloud [Tue, 8 Sep 2015 05:13:44 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Andy Scherzinger [Mon, 7 Sep 2015 12:36:59 +0000 (14:36 +0200)]
Merge branch 'new-filetype-icons' of https://github.com/Kernald/owncloud-android into material_fab
Andy Scherzinger [Mon, 7 Sep 2015 09:16:29 +0000 (11:16 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
Andy Scherzinger [Mon, 7 Sep 2015 09:13:04 +0000 (11:13 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_fab
Andy Scherzinger [Mon, 7 Sep 2015 09:12:51 +0000 (11:12 +0200)]
Revert "dummy value for error_cant_bind_to_operations_service"
This reverts commit
b1f6b5ec4a45ab1da3f50da940315ed99d4d8b75.
masensio [Mon, 7 Sep 2015 08:47:05 +0000 (10:47 +0200)]
Merge pull request #1095 from owncloud/text_file_preview_pr_707_with_develop
Text file preview pr 707 with develop
masensio [Mon, 7 Sep 2015 08:42:09 +0000 (10:42 +0200)]
Merge branch 'master' into text_file_preview_pr_707_with_develop
David A. Velasco [Mon, 7 Sep 2015 08:07:47 +0000 (10:07 +0200)]
HOT FIX: recovered lost strings
David A. Velasco [Mon, 7 Sep 2015 07:13:44 +0000 (09:13 +0200)]
Fixed text preview filter to take into account local knowledge about MIME types
Jenkins for ownCloud [Mon, 7 Sep 2015 05:13:41 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Andy Scherzinger [Sun, 6 Sep 2015 19:48:28 +0000 (21:48 +0200)]
dummy value for error_cant_bind_to_operations_service
Andy Scherzinger [Sun, 6 Sep 2015 19:48:04 +0000 (21:48 +0200)]
coloer changes for #1132
Andy Scherzinger [Sun, 6 Sep 2015 18:50:47 +0000 (20:50 +0200)]
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
Andy Scherzinger [Sun, 6 Sep 2015 18:49:49 +0000 (20:49 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
Jenkins for ownCloud [Sun, 6 Sep 2015 05:13:44 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 5 Sep 2015 05:13:44 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Fri, 4 Sep 2015 13:01:25 +0000 (15:01 +0200)]
Reverse filter for preview of text files: all text/ but those in black list
masensio [Fri, 4 Sep 2015 12:31:10 +0000 (14:31 +0200)]
Merge branch 'master' into text_file_preview_pr_707_with_develop
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
Andy Scherzinger [Fri, 4 Sep 2015 11:46:40 +0000 (13:46 +0200)]
lib update
Andy Scherzinger [Fri, 4 Sep 2015 11:43:36 +0000 (13:43 +0200)]
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
Conflicts:
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
Andy Scherzinger [Fri, 4 Sep 2015 11:31:00 +0000 (13:31 +0200)]
updated to latest library version
Andy Scherzinger [Fri, 4 Sep 2015 11:24:12 +0000 (13:24 +0200)]
fix duplicate
Andy Scherzinger [Fri, 4 Sep 2015 11:20:41 +0000 (13:20 +0200)]
fix layout/uploader_layout.xml
Andy Scherzinger [Fri, 4 Sep 2015 11:16:11 +0000 (13:16 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
Conflicts:
res/layout/uploader_layout.xml
masensio [Fri, 4 Sep 2015 09:14:42 +0000 (11:14 +0200)]
Merge pull request #1102 from owncloud/copy
Copy files
masensio [Fri, 4 Sep 2015 09:03:31 +0000 (11:03 +0200)]
Update library reference: Copy operation
Jenkins for ownCloud [Fri, 4 Sep 2015 05:13:40 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Wed, 2 Sep 2015 11:29:14 +0000 (13:29 +0200)]
Merge branch 'text_file_preview_pr_707_with_develop' of github.com:owncloud/android into text_file_preview_pr_707_with_develop
masensio [Wed, 2 Sep 2015 11:21:17 +0000 (13:21 +0200)]
Merge remote-tracking branch 'origin/master' into text_file_preview_pr_707_with_develop
Conflicts:
res/layout/file_preview.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Jenkins for ownCloud [Wed, 2 Sep 2015 11:06:14 +0000 (07:06 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Wed, 2 Sep 2015 09:00:30 +0000 (11:00 +0200)]
Merge pull request #1114 from owncloud/tryFix1113
Removed squared background for transparencies from file type icons and thumbnails (stays for images in gallery view)
Jenkins for ownCloud [Tue, 1 Sep 2015 17:02:18 +0000 (13:02 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Tue, 1 Sep 2015 16:35:51 +0000 (18:35 +0200)]
Merge branch 'master' into copy
Conflicts FIXED:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/FileDownloadFragment.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
David A. Velasco [Tue, 1 Sep 2015 16:15:22 +0000 (18:15 +0200)]
Updated reference to library after upate copy request implementation
Marc Plano-Lesay [Mon, 31 Aug 2015 17:15:36 +0000 (19:15 +0200)]
Use new filetype icons
David A. Velasco [Mon, 31 Aug 2015 15:48:12 +0000 (17:48 +0200)]
Merge pull request #1122 from owncloud/create_folder_button_on_action_bar_for_uploader
'Create folder' button moved to action bar in Uploader activity
masensio [Mon, 31 Aug 2015 14:40:04 +0000 (16:40 +0200)]
Set background color as background for png with tranparency
Jenkins for ownCloud [Mon, 31 Aug 2015 05:13:46 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Sun, 30 Aug 2015 09:42:25 +0000 (11:42 +0200)]
Added slides for Android workshop @ oCC 2015
masensio [Fri, 28 Aug 2015 16:50:43 +0000 (18:50 +0200)]
Remove transparent background in icons
Jenkins for ownCloud [Fri, 28 Aug 2015 05:13:40 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 27 Aug 2015 05:13:43 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 26 Aug 2015 05:13:41 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Tue, 25 Aug 2015 12:53:42 +0000 (14:53 +0200)]
Merge branch 'master' into create_folder_button_on_action_bar_for_uploader
Conflicts:
res/layout/uploader_layout.xml
tobiasKaminsky [Tue, 25 Aug 2015 12:43:36 +0000 (14:43 +0200)]
to be sure ;)
tobiasKaminsky [Tue, 25 Aug 2015 12:40:16 +0000 (14:40 +0200)]
try fix #1113
Jenkins for ownCloud [Tue, 25 Aug 2015 05:13:43 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Mon, 24 Aug 2015 11:07:31 +0000 (13:07 +0200)]
Merge branch 'develop'
masensio [Mon, 24 Aug 2015 11:06:36 +0000 (13:06 +0200)]
Merge pull request #1082 from owncloud/ignoreHiddenFiles
ignore hidden files also if they are images for counting
masensio [Mon, 24 Aug 2015 11:01:12 +0000 (13:01 +0200)]
Merge branch 'develop'
masensio [Mon, 24 Aug 2015 10:59:43 +0000 (12:59 +0200)]
Merge pull request #1078 from gstraube/develop
Check if ETag for remote folder is null, i.e. it was not received from the server
masensio [Mon, 24 Aug 2015 10:42:25 +0000 (12:42 +0200)]
Merge branch 'master' of github.com:owncloud/android
Jenkins for ownCloud [Mon, 24 Aug 2015 05:13:40 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 23 Aug 2015 05:13:42 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 22 Aug 2015 05:13:42 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 21 Aug 2015 05:13:44 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Mon, 24 Aug 2015 10:34:50 +0000 (12:34 +0200)]
Merge pull request #1056 from owncloud/svgTransparentBackground
PNG transparent background
Jenkins for ownCloud [Mon, 24 Aug 2015 05:13:40 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 23 Aug 2015 05:13:42 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
tobiasKaminsky [Sat, 22 Aug 2015 05:49:35 +0000 (07:49 +0200)]
Thumbnails add checkerboard to png
Jenkins for ownCloud [Sat, 22 Aug 2015 05:13:42 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
gstraube [Fri, 21 Aug 2015 18:45:40 +0000 (20:45 +0200)]
Merge remote-tracking branch 'upstream/develop' into develop
tobiasKaminsky [Fri, 21 Aug 2015 15:48:58 +0000 (17:48 +0200)]
Merge branch 'develop' of github.com:owncloud/android into svgTransparentBackground
purigarcia [Fri, 21 Aug 2015 09:18:17 +0000 (11:18 +0200)]
Merge branch 'develop' into ignoreHiddenFiles
Jenkins for ownCloud [Fri, 21 Aug 2015 05:13:44 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
masensio [Thu, 20 Aug 2015 12:14:53 +0000 (14:14 +0200)]
Merge pull request #1076 from owncloud/material_toolbar
Material Design
Andy Scherzinger [Thu, 20 Aug 2015 11:51:14 +0000 (13:51 +0200)]
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
Andy Scherzinger [Thu, 20 Aug 2015 11:50:44 +0000 (13:50 +0200)]
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
Andy Scherzinger [Thu, 20 Aug 2015 11:46:27 +0000 (13:46 +0200)]
further m-prefixing
Andy Scherzinger [Thu, 20 Aug 2015 11:39:59 +0000 (13:39 +0200)]
fixed m-Prefixing
Andy Scherzinger [Thu, 20 Aug 2015 11:08:28 +0000 (13:08 +0200)]
correct copyright info
Andy Scherzinger [Thu, 20 Aug 2015 10:47:31 +0000 (12:47 +0200)]
NullCheck for drawer
Andy Scherzinger [Thu, 20 Aug 2015 09:39:54 +0000 (11:39 +0200)]
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
Andy Scherzinger [Thu, 20 Aug 2015 09:39:25 +0000 (11:39 +0200)]
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
Andy Scherzinger [Thu, 20 Aug 2015 09:35:40 +0000 (11:35 +0200)]
prefixed variables with 'm'
Jorge Antonio Diaz-Benito Soriano [Wed, 19 Aug 2015 19:07:14 +0000 (21:07 +0200)]
Fixes the text preview issue
Andy Scherzinger [Wed, 19 Aug 2015 17:18:29 +0000 (19:18 +0200)]
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
Andy Scherzinger [Wed, 19 Aug 2015 17:18:00 +0000 (19:18 +0200)]
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
Andy Scherzinger [Wed, 19 Aug 2015 17:17:09 +0000 (19:17 +0200)]
NPE Fix for setting the color on the IndeterminateProgressDialog
Andy Scherzinger [Tue, 18 Aug 2015 21:23:36 +0000 (23:23 +0200)]
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
Andy Scherzinger [Tue, 18 Aug 2015 21:20:01 +0000 (23:20 +0200)]
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
Conflicts:
res/layout-land/account_setup.xml
res/layout/account_setup.xml
Andy Scherzinger [Tue, 18 Aug 2015 21:13:10 +0000 (23:13 +0200)]
Fix for long click menue for account management in preferences screen
Andy Scherzinger [Tue, 18 Aug 2015 20:09:53 +0000 (22:09 +0200)]
fix for the progress bar on pre lollipop devices via manipulating windowFrame, windowBackground and windowTitleBackgroundStyle
David A. Velasco [Tue, 18 Aug 2015 16:06:57 +0000 (18:06 +0200)]
Removed dependency on Context in CopyFileOperation
Jorge Antonio Diaz-Benito Soriano [Mon, 17 Aug 2015 16:10:21 +0000 (18:10 +0200)]
Fixes the last reported bugs
Andy Scherzinger [Tue, 18 Aug 2015 15:48:10 +0000 (17:48 +0200)]
reverted back to light colored login
Jorge Antonio Diaz-Benito Soriano [Sat, 14 Feb 2015 14:32:40 +0000 (15:32 +0100)]
Removes a static modifier that sneaked in
Jorge Antonio Diaz-Benito Soriano [Fri, 5 Dec 2014 10:27:56 +0000 (11:27 +0100)]
Taken out old activity
Jorge Antonio Diaz-Benito Soriano [Wed, 3 Dec 2014 19:35:33 +0000 (20:35 +0100)]
Refactored functionality to use the new FolderPickerActivity class
Jorge Antonio Diaz-Benito Soriano [Tue, 4 Nov 2014 15:13:59 +0000 (16:13 +0100)]
Updated copy action
Jorge Antonio Diaz-Benito Soriano [Thu, 23 Oct 2014 21:44:03 +0000 (23:44 +0200)]
Updated submodule to point to the branch with the additional stuff for the copy action
Jorge Antonio Diaz-Benito Soriano [Thu, 23 Oct 2014 21:19:11 +0000 (23:19 +0200)]
Added error messages for copy action. English only.
Jorge Antonio Diaz-Benito Soriano [Thu, 23 Oct 2014 20:34:42 +0000 (22:34 +0200)]
Added copy action
Jorge Antonio Diaz-Benito Soriano [Wed, 22 Oct 2014 18:06:44 +0000 (20:06 +0200)]
Fixed 'Move' action
Jorge Antonio Diaz-Benito Soriano [Wed, 22 Oct 2014 17:34:40 +0000 (19:34 +0200)]
Added 'ACTION_COPY_FILES'.
Jorge Antonio Diaz-Benito Soriano [Fri, 24 Oct 2014 08:44:03 +0000 (10:44 +0200)]
Tweaks for source 1.5
Jorge Antonio Diaz-Benito Soriano [Fri, 24 Oct 2014 08:21:27 +0000 (10:21 +0200)]
Make oC-android-library track the copy_operation branch
Jorge Antonio Diaz-Benito Soriano [Thu, 23 Oct 2014 21:44:03 +0000 (23:44 +0200)]
Updated submodule to point to the branch with the additional stuff for the copy action
projects / pub / Android / ownCloud.git / log