pub/Android/ownCloud.git
9 years agoMerge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
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

9 years agoMerge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
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

9 years agoNPE Fix for setting the color on the IndeterminateProgressDialog
Andy Scherzinger [Wed, 19 Aug 2015 17:17:09 +0000 (19:17 +0200)]
NPE Fix for setting the color on the IndeterminateProgressDialog

9 years agoMerge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
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

9 years agoMerge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
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

9 years agoFix for long click menue for account management in preferences screen
Andy Scherzinger [Tue, 18 Aug 2015 21:13:10 +0000 (23:13 +0200)]
Fix for long click menue for account management in preferences screen

9 years agofix for the progress bar on pre lollipop devices via manipulating windowFrame, window...
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

9 years agoreverted back to light colored login
Andy Scherzinger [Tue, 18 Aug 2015 15:48:10 +0000 (17:48 +0200)]
reverted back to light colored login

9 years agoConflict Dialog Fix
Andy Scherzinger [Tue, 18 Aug 2015 11:57:09 +0000 (13:57 +0200)]
Conflict Dialog Fix

9 years agovisual fix for Progress DialogFragment(s)
Andy Scherzinger [Tue, 18 Aug 2015 11:08:58 +0000 (13:08 +0200)]
visual fix for Progress DialogFragment(s)

9 years agoadd jar to libs folder for ant to find...
Andy Scherzinger [Tue, 18 Aug 2015 00:04:11 +0000 (02:04 +0200)]
add jar to libs folder for ant to find...

9 years agotrying to add a .classpath file
Andy Scherzinger [Mon, 17 Aug 2015 23:54:34 +0000 (01:54 +0200)]
trying to add a .classpath file

9 years agoinitial implementation of the FAB with Speed Dial
Andy Scherzinger [Mon, 17 Aug 2015 23:34:45 +0000 (01:34 +0200)]
initial implementation of the FAB with Speed Dial

9 years agoadded dummy src folder for ant build
Andy Scherzinger [Mon, 17 Aug 2015 21:35:42 +0000 (23:35 +0200)]
added dummy src folder for ant build

9 years agofix path typo
Andy Scherzinger [Mon, 17 Aug 2015 21:31:52 +0000 (23:31 +0200)]
fix path typo

9 years agochanged project to library
Andy Scherzinger [Mon, 17 Aug 2015 21:27:06 +0000 (23:27 +0200)]
changed project to library

9 years agoexperimental add of fab lib to check if travis build is still working
Andy Scherzinger [Mon, 17 Aug 2015 21:15:09 +0000 (23:15 +0200)]
experimental add of fab lib to check if travis build is still working

9 years agoMerge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
Andy Scherzinger [Mon, 17 Aug 2015 14:14:12 +0000 (16:14 +0200)]
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons

9 years agoMerge branch 'master' of https://github.com/owncloud/android into material_toolbar
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

9 years agoMerge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
Andy Scherzinger [Mon, 17 Aug 2015 14:04:17 +0000 (16:04 +0200)]
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons

9 years agoJava Doc added
Andy Scherzinger [Mon, 17 Aug 2015 14:00:16 +0000 (16:00 +0200)]
Java Doc added

9 years agoFix for 4.0 file action context menu (re-implement it via DialogFragment)
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)

9 years agoMerge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
Andy Scherzinger [Mon, 17 Aug 2015 07:05:33 +0000 (09:05 +0200)]
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons

9 years agoset back font weight on drawer list items
Andy Scherzinger [Mon, 17 Aug 2015 07:04:37 +0000 (09:04 +0200)]
set back font weight on drawer list items

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 17 Aug 2015 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 15 Aug 2015 05:13:39 +0000 (01:13 -0400)]
[tx-robot] updated from transifex

9 years agoMerge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
Andy Scherzinger [Fri, 14 Aug 2015 17:34:08 +0000 (19:34 +0200)]
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons

