David A. Velasco [Mon, 26 Jan 2015 10:49:27 +0000 (11:49 +0100)]
Version bump
Jenkins for ownCloud [Mon, 29 Dec 2014 06:13:29 +0000 (01:13 -0500)]
Hotfix on French translation
David A. Velasco [Wed, 21 Jan 2015 11:51:46 +0000 (12:51 +0100)]
Merge pull request #846 from owncloud/usermanual
Add user manual to Android repo
Carla Schroder [Mon, 19 Jan 2015 21:57:23 +0000 (13:57 -0800)]
Add user manual to Android repo
jabarros [Wed, 3 Dec 2014 08:33:07 +0000 (09:33 +0100)]
Merge branch 'release-1.6.2'
jabarros [Wed, 3 Dec 2014 08:31:41 +0000 (09:31 +0100)]
Update owncloud library reference to 0.9.4
David A. Velasco [Wed, 26 Nov 2014 12:10:04 +0000 (13:10 +0100)]
Merge pull request #752 from owncloud/instant_uploads_set_path
Better UI for settings path of instant uploads
jabarros [Wed, 26 Nov 2014 12:06:00 +0000 (13:06 +0100)]
Changed var to parcelable in FolderPickerActivity
jabarros [Wed, 26 Nov 2014 11:51:16 +0000 (12:51 +0100)]
Refactor after CR
jabarros [Wed, 26 Nov 2014 08:05:23 +0000 (09:05 +0100)]
Changes after CR
jabarros [Tue, 25 Nov 2014 13:23:17 +0000 (14:23 +0100)]
Update owncloud library reference
David A. Velasco [Mon, 24 Nov 2014 13:15:38 +0000 (14:15 +0100)]
Update reference to library
jabarros [Mon, 24 Nov 2014 09:54:13 +0000 (10:54 +0100)]
Update owncloud library reference
Jos Poortvliet [Fri, 21 Nov 2014 13:52:15 +0000 (14:52 +0100)]
Update README.md
Linking not to raw MD file but to the nicely formatted one in github :D
David A. Velasco [Fri, 21 Nov 2014 11:40:05 +0000 (12:40 +0100)]
Merge branch 'develop' into release-1.6.2
David A. Velasco [Fri, 21 Nov 2014 11:23:27 +0000 (12:23 +0100)]
Merge pull request #740 from owncloud/revert-669-master
Revert "Add "select all" option to photo (or other) upload screen"
jabarros [Fri, 21 Nov 2014 09:57:38 +0000 (10:57 +0100)]
Merge branch 'develop' into release-1.6.2
jabarros [Fri, 21 Nov 2014 09:56:08 +0000 (10:56 +0100)]
Merge pull request #722 from ogasser/idn_share_fix
Convert IDN from ASCII to Unicode in Upload Dialog
jabarros [Thu, 20 Nov 2014 17:03:33 +0000 (18:03 +0100)]
Update version number and name in oc_jb_workaround subproject
jabarros [Thu, 20 Nov 2014 17:01:05 +0000 (18:01 +0100)]
Update version number and name
jabarros [Thu, 20 Nov 2014 08:39:10 +0000 (09:39 +0100)]
Remove last slash from uploads path (video/image) when showing them on settings view and they are not root folder
Jenkins for ownCloud [Thu, 20 Nov 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Wed, 19 Nov 2014 17:40:06 +0000 (18:40 +0100)]
Merge branch 'develop' into instant_uploads_set_path
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
jabarros [Wed, 19 Nov 2014 09:14:27 +0000 (10:14 +0100)]
Add new preference on settings for setting the upload video path
Raquel [Wed, 19 Nov 2014 08:31:19 +0000 (09:31 +0100)]
Merge branch 'develop' into fix_refresh_account_lollipop
jabarros [Wed, 19 Nov 2014 08:22:12 +0000 (09:22 +0100)]
Remove 'sort' and 'logs' options from action bar menu when showing the selecting upload path folder view
Jenkins for ownCloud [Wed, 19 Nov 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Tue, 18 Nov 2014 14:09:39 +0000 (15:09 +0100)]
When user goes to set the upload path, the folder list view is shown in the current path set
jabarros [Tue, 18 Nov 2014 13:57:19 +0000 (14:57 +0100)]
Create custom Preference ui for truncate automatically the upload folder path in the middle when it is too long
jabarros [Tue, 18 Nov 2014 13:53:41 +0000 (14:53 +0100)]
Remove files_move layout after creating files_folder_picker one
jabarros [Tue, 18 Nov 2014 13:51:49 +0000 (14:51 +0100)]
Create FolderPickerActivity from which MoveActivity and UploadPathActivity extend
jabarros [Tue, 18 Nov 2014 10:01:55 +0000 (11:01 +0100)]
Add view for selecting upload path folder browsing through local file list in preferences view
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
Oliver Gasser [Thu, 13 Nov 2014 23:55:53 +0000 (00:55 +0100)]
Convert IDN from ASCII to Unicode in Upload Dialog
Display IDN host names as Unicode in the FileUpload Dialog. This dialog
is shown when multiple ownCloud accounts are setup and a file is shared
with ownCloud.
Fixes #708.
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:37:45 +0000 (22:37 +0100)]
Revert "Add "select all" option to photo (or other) upload screen"
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
projects / pub / Android / ownCloud.git / log