pub/Android/ownCloud.git
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 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 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 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

10 years agofixing the progressbar corner glitch, bumping style of indeterminate animation to...
Andy Scherzinger [Tue, 4 Aug 2015 16:32:33 +0000 (18:32 +0200)]
fixing the progressbar corner glitch, bumping style of indeterminate animation to material style via appcompat, fixing progress bar for folder picker too, see comment

10 years agoUpdated conflict message (same as in web app)
David A. Velasco [Tue, 4 Aug 2015 15:29:42 +0000 (17:29 +0200)]
Updated conflict message (same as in web app)

10 years agoextracted color values for download fragment, see comments https://github.com/ownclou...
Andy Scherzinger [Tue, 4 Aug 2015 15:06:27 +0000 (17:06 +0200)]
extracted color values for download fragment, see comments https://github.com/owncloud/android/commit/172c3f56a3ffdc399f1977744ad015de09fcc4f5

10 years agoFix for color reference in portrait https://github.com/owncloud/android/commit/8f401a...
Andy Scherzinger [Tue, 4 Aug 2015 14:49:20 +0000 (16:49 +0200)]
Fix for color reference in portrait https://github.com/owncloud/android/commit/8f401a38d8e70a625250ce1446f3b421a2da5728#comments

10 years agoFixed double request for ConflictsResolveActivity
David A. Velasco [Tue, 4 Aug 2015 14:47:46 +0000 (16:47 +0200)]
Fixed double request for ConflictsResolveActivity

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

10 years agoextracted text colors for account setup to color.xml, see https://github.com/owncloud...
Andy Scherzinger [Tue, 4 Aug 2015 14:04:28 +0000 (16:04 +0200)]
extracted text colors for account setup to color.xml, see https://github.com/owncloud/android/commit/e72caebbce437a6aa72d347d6530c7858a776f86 comments

10 years agoextracted text colors for account setup to color.xml, see https://github.com/owncloud...
Andy Scherzinger [Tue, 4 Aug 2015 14:04:28 +0000 (16:04 +0200)]
extracted text colors for account setup to color.xml, see https://github.com/owncloud/android/commit/e72caebbce437a6aa72d347d6530c7858a776f86 comments

10 years agoMerge branch 'develop' of https://github.com/owncloud/android into material_toolbar
Andy Scherzinger [Tue, 4 Aug 2015 10:49:28 +0000 (12:49 +0200)]
Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar

Conflicts:
build.gradle

10 years agodownload file if "use server version"
tobiasKaminsky [Mon, 3 Aug 2015 20:42:58 +0000 (22:42 +0200)]
download file if "use server version"

10 years agore-added values-tzl
tobiasKaminsky [Wed, 22 Jul 2015 19:38:43 +0000 (21:38 +0200)]
re-added values-tzl

10 years agoPartially revert 50819ce
tobiasKaminsky [Wed, 22 Jul 2015 17:02:09 +0000 (19:02 +0200)]
Partially revert 50819ce

10 years agorenamed string values
tobiasKaminsky [Fri, 17 Jul 2015 14:29:17 +0000 (16:29 +0200)]
renamed string values

10 years agoMerge pull request #1086 from owncloud/update_buildTools_to_22_0_1
David A. Velasco [Tue, 4 Aug 2015 10:36:24 +0000 (12:36 +0200)]
Merge pull request #1086 from owncloud/update_buildTools_to_22_0_1

Update buildTools version to 22.0.1

10 years agoUpdated reference to library
David A. Velasco [Tue, 4 Aug 2015 10:28:57 +0000 (12:28 +0200)]
Updated reference to library

10 years agoMerge branch 'develop' of https://github.com/owncloud/android into material_toolbar
Andy Scherzinger [Tue, 4 Aug 2015 09:47:44 +0000 (11:47 +0200)]
Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar

10 years agoUpdate buildTools version to 22.0.1
masensio [Tue, 4 Aug 2015 09:14:51 +0000 (11:14 +0200)]
Update buildTools version to 22.0.1

10 years agoMerge pull request #1083 from owncloud/update_jackrabbit_library
David A. Velasco [Tue, 4 Aug 2015 08:38:15 +0000 (10:38 +0200)]
Merge pull request #1083 from owncloud/update_jackrabbit_library

Update JackRabbit library

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

10 years agoMerge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
Andy Scherzinger [Mon, 3 Aug 2015 19:39:27 +0000 (21:39 +0200)]
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_toolbar

10 years agoMerge branch 'develop' of https://github.com/owncloud/android into material_toolbar
Andy Scherzinger [Mon, 3 Aug 2015 19:38:32 +0000 (21:38 +0200)]
Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar

10 years agoUpdate build.gradle to 1.2.3
masensio [Mon, 3 Aug 2015 13:07:20 +0000 (15:07 +0200)]
Update build.gradle to 1.2.3

