Commit graph

103 commits

Author SHA1 Message Date
tobiasKaminsky
bed5a16e1f Merge remote-tracking branch 'remotes/origin/master' into video_thumbnail 2016-06-19 18:23:06 +02:00
tobiasKaminsky
2c7256e835 Merge remote-tracking branch 'remotes/origin/videoBigThumbnails' into video_thumbnail 2016-06-19 18:22:45 +02:00
Andy Scherzinger
e2ec8498b8 replaced login icon, reworked login now using card views 2016-06-11 18:09:54 +02:00
Andy Scherzinger
f45d958c19 nextcloud notification icon 2016-06-09 17:52:37 +02:00
Andy Scherzinger
65775f1c6b adjusting the icon work to nextcloud + high resolution images 2016-06-09 17:52:37 +02:00
Andy Scherzinger
91682b616c replace launcher icon including seasonal icon removal 2016-06-09 17:52:35 +02:00
Andy Scherzinger
8b0bab8feb nextcloud logo for login 2016-06-08 16:46:31 +02:00
Andy Scherzinger
38946243ac min-version is 14 so merged -v11 with standard folders for artwork 2016-06-07 13:24:45 +02:00
Andy Scherzinger
9e4e93a5bc fixed checkmark color 2016-06-02 13:39:11 +02:00
jabarros
ad32dfea20 Added white border to available offline icon 2016-06-01 17:07:13 +02:00
Andy Scherzinger
9bb572e3e7 fixed sizes of the available offline icon and added a xxhdpi variant 2016-06-01 17:07:13 +02:00
jabarros
b15b49f56f Revert the remove of favorite icon (star) 2016-06-01 17:07:13 +02:00
jabarros
e11eecd2b5 Change favorite icon to available offline new one 2016-06-01 17:07:13 +02:00
David A. Velasco
f6ea9b597a Merge branch 'master' into reliable_uploads_actions_uploads_view
Conflicts FIXED in res/values/styles.xml (trivial)
2016-03-30 13:27:09 +02:00
Andy Scherzinger
78c53d544e magnify/close icon work 2016-03-22 13:29:23 +01:00
Andy Scherzinger
ab4dd53464 user/group icon work 2016-03-22 13:29:23 +01:00
David A. Velasco
259c94a45b Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-03-15 09:48:12 +01:00
Andy Scherzinger
e8c64ebf8d initial implementaion for click events + using the import icon for upload from other apps, also fixed the checkboxes for hdpi/mdpi 2016-02-25 18:07:28 +01:00
David A. Velasco
d2940f6214 Used OC trashbin icon in uploads view 2016-02-24 10:11:54 +01:00
David A. Velasco
286dc8fafd Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-02-22 10:21:46 +01:00
Andy Scherzinger
3fa2d292bb fixed ic_refresh icon work with 24dp origial grey600 version 2016-02-15 17:34:45 +01:00
David A. Velasco
82b0b7a84f Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-02-15 14:59:04 +01:00
Andy Scherzinger
bc4de91e93 material style play icon added 2016-02-12 12:50:00 +01:00
masensio
f11646bc6e Review ic_refresh dimensions 2016-01-21 09:29:58 +01:00
masensio
814a70f6a3 Update refresh icon in uploads view 2016-01-20 18:41:52 +01:00
David A. Velasco
e7901656a1 Polish UI to edit permissions 2016-01-11 15:34:41 +01:00
masensio
2181239c6d Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-01-08 11:21:23 +01:00
tobiasKaminsky
d7e9ef92b8 fixed according to review 2016-01-05 11:50:00 +01:00
masensio
540d123ad5 Merge branch 'master' into reliable_uploads_actions_uploads_view 2015-12-29 12:46:45 +01:00
masensio
a2b680edd0 Merge branch 'reliable_uploads' into reliable_uploads_actions_uploads_view 2015-12-10 17:35:32 +01:00
Andy Scherzinger
c31f602fd1 Merge branch 'master' of https://github.com/owncloud/android into material_buttons
Conflicts:
	res/layout/list_item.xml
2015-11-06 11:38:51 +01:00
David A. Velasco
0db4fc9b17 Sync user and group shares into database 2015-10-30 16:25:52 +01:00
Andy Scherzinger
9e15d2459d Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_buttons 2015-09-15 18:44:49 +02:00
David A. Velasco
0290523c03 Added icons for file type TEXT 2015-09-15 18:07:59 +02:00
Andy Scherzinger
6eccdc25b3 Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_buttons
Conflicts:
	src/com/owncloud/android/utils/DisplayUtils.java
2015-09-11 13:06:14 +02:00
Marc Plano-Lesay
b4875c69cc Add additional filetype icons 2015-09-09 23:30:09 +02:00
Andy Scherzinger
0234ca22ea Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-09-09 11:42:11 +02:00
Marc Plano-Lesay
502ff0a216 Use new filetype icons 2015-08-31 19:17:05 +02:00
Andy Scherzinger
18811141fb added delete icon files 2015-08-21 17:09:18 +02:00
Andy Scherzinger
7f13b98cc0 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
2015-08-18 23:20:01 +02:00
Andy Scherzinger
da89715045 reverted back to light colored login 2015-08-18 17:48:10 +02:00
tobiasKaminsky
c50aa8bc2a Merge remote-tracking branch 'upstream/video_thumbnail' into video_thumbnail 2015-08-14 15:39:35 +02:00
Andy Scherzinger
a1b24dea37 Merge branch 'master' of https://github.com/owncloud/android into video_thumbnail 2015-08-10 16:02:02 +02:00
Andy Scherzinger
928ce1a8b6 play icon (from google's material icon set) for the various resolutions #1035 2015-08-10 15:56:51 +02:00
Andy Scherzinger
f4445284d0 material checkbox drawables instead of version dependend ones 2015-08-07 18:05:34 +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
b5f8c0b087 changed alignment of drawer's content according to jan's suggestions 2015-08-04 19:02:36 +02:00
AndyScherzinger
77457f276f adding material icons to resolutions < xxhdpi 2015-07-26 19:40:31 +02:00
masensio
378b28f346 Update some file icons 2015-06-23 14:50:02 +02:00
David A. Velasco
36128298d4 Updated file icons with higher resolutions 2015-06-23 14:40:49 +02:00