Andy Scherzinger
|
c085ffd545
|
inital work on 16dp margin/padding values and material margin/padding values for List items as well as font sizes
|
2015-08-10 18:32:25 +02:00 |
|
Andy Scherzinger
|
dde5e5575c
|
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_toolbar
|
2015-08-10 13:02:16 +02:00 |
|
Andy Scherzinger
|
275028a5e3
|
Merge branch 'master' of https://github.com/owncloud/android into material_toolbar
|
2015-08-10 13:01:40 +02:00 |
|
Andy Scherzinger
|
456647c996
|
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
|
2015-08-10 11:19:23 +02:00 |
|
David A. Velasco
|
64ebb2c1d3
|
Enforce to recalculate row height when measuring the footer to get it correctly placed in the grid view
|
2015-08-10 11:12:43 +02:00 |
|
Andy Scherzinger
|
6a22a8cd3b
|
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
|
2015-08-10 10:54:05 +02:00 |
|
Jenkins for ownCloud
|
2b79f3292f
|
[tx-robot] updated from transifex
|
2015-08-10 01:13:35 -04:00 |
|
Jenkins for ownCloud
|
2206585f52
|
[tx-robot] updated from transifex
|
2015-08-09 01:13:36 -04:00 |
|
Jenkins for ownCloud
|
5258172ffd
|
[tx-robot] updated from transifex
|
2015-08-08 01:13:38 -04:00 |
|
Andy Scherzinger
|
0d75348b30
|
use custom checkbox images (material design) while toggling
|
2015-08-07 18:20:51 +02:00 |
|
Andy Scherzinger
|
a3ccc6a559
|
fix for the button styling (land)
|
2015-08-07 18:05:50 +02:00 |
|
Andy Scherzinger
|
f4445284d0
|
material checkbox drawables instead of version dependend ones
|
2015-08-07 18:05:34 +02:00 |
|
Andy Scherzinger
|
bbfb414695
|
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
|
2015-08-07 17:11:04 +02:00 |
|
Andy Scherzinger
|
4a4296a07e
|
Material Buttons (draft)
|
2015-08-07 17:09:47 +02:00 |
|
Jenkins for ownCloud
|
8d4d1bfffb
|
[tx-robot] updated from transifex
|
2015-08-07 04:57:36 -04:00 |
|
Jenkins for ownCloud
|
80c112ad1a
|
[tx-robot] updated from transifex
|
2015-08-07 04:44:18 -04:00 |
|
David A. Velasco
|
537e075fca
|
Merge branch 'develop'
Conflicts FIXED:
owncloud-android-library
|
2015-08-07 10:17:03 +02:00 |
|
David A. Velasco
|
00482b6dcb
|
Merge pull request #1088 from owncloud/updated_docs_about_target_of_PRs
Updated documents and .gitmodules with new policy: PRs should go to m…
|
2015-08-07 10:10:57 +02:00 |
|
David A. Velasco
|
3141659306
|
Updated documents and .gitmodules with new policy: PRs should go to master, no more to develop
|
2015-08-07 09:15:14 +02:00 |
|
Jenkins for ownCloud
|
e935e9239d
|
[tx-robot] updated from transifex
|
2015-08-07 01:13:50 -04:00 |
|
Andy Scherzinger
|
ddd01569cd
|
Optimized translucence for lollipop on image preview
|
2015-08-06 19:14:52 +02:00 |
|
Andy Scherzinger
|
6b6227125b
|
added back translucent action bar for image preview
|
2015-08-06 19:04:22 +02:00 |
|
Andy Scherzinger
|
9d9efd1c1d
|
Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
Conflicts:
owncloud-android-library
|
2015-08-06 17:23:02 +02:00 |
|
Andy Scherzinger
|
a257935b8c
|
Bugfix für Lollipop AlertDialog Bug (see styles), moved away from android referenced icon to self-shipped version for design consistency
|
2015-08-06 17:13:00 +02:00 |
|
Andy Scherzinger
|
1ce7d79ff0
|
Move alert dialog to material variant and setting the correct accent color for the button texts via styles
|
2015-08-06 16:27:56 +02:00 |
|
masensio
|
419dbeabec
|
Merge pull request #1052 from owncloud/change_subject_when_sharing_in_saml
change the subject when sharing in saml
|
2015-08-06 11:00:59 +02:00 |
|
masensio
|
1ae203760e
|
Update library reference with fix for saml username
|
2015-08-06 10:53:35 +02:00 |
|
masensio
|
0110601cb2
|
Update library reference
|
2015-08-06 10:44:55 +02:00 |
|
David A. Velasco
|
6a8034ec24
|
Added username to SAML credentials
|
2015-08-06 10:23:29 +02:00 |
|
purigarcia
|
91000ba405
|
change the subject
|
2015-08-06 10:23:27 +02:00 |
|
Jenkins for ownCloud
|
e0594d4005
|
[tx-robot] updated from transifex
|
2015-08-06 01:14:11 -04:00 |
|
masensio
|
fafc422ca4
|
Fix Java version to 1.7
|
2015-08-05 17:40:20 +02:00 |
|
masensio
|
d1257b34c0
|
Fix problems in PreviewTextFragment related with changes in develop
|
2015-08-05 17:18:17 +02:00 |
|
masensio
|
b694fee63d
|
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
|
2015-08-05 16:48:12 +02:00 |
|
Andy Scherzinger
|
270fea6a33
|
fix for the grid footer
|
2015-08-05 15:21:05 +02:00 |
|
Andy Scherzinger
|
b276b623a9
|
added bottom padding to logo, logo slightly bigger
|
2015-08-05 14:48:04 +02:00 |
|
Andy Scherzinger
|
5ded9e818b
|
aligned account name with menu items
|
2015-08-05 14:07:00 +02:00 |
|
Andy Scherzinger
|
c2418d24d5
|
added missing progressbar
|
2015-08-05 13:43:23 +02:00 |
|
Andy Scherzinger
|
97b9932d81
|
changed color for hint text on login screens to 777
|
2015-08-05 13:36:12 +02:00 |
|
Andy Scherzinger
|
f289998946
|
removed unused listener (would only be useful in case of using toolbar instead of actionbar)
|
2015-08-05 13:01:37 +02:00 |
|
Andy Scherzinger
|
3956a50855
|
fixed deprecated getDrawable call
|
2015-08-05 12:58:40 +02:00 |
|
Andy Scherzinger
|
7c9c4a4ca6
|
remove two-times init of the drawer
|
2015-08-05 12:54:31 +02:00 |
|
masensio
|
9a0361945c
|
Merge pull request #1068 from owncloud/conflictDialog_newWording
Conflict dialog: new wording
|
2015-08-05 12:53:03 +02:00 |
|
Andy Scherzinger
|
b5f8c0b087
|
changed alignment of drawer's content according to jan's suggestions
|
2015-08-04 19:02:36 +02:00 |
|
Andy Scherzinger
|
e36349f77e
|
fixing the progressbar corner glitch, bumping style of indeterminate animation to material style via appcompat, fixing progress bar for folder picker too, see comment
|
2015-08-04 18:32:33 +02:00 |
|
David A. Velasco
|
156cb5e81b
|
Updated conflict message (same as in web app)
|
2015-08-04 17:29:42 +02:00 |
|
Andy Scherzinger
|
f7f468b578
|
extracted color values for download fragment, see comments 172c3f56a3
|
2015-08-04 17:06:27 +02:00 |
|
Andy Scherzinger
|
a329d49ddf
|
Fix for color reference in portrait 8f401a38d8 (comments)
|
2015-08-04 16:49:20 +02:00 |
|
David A. Velasco
|
3512eae861
|
Fixed double request for ConflictsResolveActivity
|
2015-08-04 16:47:46 +02:00 |
|
Andy Scherzinger
|
2636e07289
|
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_toolbar
|
2015-08-04 16:42:17 +02:00 |
|