9 years agoread cover art for audio file (works for mp3) and displays it in the media player...
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.

9 years agoMerge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
Andy Scherzinger [Fri, 14 Aug 2015 16:55:58 +0000 (18:55 +0200)]
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons

9 years agofix for progressbars on pre lollipop and post ics for seekbar thumbs
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

9 years agoMerge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
Andy Scherzinger [Fri, 14 Aug 2015 15:45:22 +0000 (17:45 +0200)]
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons

Conflicts:
res/layout/drawer.xml
res/layout/drawer_list_item.xml
res/values/styles.xml

9 years agomerged part of the fixes from material buttons branch to fix bugs reported in PR...
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

9 years agofixed drawer font size, changed color according to material guide
Andy Scherzinger [Fri, 14 Aug 2015 14:00:35 +0000 (16:00 +0200)]
fixed drawer font size, changed color according to material guide

9 years agofix for drawer width
Andy Scherzinger [Fri, 14 Aug 2015 13:40:22 +0000 (15:40 +0200)]
fix for drawer width

9 years agoMove to AppCompat AlertDialog for proper rendering on pre-lollipop devices
Andy Scherzinger [Fri, 14 Aug 2015 13:29:22 +0000 (15:29 +0200)]
Move to AppCompat AlertDialog for proper rendering on pre-lollipop devices

9 years agogroup change data and size together and calculate decimals based on total size see...
Andy Scherzinger [Fri, 14 Aug 2015 08:05:26 +0000 (10:05 +0200)]
group change data and size together and calculate decimals based on total size see comment in PR #1090

9 years agofixed padding of list items
Andy Scherzinger [Thu, 13 Aug 2015 22:34:12 +0000 (00:34 +0200)]
fixed padding of list items

9 years agofixed progress wheel
Andy Scherzinger [Thu, 13 Aug 2015 17:43:56 +0000 (19:43 +0200)]
fixed progress wheel

9 years agofixed arrow coloring on the pull to refresh on the file list
Andy Scherzinger [Thu, 13 Aug 2015 17:28:44 +0000 (19:28 +0200)]
fixed arrow coloring on the pull to refresh on the file list

9 years agocoloring the progress wheel
Andy Scherzinger [Thu, 13 Aug 2015 17:16:11 +0000 (19:16 +0200)]
coloring the progress wheel

9 years agosome more styling for the log screen
Andy Scherzinger [Thu, 13 Aug 2015 17:05:20 +0000 (19:05 +0200)]
some more styling for the log screen

9 years agomoved everything to AppCompatActivity since ActionBarActivity is deprecated
Andy Scherzinger [Thu, 13 Aug 2015 16:46:19 +0000 (18:46 +0200)]
moved everything to AppCompatActivity since ActionBarActivity is deprecated

9 years agostandard material paddings set
Andy Scherzinger [Thu, 13 Aug 2015 16:39:53 +0000 (18:39 +0200)]
standard material paddings set

9 years agofixed checkbox (now also material design on pre lollipop)
Andy Scherzinger [Thu, 13 Aug 2015 16:39:36 +0000 (18:39 +0200)]
fixed checkbox (now also material design on pre lollipop)

9 years agoset standard 16dp whitespaces via config values not hardcoded
Andy Scherzinger [Thu, 13 Aug 2015 16:08:21 +0000 (18:08 +0200)]
set standard 16dp whitespaces via config values not hardcoded

9 years agoMerge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
Andy Scherzinger [Thu, 13 Aug 2015 15:58:58 +0000 (17:58 +0200)]
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons

9 years agominor padding change on logo
Andy Scherzinger [Thu, 13 Aug 2015 15:54:58 +0000 (17:54 +0200)]
minor padding change on logo

9 years agomove from deprecated ActionBarActivity to AppCompatActivity
Andy Scherzinger [Thu, 13 Aug 2015 15:54:33 +0000 (17:54 +0200)]
move from deprecated ActionBarActivity to AppCompatActivity

