Jenkins for ownCloud [Thu, 20 Nov 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Wed, 19 Nov 2014 10:26:27 +0000 (11:26 +0100)]
Merge pull request #721 from owncloud/nea_upload_files
Fix upload of files from DocumentsProvider in Android > 4.4
David A. Velasco [Wed, 19 Nov 2014 10:11:15 +0000 (11:11 +0100)]
Merge branch 'develop' into nea_upload_files
David A. Velasco [Wed, 19 Nov 2014 10:05:32 +0000 (11:05 +0100)]
Fix failed uploads when display name of file brough from external apps includes separator or path-separator characters
David A. Velasco [Wed, 19 Nov 2014 09:50:36 +0000 (10:50 +0100)]
Merge pull request #736 from owncloud/fix_refresh_account_lollipop
Fix 'refresh account' action in Lollipop
Raquel [Wed, 19 Nov 2014 08:31:19 +0000 (09:31 +0100)]
Merge branch 'develop' into fix_refresh_account_lollipop
Jenkins for ownCloud [Wed, 19 Nov 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Tue, 18 Nov 2014 09:35:52 +0000 (10:35 +0100)]
Fix errors in Frechn translations and reaname var in FileDisplayActivity
jabarros [Tue, 18 Nov 2014 09:22:04 +0000 (10:22 +0100)]
Merge branch 'develop' into nea_upload_files
Jenkins for ownCloud [Tue, 18 Nov 2014 06:13:34 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Mon, 17 Nov 2014 14:26:08 +0000 (15:26 +0100)]
Merge pull request #729 from owncloud/tls_v1.1_and_v1.2_support
Update reference to library after upgrading TLS support
David A. Velasco [Mon, 17 Nov 2014 14:18:22 +0000 (15:18 +0100)]
Update reference to library after upgrading TLS support
jabarros [Mon, 17 Nov 2014 13:07:48 +0000 (14:07 +0100)]
Fix crash in Android Lollipop when cliking on refresh the whole account
jabarros [Mon, 17 Nov 2014 12:51:04 +0000 (13:51 +0100)]
Update library reference
jabarros [Mon, 17 Nov 2014 12:49:17 +0000 (13:49 +0100)]
Merge branch 'develop' into nea_upload_files
jabarros [Mon, 17 Nov 2014 10:32:46 +0000 (11:32 +0100)]
Refactoring to avoid maintenance after CR
Jenkins for ownCloud [Mon, 17 Nov 2014 06:13:35 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 15 Nov 2014 06:13:35 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Thu, 13 Nov 2014 11:21:49 +0000 (12:21 +0100)]
Merge pull request #685 from tobiasKaminsky/beautifyTimestamps
Relative time stamps in the list of files.
tobiasKaminsky [Thu, 13 Nov 2014 09:10:57 +0000 (10:10 +0100)]
- reference bug 716
Jenkins for ownCloud [Thu, 13 Nov 2014 06:13:37 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Wed, 12 Nov 2014 15:07:37 +0000 (16:07 +0100)]
Get file mimeType and pass it for being checked on UploadFileOperation class. Take into account if file extension comes in content Uri
tobiasKaminsky [Wed, 12 Nov 2014 13:51:56 +0000 (14:51 +0100)]
fix Problem with < Android 3.0
jabarros [Wed, 12 Nov 2014 11:46:33 +0000 (12:46 +0100)]
Create static var for defining 'content://' String into FileDisplayActivity and delete some unnecessary comments
David A. Velasco [Wed, 12 Nov 2014 08:29:28 +0000 (09:29 +0100)]
Merge pull request #683 from tobiasKaminsky/videoFullsize
Bugfix: video is now playing in fullscreen
tobiasKaminsky [Wed, 12 Nov 2014 08:02:23 +0000 (09:02 +0100)]
Merge remote-tracking branch 'upstream/develop' into beautifyTimestamps
Conflicts:
src/com/owncloud/android/utils/DisplayUtils.java
tobiasKaminsky [Wed, 12 Nov 2014 07:56:53 +0000 (08:56 +0100)]
< 60 seconds -> "seconds ago"
jabarros [Wed, 12 Nov 2014 07:46:29 +0000 (08:46 +0100)]
Modify kitkat document provider implementation in order to cover all 'content://' cases
Jenkins for ownCloud [Wed, 12 Nov 2014 06:13:41 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Tue, 11 Nov 2014 11:27:57 +0000 (12:27 +0100)]
Add workaround for Drive app in which a creation of a temporal copy is needed
Jenkins for ownCloud [Tue, 11 Nov 2014 06:13:34 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Mon, 10 Nov 2014 19:14:45 +0000 (20:14 +0100)]
- use match_parent instead
Jenkins for ownCloud [Mon, 10 Nov 2014 06:13:34 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 9 Nov 2014 06:13:35 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Sat, 8 Nov 2014 07:45:09 +0000 (08:45 +0100)]
fix scenario 1
Jenkins for ownCloud [Sat, 8 Nov 2014 06:13:37 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Fri, 7 Nov 2014 13:57:47 +0000 (14:57 +0100)]
Include impelementation of Storage Access Framework when device is KITKAT or over
Jenkins for ownCloud [Fri, 7 Nov 2014 06:13:38 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 6 Nov 2014 06:13:41 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Wed, 5 Nov 2014 08:09:48 +0000 (09:09 +0100)]
Merge pull request #706 from owncloud/christmas_app
Winter holidays fix
jabarros [Wed, 5 Nov 2014 07:36:16 +0000 (08:36 +0100)]
Merge pull request #700 from owncloud/remember_last_share_location_fixed
Remember last share location
Jenkins for ownCloud [Wed, 5 Nov 2014 06:13:37 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Tue, 4 Nov 2014 10:15:59 +0000 (11:15 +0100)]
Fixed. App crashes when accesing to an account where you have not accessed after uploading a file in another
David A. Velasco [Mon, 3 Nov 2014 12:38:58 +0000 (13:38 +0100)]
Merge pull request #687 from owncloud/thumbnails_from_server
Get remote thumbnails from server (OC8)
jabarros [Mon, 3 Nov 2014 12:00:13 +0000 (13:00 +0100)]
Fixed. App crashes when selecting an account where you have not accessed yet
David A. Velasco [Mon, 3 Nov 2014 10:30:44 +0000 (11:30 +0100)]
Some clean-up in ThumbnailsCacheManager
David A. Velasco [Mon, 3 Nov 2014 10:27:51 +0000 (11:27 +0100)]
Adjust the thumbnails size to the size used on screen
jabarros [Mon, 3 Nov 2014 09:41:49 +0000 (10:41 +0100)]
Merge branch 'develop' into christmas_app
jabarros [Mon, 3 Nov 2014 09:37:56 +0000 (10:37 +0100)]
Update getSeasonalId method on DisplayUtils class for not changing the app icon on branded clients
Jenkins for ownCloud [Sat, 1 Nov 2014 05:13:35 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Fri, 31 Oct 2014 14:23:59 +0000 (15:23 +0100)]
Merge branch 'remember_last_share_location' into remember_last_share_location_fixed
David A. Velasco [Fri, 31 Oct 2014 14:20:48 +0000 (15:20 +0100)]
Enable 'up' navigation from home button
David A. Velasco [Fri, 31 Oct 2014 14:08:08 +0000 (15:08 +0100)]
Fixed crash and remembered location when there are multiple accounts
David A. Velasco [Fri, 31 Oct 2014 14:06:45 +0000 (15:06 +0100)]
Crash in Android < 3 fixed: getSupportActionBar() instead of getActionBar()
jabarros [Fri, 31 Oct 2014 12:52:26 +0000 (13:52 +0100)]
Fix. Update the way of setting the needed of update a thumbnail when the image changes on the server
jabarros [Fri, 31 Oct 2014 12:30:26 +0000 (13:30 +0100)]
Fixed. When an image is updated in the server and app folder is refreshed, the thumbnail does not change and it is not updated
Jenkins for ownCloud [Fri, 31 Oct 2014 05:13:34 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
jabarros [Thu, 30 Oct 2014 13:33:58 +0000 (14:33 +0100)]
Merge pull request #697 from owncloud/fix_https_access_via_proxy
Update reference to library with bugfix
David A. Velasco [Thu, 30 Oct 2014 13:26:58 +0000 (14:26 +0100)]
Update reference to library with bugfix
tobiasKaminsky [Thu, 30 Oct 2014 07:20:55 +0000 (08:20 +0100)]
Bugfix
grecep [Wed, 29 Oct 2014 21:29:38 +0000 (22:29 +0100)]
Merge pull request #669 from grecep/master
Add "select all" option to photo (or other) upload screen
jabarros [Wed, 29 Oct 2014 17:09:16 +0000 (18:09 +0100)]
Merge pull request #686 from tobiasKaminsky/bugfixMultipleSelect
Bugfix multiple select
Jenkins for ownCloud [Wed, 29 Oct 2014 05:13:41 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
grecep [Tue, 28 Oct 2014 19:50:09 +0000 (20:50 +0100)]
removed unnecessary code
David A. Velasco [Tue, 28 Oct 2014 13:35:06 +0000 (14:35 +0100)]
Merge pull request #673 from owncloud/idn_hosts
Suuport for URLs to ownCloud servers running on IDN
jabarros [Tue, 28 Oct 2014 12:27:32 +0000 (13:27 +0100)]
Merge branch 'develop' into idn_hosts
Jenkins for ownCloud [Tue, 28 Oct 2014 05:13:38 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
jabarros [Mon, 27 Oct 2014 14:12:48 +0000 (15:12 +0100)]
Merge branch 'develop' into thumbnails_from_server
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
jabarros [Mon, 27 Oct 2014 11:36:11 +0000 (12:36 +0100)]
Add check of server version before requesting remote thumbnails
Jenkins for ownCloud [Mon, 27 Oct 2014 05:13:33 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
tobiasKaminsky [Sun, 26 Oct 2014 20:12:45 +0000 (21:12 +0100)]
- beautify Timestamps
Jenkins for ownCloud [Sun, 26 Oct 2014 05:13:34 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
tobiasKaminsky [Sat, 25 Oct 2014 16:55:15 +0000 (18:55 +0200)]
- bugfix: video is now playing in fullscreen
Jenkins for ownCloud [Sat, 25 Oct 2014 05:13:41 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
tobiasKaminsky [Fri, 24 Oct 2014 16:45:09 +0000 (18:45 +0200)]
rebase
tobiasKaminsky [Fri, 24 Oct 2014 16:44:04 +0000 (18:44 +0200)]
Merge remote-tracking branch 'upstream/develop' into
bugfixMultipleSelect
Conflicts:
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
David A. Velasco [Fri, 24 Oct 2014 13:24:50 +0000 (15:24 +0200)]
Merge branch 'master' into develop
jabarros [Fri, 24 Oct 2014 12:38:30 +0000 (14:38 +0200)]
Merge pull request #675 from owncloud/hotfix_full_sync_ignoring_etag
HOTFIX - Full-account synchronization should never fetch the contents of a folder...
jabarros [Fri, 24 Oct 2014 11:38:03 +0000 (13:38 +0200)]
Merge branch 'thumbnails_from_server' of https://github.com/tobiasKaminsky/android into thumbnails_from_server
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
David A. Velasco [Fri, 24 Oct 2014 11:24:35 +0000 (13:24 +0200)]
Merge pull request #676 from owncloud/sorting_files
Added sorting by name or date
David A. Velasco [Fri, 24 Oct 2014 08:52:41 +0000 (10:52 +0200)]
Bump workaround app version to 1.0.19
David A. Velasco [Fri, 24 Oct 2014 08:51:40 +0000 (10:51 +0200)]
Bump app version to 1.6.1
David A. Velasco [Fri, 24 Oct 2014 08:12:40 +0000 (10:12 +0200)]
Full-account synchronization should never fetch the contents of a folder
if its eTag did not change
Jenkins for ownCloud [Fri, 24 Oct 2014 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
jabarros [Thu, 23 Oct 2014 16:06:59 +0000 (18:06 +0200)]
Fixed. When trying to open the app in Galaxy mini 2, a crash appears
jabarros [Thu, 23 Oct 2014 16:05:28 +0000 (18:05 +0200)]
Fixed. In devices with Android 2.x 'Sort' option in menu has not icon related
jabarros [Thu, 23 Oct 2014 09:20:09 +0000 (11:20 +0200)]
Merge branch 'develop' into idn_hosts
jabarros [Thu, 23 Oct 2014 09:16:31 +0000 (11:16 +0200)]
Add comment removed when fixing conflict in merge
jabarros [Thu, 23 Oct 2014 09:06:05 +0000 (11:06 +0200)]
Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files_2
Conflicts:
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
jabarros [Thu, 23 Oct 2014 08:18:20 +0000 (10:18 +0200)]
Merge branch 'develop' into sorting_files_2
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
Jenkins for ownCloud [Thu, 23 Oct 2014 05:13:40 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 22 Oct 2014 05:14:52 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
Magnus Sjoqvist [Tue, 21 Oct 2014 15:27:47 +0000 (17:27 +0200)]
Removes remember last share location setting
Magnus Sjoqvist [Tue, 21 Oct 2014 14:17:00 +0000 (16:17 +0200)]
Removes translations
David A. Velasco [Tue, 21 Oct 2014 11:22:08 +0000 (13:22 +0200)]
Merge pull request #653 from LukeOwncloud/develop
Small improvements in build instructions for Linux
Jenkins for ownCloud [Tue, 21 Oct 2014 05:15:22 +0000 (01:15 -0400)]
[tx-robot] updated from transifex
tobiasKaminsky [Mon, 20 Oct 2014 17:52:12 +0000 (19:52 +0200)]
- added requested changes
jabarros [Mon, 20 Oct 2014 12:54:46 +0000 (14:54 +0200)]
Merge branch 'master' into develop
Conflicts:
owncloud-android-library
Magnus Sjoqvist [Mon, 20 Oct 2014 12:48:06 +0000 (14:48 +0200)]
Fixed log import
Magnus Sjoqvist [Mon, 20 Oct 2014 12:38:13 +0000 (14:38 +0200)]
Merge with develop
projects / pub / Android / ownCloud.git / log