Commit graph

3978 commits

Author SHA1 Message Date
Jenkins for ownCloud
93b6c37400 [tx-robot] updated from transifex 2015-06-28 01:13:41 -04:00
tobiasKaminsky
57991cb8c4 revert previous commit 2015-06-27 21:48:34 +02:00
tobiasKaminsky
ddb1e41753 enabling video thumbnails 2015-06-27 21:16:03 +02:00
Jenkins for ownCloud
24c564ab5f [tx-robot] updated from transifex 2015-06-27 01:13:58 -04:00
David A. Velasco
bded939b5e Fixed bug in access to same folder than last time when a file is shared with OC to upload 2015-06-26 09:07:51 +02:00
David A. Velasco
9babe1b38c Merge branch 'develop' into release-1.7.2 2015-06-25 14:43:04 +02:00
masensio
51026a0058 Merge pull request #1027 from owncloud/auto_grid_only_with_all_pictures
Auto grid only in folders with only pictures and server with remote thumbnails support
2015-06-25 13:29:50 +02:00
masensio
2019719108 Update library reference 2015-06-25 12:57:12 +02:00
Jorge Antonio Díaz-Benito Soriano
efbab82a6e Moved text load call to onStart 2015-06-25 12:49:45 +02:00
masensio
a818aaca47 Fixed upload of files into non-root folders
Fixed condition selecting grid or list mode - at least an image!
2015-06-25 09:13:37 +02:00
David A. Velasco
907e63a103 Replaced constructor with parameter in FileDetailsFragment with static method and setArguments 2015-06-25 09:10:49 +02:00
David A. Velasco
51a04aa541 Refactored extractions of server version from AccountManager through
AccountUtils; fixed line lengths and some warnings
2015-06-25 09:10:48 +02:00
David A. Velasco
1a3a150248 Automatic grid view is only enabled if server supports remote thumbnails and ALL the files in a folder are images 2015-06-25 09:10:47 +02:00
Jenkins for ownCloud
b4c217b505 [tx-robot] updated from transifex 2015-06-25 01:13:56 -04:00
Jorge Antonio Diaz-Benito Soriano
cc0627db93 Implementation of the requested changes to the asynctask that loads the text 2015-06-24 22:38:39 +02:00
Jorge Antonio Diaz-Benito Soriano
1508e99e9a Added exception logging 2015-06-24 22:24:39 +02:00
Jorge Antonio Diaz-Benito Soriano
4c17d77a6c Added braces to single-line if statements 2015-06-24 22:14:58 +02:00
Jorge Antonio Diaz-Benito Soriano
9a2f6c6c4b Support margins for API levels pre-17 2015-06-24 22:12:36 +02:00
Jenkins for ownCloud
4aed07aae1 [tx-robot] updated from transifex 2015-06-24 01:13:55 -04:00
masensio
378b28f346 Update some file icons 2015-06-23 14:50:02 +02:00
David A. Velasco
8107d9dc4f Fixed wrong format of files & folder count 2015-06-23 14:40:51 +02:00
David A. Velasco
36128298d4 Updated file icons with higher resolutions 2015-06-23 14:40:49 +02:00
Jenkins for ownCloud
51a539f4ee [tx-robot] updated from transifex 2015-06-23 01:14:15 -04:00
masensio
81408f2a71 Update versionName and versionCode in AndroidManifest.xml, for workaround 2015-06-22 15:52:08 +02:00
masensio
fb7692e058 Update versionName and versionCode in AndroidManifest.xml 2015-06-22 15:47:36 +02:00
David A. Velasco
8c5b2b7b13 Merge remote-tracking branch 'origin/release-1.7.2' into release-1.7.2 2015-06-22 14:56:13 +02:00
David A. Velasco
fc2636ddea Update reference to library after merging share update in it 2015-06-22 14:55:44 +02:00
David A. Velasco
bdf2b58865 Merge pull request #1024 from owncloud/fix_shared_by_link_for_server_without_public_uploads
Fix shared by link for server without public uploads
2015-06-22 14:53:47 +02:00
masensio
fb57bbc8c8 Merge pull request #1023 from owncloud/fix_issues_from_Transifex
Message with count of list(s) and folder(s) reestructured for better translations
2015-06-22 14:14:36 +02:00
masensio
2fbd757d66 Merge branch 'develop' into fix_shared_by_link_for_server_without_public_uploads
Conflicts:
	owncloud-android-library
2015-06-22 14:03:21 +02:00
masensio
977cf5514d update minSdkVersion (to 14) in AndroidManifest.xml 2015-06-22 13:57:54 +02:00
masensio
84678c9903 Fix: Import file from other app shows all folders as TextView 2015-06-22 12:58:41 +02:00
David A. Velasco
69a5b6f25d More i18n-friendly format for footer in list of files (no string composition)
Conflicts FIXED:
	res/values/strings.xml
2015-06-22 11:42:37 +02:00
David A. Velasco
8981be0c71 Merge branch 'master' into develop
Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2015-06-22 11:23:05 +02:00
David A. Velasco
f606fe97c5 Merge pull request #999 from owncloud/fix-code-that-never-worked
Use .equals instead of !=
2015-06-22 10:05:38 +02:00
David A. Velasco
c8386e463a Constant first 2015-06-22 09:52:35 +02:00
Jenkins for ownCloud
a860ff6f96 [tx-robot] updated from transifex 2015-06-22 01:13:55 -04:00
Jenkins for ownCloud
37b2991755 [tx-robot] updated from transifex 2015-06-21 01:13:57 -04:00
Jenkins for ownCloud
f6abd41e09 [tx-robot] updated from transifex 2015-06-20 01:14:01 -04:00
masensio
e7710e7383 Update string subject_token and update library reference 2015-06-19 15:11:49 +02:00
Jenkins for ownCloud
f150ccd21c [tx-robot] updated from transifex 2015-06-19 01:13:55 -04:00
Sean
1551a5280a Trigger media scan after file upload
After a successful upload, the uploaded file is saved locally on the
device but the media scan was not getting triggered.
2015-06-18 15:42:06 +01:00
Jenkins for ownCloud
95bdfc0643 [tx-robot] updated from transifex 2015-06-18 01:14:01 -04:00
David A. Velasco
3febfa1e08 Merge pull request #1014 from owncloud/forbidden_characters_from_server
Delegate check of forbidden characters on server, for OC >= 8.1
2015-06-17 09:20:27 +02:00
David A. Velasco
01d039239d Updated reference to library after merging support for forbidden characters in server into develop 2015-06-17 09:15:53 +02:00
Jenkins for ownCloud
122ee28b85 [tx-robot] updated from transifex 2015-06-17 01:13:57 -04:00
masensio
75ea28aefe Update library reference (Code Review) 2015-06-16 15:16:16 +02:00
masensio
935e9d4c34 Update library reference 2015-06-16 10:54:40 +02:00
Jenkins for ownCloud
32470c97eb [tx-robot] updated from transifex 2015-06-16 01:14:07 -04:00
masensio
75fd0f40c6 Merge branch 'develop' into forbidden_characters_from_server
Conflicts:
	owncloud-android-library
	src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
	src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
2015-06-15 14:51:13 +02:00