Commit graph

3901 commits

Author SHA1 Message Date
Andy Scherzinger
75e2349e5b Code review 2015-10-06 09:58:16 +02:00
Andy Scherzinger
8f0ea82efd Fix for #1182 on Android 5 2015-10-05 18:44:50 +02:00
Jenkins for ownCloud
eddd3aa450 [tx-robot] updated from transifex 2015-10-04 01:13:38 -04:00
Jenkins for ownCloud
f056247e75 [tx-robot] updated from transifex 2015-10-03 01:13:37 -04:00
masensio
99d7e18916 Merge pull request #839 from fluffy88/develop
Trigger media scan after file upload
2015-10-01 18:45:01 +02:00
masensio
8090269d55 Merge branch 'master' of github.com:owncloud/android
Conflicts:
	CHANGELOG.md
2015-09-30 10:49:47 +02:00
masensio
5a8f605ed9 Merge branch 'stable' 2015-09-30 10:45:20 +02:00
masensio
df1f824e13 Update Changelog for 1.8 version 2015-09-30 10:43:56 +02:00
Raquel Pérez Bartolomé
6a9f1ad08c Update CHANGELOG.md
Updated 1.8.0 changelog
2015-09-29 15:53:57 +02:00
Jenkins for ownCloud
b6c5188fd0 [tx-robot] updated from transifex 2015-09-29 01:13:58 -04:00
masensio
4316d7082f Remove strings for values-en_DE 2015-09-28 13:57:22 +02:00
masensio
ee9aa68d23 Merge branch 'release-1.8' 2015-09-28 12:33:47 +02:00
Jenkins for ownCloud
9a3872d003 [tx-robot] updated from transifex 2015-09-28 02:33:53 -04:00
David A. Velasco
a38461aaa5 Same style for log-in buttons in potrait and landscape 2015-09-25 13:54:53 +02:00
David A. Velasco
c44ed4980c Fixed lost background color for icon in login view 2015-09-25 11:11:46 +02:00
masensio
9948180550 Merge pull request #1174 from owncloud/release_bug_fixes
Fixed a couple of tiny bugs
2015-09-24 17:33:22 +02:00
David A. Velasco
0c8dfb6e8d Close dangling Cursors in FileContentProvider 2015-09-24 17:06:54 +02:00
David A. Velasco
c7a29bc07b Set default static values to prevent weird crash 2015-09-24 17:06:39 +02:00
David A. Velasco
c8c3e84268 Fix repetition of already finished access to root folder (AsyncTask) on rotation, in log-in view 2015-09-24 16:13:58 +02:00
masensio
a81934a6cc Merge pull request #1171 from owncloud/fix_lock_of_upload_til_generation_of_thumbnails_finishes
Grant that cancellations of tasks generating thumbnails really works …
2015-09-22 12:57:50 +02:00
David A. Velasco
b7bb1ec0e9 Fixed crashed on cancelled download in gallery 2015-09-22 09:29:33 +02:00
Jenkins for ownCloud
92c39be013 [tx-robot] updated from transifex 2015-09-22 01:13:44 -04:00
David A. Velasco
cd165b7ce6 Grant that cancellations of tasks generating thumbnails really works for reused icon views 2015-09-21 21:25:11 +02:00
Jenkins for ownCloud
664450a6bf [tx-robot] updated from transifex 2015-09-21 01:13:34 -04:00
masensio
903497906e Merge pull request #1163 from owncloud/Fix_refreshClickException
Fix refresh click on login screen
2015-09-18 14:18:04 +02:00
Andy Scherzinger
f6b2b856cb Fixed the jumping text on refreshed (status text), aligned the margin of the url field for landscape/portrait, fixed the refresh icon size on landscape - also fixes #192 2015-09-17 11:46:37 +02:00
Jenkins for ownCloud
0cb5cee031 [tx-robot] updated from transifex 2015-09-17 01:13:47 -04:00
masensio
020def3243 Update versionName and versionCode for version 1.8. Also in workaround 2015-09-16 16:54:07 +02:00
masensio
1bee51d263 Merge branch 'release-1.8' of github.com:owncloud/android into release-1.8 2015-09-16 12:55:45 +02:00
masensio
542b7c00b3 Update library reference 2015-09-16 12:55:05 +02:00
masensio
ae0b4e5759 Update library reference 2015-09-16 12:54:28 +02:00
masensio
459bd1e9d0 Merge pull request #1157 from owncloud/fix_file_list_icon_alignment
center aligned the folder icon with the drawer icon
2015-09-16 12:34:30 +02:00
masensio
0083936d40 Merge branch 'fix_file_list_icon_alignment' of github.com:owncloud/android into fix_file_list_icon_alignment 2015-09-16 11:44:51 +02:00
Andy Scherzinger
4c0371f82b center aligned the folder icon with the drawer icon 2015-09-16 11:41:37 +02:00
masensio
359ede5fdd Merge pull request #1149 from owncloud/new_filetype_icons
New icon detection in general + support for additional mimetype icons
2015-09-16 11:39:26 +02:00
David A. Velasco
eaf249803c Removed unneeded LDPI drawables 2015-09-15 18:08:00 +02:00
David A. Velasco
0290523c03 Added icons for file type TEXT 2015-09-15 18:07:59 +02:00
Andy Scherzinger
3ff4d6df0f adapting web's way of choosing icons 2015-09-15 18:02:34 +02:00
David A. Velasco
803f672663 Merge pull request #1155 from owncloud/update_setup_guide
Update setup, changes from the issue #1154
2015-09-15 13:55:57 +02:00
Andy Scherzinger
c6bc82d4fe center aligned the folder icon with the drawer icon 2015-09-14 21:49:45 +02:00
David A. Velasco
2132d8a7c7 Merge pull request #1154 from owncloud/update_share_link_for_OC_8.2
Update share link for oc 8.2
2015-09-14 14:58:28 +02:00
masensio
8ed97d7433 Update setup, changes from the issue #1154 2015-09-14 14:07:05 +02:00
masensio
69e931f0f6 Merge branch 'update_share_link_for_OC_8.2' of github.com:owncloud/android into update_share_link_for_OC_8.2 2015-09-14 13:23:29 +02:00
masensio
a52c4ea968 Update library reference 2015-09-14 13:21:48 +02:00
masensio
26f3917848 Update library reference: get share link 2015-09-14 10:30:54 +02:00
Jenkins for ownCloud
9b8b29d98b [tx-robot] updated from transifex 2015-09-14 01:13:43 -04:00
Jenkins for ownCloud
83eed1a8d8 [tx-robot] updated from transifex 2015-09-12 01:13:45 -04:00
masensio
b256291d4b Update library reference: get share link 2015-09-11 15:05:41 +02:00
David A. Velasco
7182b1d2b1 Merge pull request #1141 from owncloud/559_longpress_filename
Show file name in the contextual menu, see #559
2015-09-11 12:37:04 +02:00
Andy Scherzinger
b1aff42715 further cleanup, moving folder icon determination into util class 2015-09-11 11:15:55 +02:00