9 years agoMerge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
Andy Scherzinger [Thu, 13 Aug 2015 13:57:38 +0000 (15:57 +0200)]
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons

Conflicts:
res/layout/ssl_untrusted_cert_layout.xml
res/layout/ssl_validator_layout.xml

9 years agoFix for ssl popups padding, button style changed to borderless, fixed weight on buttons
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

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 13 Aug 2015 05:13:38 +0000 (01:13 -0400)]
[tx-robot] updated from transifex

9 years agofix for text field focus colors
Andy Scherzinger [Wed, 12 Aug 2015 17:12:56 +0000 (19:12 +0200)]
fix for text field focus colors

9 years agofixed button style blue/grey
Andy Scherzinger [Wed, 12 Aug 2015 16:54:27 +0000 (18:54 +0200)]
fixed button style blue/grey

9 years agoMerge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
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

9 years agofixed username to be single line and ellipsized in case of lang names
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

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 12 Aug 2015 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex

9 years agoUpdate SETUP.md
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

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 11 Aug 2015 05:13:39 +0000 (01:13 -0400)]
[tx-robot] updated from transifex

9 years ago16dp spacing for the footer too
Andy Scherzinger [Mon, 10 Aug 2015 16:50:24 +0000 (18:50 +0200)]
16dp spacing for the footer too

9 years agofurther 16dp spacings
Andy Scherzinger [Mon, 10 Aug 2015 16:36:50 +0000 (18:36 +0200)]
further 16dp spacings

9 years agoinital work on 16dp margin/padding values and material margin/padding values for...
Andy Scherzinger [Mon, 10 Aug 2015 16:32:25 +0000 (18:32 +0200)]
inital work on 16dp margin/padding values and material margin/padding values for List items as well as font sizes

9 years agoMerge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
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

9 years agoMerge branch 'master' 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

9 years agoMerge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
Andy Scherzinger [Mon, 10 Aug 2015 09:19:23 +0000 (11:19 +0200)]
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons

9 years agoEnforce to recalculate row height when measuring the footer to get it correctly place...
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

9 years agoMerge branch 'master' of https://github.com/owncloud/android into material_buttons
Andy Scherzinger [Mon, 10 Aug 2015 08:54:05 +0000 (10:54 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_buttons

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 10 Aug 2015 05:13:35 +0000 (01:13 -0400)]
[tx-robot] updated from transifex

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 9 Aug 2015 05:13:36 +0000 (01:13 -0400)]
[tx-robot] updated from transifex

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 8 Aug 2015 05:13:38 +0000 (01:13 -0400)]
[tx-robot] updated from transifex

10 years agouse custom checkbox images (material design) while toggling
Andy Scherzinger [Fri, 7 Aug 2015 16:20:51 +0000 (18:20 +0200)]
use custom checkbox images (material design) while toggling

10 years agofix for the button styling (land)
Andy Scherzinger [Fri, 7 Aug 2015 16:05:50 +0000 (18:05 +0200)]
fix for the button styling (land)

10 years agomaterial checkbox drawables instead of version dependend ones
Andy Scherzinger [Fri, 7 Aug 2015 16:05:34 +0000 (18:05 +0200)]
material checkbox drawables instead of version dependend ones

10 years agoMerge branch 'master' of https://github.com/owncloud/android into material_buttons
Andy Scherzinger [Fri, 7 Aug 2015 15:11:04 +0000 (17:11 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into material_buttons

10 years agoMaterial Buttons (draft)
Andy Scherzinger [Fri, 7 Aug 2015 15:09:47 +0000 (17:09 +0200)]
Material Buttons (draft)

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 7 Aug 2015 08:57:36 +0000 (04:57 -0400)]
[tx-robot] updated from transifex

10 years agoMerge branch 'develop'
David A. Velasco [Fri, 7 Aug 2015 08:17:03 +0000 (10:17 +0200)]
Merge branch 'develop'

Conflicts FIXED:
owncloud-android-library

10 years agoMerge pull request #1088 from owncloud/updated_docs_about_target_of_PRs
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…

10 years agoUpdated documents and .gitmodules with new policy: PRs should go to master, no more...
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

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 7 Aug 2015 05:13:50 +0000 (01:13 -0400)]
[tx-robot] updated from transifex