10 years agonow works for initial opening and browsing down once
AndyScherzinger [Fri, 31 Jul 2015 15:22:19 +0000 (17:22 +0200)]
now works for initial opening and browsing down once

10 years agoUpdate library reference
masensio [Fri, 31 Jul 2015 13:21:18 +0000 (15:21 +0200)]
Update library reference

10 years agoUpdate library refernce: Upgrade jackrabbit to 2.10.1
masensio [Fri, 31 Jul 2015 10:36:42 +0000 (12:36 +0200)]
Update library refernce: Upgrade jackrabbit to 2.10.1

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 31 Jul 2015 05:14:01 +0000 (01:14 -0400)]
[tx-robot] updated from transifex

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

10 years agoMerge pull request #1051 from owncloud/fix_send
David A. Velasco [Wed, 29 Jul 2015 06:47:14 +0000 (08:47 +0200)]
Merge pull request #1051 from owncloud/fix_send

Fix sending of files to external apps when their pathname includes charactes requireing URL encoding.

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 29 Jul 2015 05:14:04 +0000 (01:14 -0400)]
[tx-robot] updated from transifex

10 years agomerge develop
purigarcia [Tue, 28 Jul 2015 08:47:08 +0000 (10:47 +0200)]
merge develop

10 years agomerge develop
purigarcia [Tue, 28 Jul 2015 08:46:13 +0000 (10:46 +0200)]
merge develop

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 28 Jul 2015 05:14:02 +0000 (01:14 -0400)]
[tx-robot] updated from transifex

10 years agosetting the username on the drawer header for startup and coming back from the prefer...
AndyScherzinger [Mon, 27 Jul 2015 18:20:46 +0000 (20:20 +0200)]
setting the username on the drawer header for startup and coming back from the preferences screen for account switching

10 years agoadding a new accent color see #1076 comment by @jancborchardt
AndyScherzinger [Mon, 27 Jul 2015 14:34:16 +0000 (16:34 +0200)]
adding a new accent color see #1076 comment by @jancborchardt

10 years agochanging the logo padding top/bottom according to #1076 comment by @jancborchardt
AndyScherzinger [Mon, 27 Jul 2015 14:33:36 +0000 (16:33 +0200)]
changing the logo padding top/bottom according to #1076 comment by @jancborchardt

10 years agochanging the leight_height in order to get the screen backround color right mentioned...
AndyScherzinger [Mon, 27 Jul 2015 14:33:10 +0000 (16:33 +0200)]
changing the leight_height in order to get the screen backround color right mentioned by @jancborchardt in #1076

10 years agoreplaced hard coded background color with coresponding color-definition
AndyScherzinger [Mon, 27 Jul 2015 14:18:53 +0000 (16:18 +0200)]
replaced hard coded background color with coresponding color-definition

10 years agocolored background black for image download #710 as proposed by @jancborchardt
AndyScherzinger [Sun, 26 Jul 2015 23:00:51 +0000 (01:00 +0200)]
colored background black for image download #710 as proposed by @jancborchardt

10 years agonpe fix for file upload on instance saving since actionbar in list mode doesn't habe...
AndyScherzinger [Sun, 26 Jul 2015 22:25:34 +0000 (00:25 +0200)]
npe fix for file upload on instance saving since actionbar in list mode doesn't habe a title

10 years agoBump compile from 16-->22 in order to compile actual appcompat
AndyScherzinger [Sun, 26 Jul 2015 21:23:45 +0000 (23:23 +0200)]
Bump compile from 16-->22 in order to compile actual appcompat

10 years agoremoved Android 16/19 to test drive
AndyScherzinger [Sun, 26 Jul 2015 21:16:35 +0000 (23:16 +0200)]
removed Android 16/19 to test drive

10 years agoAndroid-22 for target
AndyScherzinger [Sun, 26 Jul 2015 21:11:46 +0000 (23:11 +0200)]
Android-22 for target

10 years agobump tests to android-22
AndyScherzinger [Sun, 26 Jul 2015 21:09:11 +0000 (23:09 +0200)]
bump tests to android-22

10 years agofix ant/eclipse based build with actual exploded aar for appcompat-v7
AndyScherzinger [Sun, 26 Jul 2015 21:07:52 +0000 (23:07 +0200)]
fix ant/eclipse based build with actual exploded aar for appcompat-v7

10 years agoMerge branch 'develop' of https://github.com/owncloud/android into material_toolbar
AndyScherzinger [Sun, 26 Jul 2015 20:35:28 +0000 (22:35 +0200)]
Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar

10 years agoMerge branch 'master' of https://github.com/owncloud/android into develop
AndyScherzinger [Sun, 26 Jul 2015 20:34:13 +0000 (22:34 +0200)]
Merge branch 'master' of https://github.com/owncloud/android into develop

10 years agoUpdate README.md
Andy Scherzinger [Sun, 26 Jul 2015 20:16:06 +0000 (22:16 +0200)]
Update README.md

Added more information for contributing code, development setup and build status