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
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 [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: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: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:17:09 +0000 (19:17 +0200)]
NPE Fix for setting the color on the IndeterminateProgressDialog
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
Andy Scherzinger [Tue, 18 Aug 2015 15:48:10 +0000 (17:48 +0200)]
reverted back to light colored login
Andy Scherzinger [Tue, 18 Aug 2015 11:57:09 +0000 (13:57 +0200)]
Conflict Dialog Fix
Andy Scherzinger [Tue, 18 Aug 2015 11:08:58 +0000 (13:08 +0200)]
visual fix for Progress DialogFragment(s)
masensio [Tue, 18 Aug 2015 08:16:13 +0000 (10:16 +0200)]
Merge branch 'master' into develop
Andy Scherzinger [Mon, 17 Aug 2015 14:13:30 +0000 (16:13 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_toolbar
Andy Scherzinger [Mon, 17 Aug 2015 14:00:16 +0000 (16:00 +0200)]
Java Doc added
Andy Scherzinger [Mon, 17 Aug 2015 13:58:03 +0000 (15:58 +0200)]
Fix for 4.0 file action context menu (re-implement it via DialogFragment)
Andy Scherzinger [Mon, 17 Aug 2015 07:04:37 +0000 (09:04 +0200)]
set back font weight on drawer list items
Jenkins for ownCloud [Mon, 17 Aug 2015 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 15 Aug 2015 05:13:39 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Andy Scherzinger [Fri, 14 Aug 2015 17:33:23 +0000 (19:33 +0200)]
read cover art for audio file (works for mp3) and displays it in the media player, sets the default logo (as before) in case it couldn't read and convert a cover art.
Andy Scherzinger [Fri, 14 Aug 2015 16:55:31 +0000 (18:55 +0200)]
fix for progressbars on pre lollipop and post ics for seekbar thumbs
Andy Scherzinger [Fri, 14 Aug 2015 15:18:36 +0000 (17:18 +0200)]
merged part of the fixes from material buttons branch to fix bugs reported in PR #1076
tobiasKaminsky [Thu, 13 Aug 2015 18:11:58 +0000 (20:11 +0200)]
fixed bug caused by rotating the device
Andy Scherzinger [Thu, 13 Aug 2015 15:54:33 +0000 (17:54 +0200)]
move from deprecated ActionBarActivity to AppCompatActivity
Andy Scherzinger [Thu, 13 Aug 2015 13:41:59 +0000 (15:41 +0200)]
Fix for ssl popups padding, button style changed to borderless, fixed weight on buttons
Jenkins for ownCloud [Thu, 13 Aug 2015 05:13:38 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Andy Scherzinger [Wed, 12 Aug 2015 16:49:33 +0000 (18:49 +0200)]
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_toolbar
Andy Scherzinger [Wed, 12 Aug 2015 16:48:33 +0000 (18:48 +0200)]
fixed username to be single line and ellipsized in case of lang names
Jenkins for ownCloud [Wed, 12 Aug 2015 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Andy Scherzinger [Tue, 11 Aug 2015 13:40:27 +0000 (15:40 +0200)]
Update SETUP.md
updated documentation due to move to android-22 for actual AppCompat lib and ownCloud app compile Target
masensio [Tue, 11 Aug 2015 09:14:26 +0000 (11:14 +0200)]
Move create folder button to action bar in Uploader
Jenkins for ownCloud [Tue, 11 Aug 2015 05:13:39 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Andy Scherzinger [Mon, 10 Aug 2015 11:02:16 +0000 (13:02 +0200)]
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_toolbar
Andy Scherzinger [Mon, 10 Aug 2015 11:01:40 +0000 (13:01 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_toolbar
David A. Velasco [Mon, 10 Aug 2015 09:12:43 +0000 (11:12 +0200)]
Enforce to recalculate row height when measuring the footer to get it correctly placed in the grid view
Jenkins for ownCloud [Mon, 10 Aug 2015 05:13:35 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 9 Aug 2015 05:13:36 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 8 Aug 2015 05:13:38 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Andy Scherzinger [Fri, 7 Aug 2015 15:09:47 +0000 (17:09 +0200)]
Material Buttons (draft)
Jenkins for ownCloud [Fri, 7 Aug 2015 08:57:36 +0000 (04:57 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 7 Aug 2015 08:44:18 +0000 (04:44 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Fri, 7 Aug 2015 08:17:03 +0000 (10:17 +0200)]
Merge branch 'develop'
Conflicts FIXED:
owncloud-android-library
David A. Velasco [Fri, 7 Aug 2015 08:10:57 +0000 (10:10 +0200)]
Merge pull request #1088 from owncloud/updated_docs_about_target_of_PRs
Updated documents and .gitmodules with new policy: PRs should go to m…
David A. Velasco [Thu, 6 Aug 2015 11:00:45 +0000 (13:00 +0200)]
Updated documents and .gitmodules with new policy: PRs should go to master, no more to develop
Jenkins for ownCloud [Fri, 7 Aug 2015 05:13:50 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Andy Scherzinger [Thu, 6 Aug 2015 17:14:52 +0000 (19:14 +0200)]
Optimized translucence for lollipop on image preview
Andy Scherzinger [Thu, 6 Aug 2015 17:04:22 +0000 (19:04 +0200)]
added back translucent action bar for image preview
Andy Scherzinger [Thu, 6 Aug 2015 15:23:02 +0000 (17:23 +0200)]
Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
Conflicts:
owncloud-android-library
Andy Scherzinger [Thu, 6 Aug 2015 15:13:00 +0000 (17:13 +0200)]
Bugfix für Lollipop AlertDialog Bug (see styles), moved away from android referenced icon to self-shipped version for design consistency
Andy Scherzinger [Thu, 6 Aug 2015 14:27:56 +0000 (16:27 +0200)]
Move alert dialog to material variant and setting the correct accent color for the button texts via styles
masensio [Thu, 6 Aug 2015 09:00:59 +0000 (11:00 +0200)]
Merge pull request #1052 from owncloud/change_subject_when_sharing_in_saml
change the subject when sharing in saml
masensio [Thu, 6 Aug 2015 08:53:35 +0000 (10:53 +0200)]
Update library reference with fix for saml username
masensio [Thu, 6 Aug 2015 08:44:55 +0000 (10:44 +0200)]
Update library reference
David A. Velasco [Mon, 3 Aug 2015 09:21:11 +0000 (11:21 +0200)]
Added username to SAML credentials
purigarcia [Thu, 9 Jul 2015 08:40:47 +0000 (10:40 +0200)]
change the subject
Jenkins for ownCloud [Thu, 6 Aug 2015 05:14:11 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
masensio [Wed, 5 Aug 2015 15:40:20 +0000 (17:40 +0200)]
Fix Java version to 1.7
masensio [Wed, 5 Aug 2015 15:18:17 +0000 (17:18 +0200)]
Fix problems in PreviewTextFragment related with changes in develop
masensio [Wed, 5 Aug 2015 14:48:12 +0000 (16:48 +0200)]
Merge commit 'refs/pr/707' into text_file_preview_pr_707_with
Conflicts:
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
Andy Scherzinger [Wed, 5 Aug 2015 13:21:05 +0000 (15:21 +0200)]
fix for the grid footer
Andy Scherzinger [Wed, 5 Aug 2015 12:48:04 +0000 (14:48 +0200)]
added bottom padding to logo, logo slightly bigger
Andy Scherzinger [Wed, 5 Aug 2015 12:07:00 +0000 (14:07 +0200)]
aligned account name with menu items
Andy Scherzinger [Wed, 5 Aug 2015 11:43:23 +0000 (13:43 +0200)]
added missing progressbar
Andy Scherzinger [Wed, 5 Aug 2015 11:36:12 +0000 (13:36 +0200)]
changed color for hint text on login screens to 777
Andy Scherzinger [Wed, 5 Aug 2015 11:01:37 +0000 (13:01 +0200)]
removed unused listener (would only be useful in case of using toolbar instead of actionbar)
projects / pub / Android / ownCloud.git / log