10 years agoOptimized translucence for lollipop on image preview
Andy Scherzinger [Thu, 6 Aug 2015 17:14:52 +0000 (19:14 +0200)]
Optimized translucence for lollipop on image preview

10 years agoadded back translucent action bar for image preview
Andy Scherzinger [Thu, 6 Aug 2015 17:04:22 +0000 (19:04 +0200)]
added back translucent action bar for image preview

10 years agoMerge branch 'develop' of https://github.com/owncloud/android into material_toolbar
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

10 years agoBugfix für Lollipop AlertDialog Bug (see styles), moved away from android referenced...
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

10 years agoMove alert dialog to material variant and setting the correct accent color for the...
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

10 years agoMerge pull request #1052 from owncloud/change_subject_when_sharing_in_saml
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

10 years agoUpdate library reference with fix for saml username
masensio [Thu, 6 Aug 2015 08:53:35 +0000 (10:53 +0200)]
Update library reference with fix for saml username

10 years agoUpdate library reference
masensio [Thu, 6 Aug 2015 08:44:55 +0000 (10:44 +0200)]
Update library reference

10 years agoAdded username to SAML credentials
David A. Velasco [Mon, 3 Aug 2015 09:21:11 +0000 (11:21 +0200)]
Added username to SAML credentials

10 years agochange the subject
purigarcia [Thu, 9 Jul 2015 08:40:47 +0000 (10:40 +0200)]
change the subject

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 6 Aug 2015 05:14:11 +0000 (01:14 -0400)]
[tx-robot] updated from transifex

10 years agofix for the grid footer
Andy Scherzinger [Wed, 5 Aug 2015 13:21:05 +0000 (15:21 +0200)]
fix for the grid footer

10 years agoadded bottom padding to logo, logo slightly bigger
Andy Scherzinger [Wed, 5 Aug 2015 12:48:04 +0000 (14:48 +0200)]
added bottom padding to logo, logo slightly bigger

10 years agoaligned account name with menu items
Andy Scherzinger [Wed, 5 Aug 2015 12:07:00 +0000 (14:07 +0200)]
aligned account name with menu items

10 years agoadded missing progressbar
Andy Scherzinger [Wed, 5 Aug 2015 11:43:23 +0000 (13:43 +0200)]
added missing progressbar

10 years agochanged color for hint text on login screens to 777
Andy Scherzinger [Wed, 5 Aug 2015 11:36:12 +0000 (13:36 +0200)]
changed color for hint text on login screens to 777

10 years agoremoved unused listener (would only be useful in case of using toolbar instead of...
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)

10 years agofixed deprecated getDrawable call
Andy Scherzinger [Wed, 5 Aug 2015 10:58:40 +0000 (12:58 +0200)]
fixed deprecated getDrawable call

10 years agoremove two-times init of the drawer
Andy Scherzinger [Wed, 5 Aug 2015 10:54:31 +0000 (12:54 +0200)]
remove two-times init of the drawer

10 years agoMerge pull request #1068 from owncloud/conflictDialog_newWording
masensio [Wed, 5 Aug 2015 10:53:03 +0000 (12:53 +0200)]
Merge pull request #1068 from owncloud/conflictDialog_newWording

Conflict dialog: new wording

10 years agochanged alignment of drawer's content according to jan's suggestions
Andy Scherzinger [Tue, 4 Aug 2015 17:02:36 +0000 (19:02 +0200)]
changed alignment of drawer's content according to jan's suggestions