pub/Android/ownCloud.git
10 years agoThis commit targets https://github.com/owncloud/android/issues/596
Sam [Wed, 5 Nov 2014 13:51:59 +0000 (14:51 +0100)]
This commit targets https://github.com/owncloud/android/issues/596
1. allows multiselect during upload for select applications
2. Added an api check, multiselect is only supported on api level 18+

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 11 Nov 2014 06:13:34 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 10 Nov 2014 06:13:34 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 9 Nov 2014 06:13:35 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 8 Nov 2014 06:13:37 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 7 Nov 2014 06:13:38 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 6 Nov 2014 06:13:41 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

10 years agoMerge pull request #706 from owncloud/christmas_app
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

10 years agoMerge pull request #700 from owncloud/remember_last_share_location_fixed
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

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 5 Nov 2014 06:13:37 +0000 (01:13 -0500)]
[tx-robot] updated from transifex

10 years agoFixed. App crashes when accesing to an account where you have not accessed after...
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

10 years agoMerge pull request #687 from owncloud/thumbnails_from_server
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)

10 years agoFixed. App crashes when selecting an account where you have not accessed yet
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

10 years agoSome clean-up in ThumbnailsCacheManager
David A. Velasco [Mon, 3 Nov 2014 10:30:44 +0000 (11:30 +0100)]
Some clean-up in ThumbnailsCacheManager

10 years agoAdjust the thumbnails size to the size used on screen
David A. Velasco [Mon, 3 Nov 2014 10:27:51 +0000 (11:27 +0100)]
Adjust the thumbnails size to the size used on screen

10 years agoMerge branch 'develop' into christmas_app
jabarros [Mon, 3 Nov 2014 09:41:49 +0000 (10:41 +0100)]
Merge branch 'develop' into christmas_app

10 years agoUpdate getSeasonalId method on DisplayUtils class for not changing the app icon on...
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

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 1 Nov 2014 05:13:35 +0000 (01:13 -0400)]
[tx-robot] updated from transifex

10 years agoMerge branch 'remember_last_share_location' into remember_last_share_location_fixed
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

10 years agoEnable 'up' navigation from home button
David A. Velasco [Fri, 31 Oct 2014 14:20:48 +0000 (15:20 +0100)]
Enable 'up' navigation from home button

10 years agoFixed crash and remembered location when there are multiple accounts
David A. Velasco [Fri, 31 Oct 2014 14:08:08 +0000 (15:08 +0100)]
Fixed crash and remembered location when there are multiple accounts

10 years agoCrash in Android < 3 fixed: getSupportActionBar() instead of getActionBar()
David A. Velasco [Fri, 31 Oct 2014 14:06:45 +0000 (15:06 +0100)]
Crash in Android < 3 fixed: getSupportActionBar() instead of getActionBar()

10 years agoFix. Update the way of setting the needed of update a thumbnail when the image change...
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

10 years agoFixed. When an image is updated in the server and app folder is refreshed, the thumbn...
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

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 31 Oct 2014 05:13:34 +0000 (01:13 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #697 from owncloud/fix_https_access_via_proxy
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

10 years agoUpdate 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

10 years agoBugfix
tobiasKaminsky [Thu, 30 Oct 2014 07:20:55 +0000 (08:20 +0100)]
Bugfix

10 years agoMerge pull request #669 from grecep/master
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

10 years agoMerge pull request #686 from tobiasKaminsky/bugfixMultipleSelect
jabarros [Wed, 29 Oct 2014 17:09:16 +0000 (18:09 +0100)]
Merge pull request #686 from tobiasKaminsky/bugfixMultipleSelect

Bugfix multiple select

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 29 Oct 2014 05:13:41 +0000 (01:13 -0400)]
[tx-robot] updated from transifex

10 years agoremoved unnecessary code
grecep [Tue, 28 Oct 2014 19:50:09 +0000 (20:50 +0100)]
removed unnecessary code

10 years agoMerge pull request #673 from owncloud/idn_hosts
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

10 years agoMerge branch 'develop' into idn_hosts
jabarros [Tue, 28 Oct 2014 12:27:32 +0000 (13:27 +0100)]
Merge branch 'develop' into idn_hosts

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 28 Oct 2014 05:13:38 +0000 (01:13 -0400)]
[tx-robot] updated from transifex

10 years agoMerge branch 'develop' into thumbnails_from_server
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

10 years agoAdd check of server version before requesting remote thumbnails
jabarros [Mon, 27 Oct 2014 11:36:11 +0000 (12:36 +0100)]
Add check of server version before requesting remote thumbnails

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 27 Oct 2014 05:13:33 +0000 (01:13 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 26 Oct 2014 05:13:34 +0000 (01:13 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 25 Oct 2014 05:13:41 +0000 (01:13 -0400)]
[tx-robot] updated from transifex

10 years agorebase
tobiasKaminsky [Fri, 24 Oct 2014 16:45:09 +0000 (18:45 +0200)]
rebase

10 years agoMerge remote-tracking branch 'upstream/develop' into
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

10 years agoMerge branch 'master' into develop
David A. Velasco [Fri, 24 Oct 2014 13:24:50 +0000 (15:24 +0200)]
Merge branch 'master' into develop

10 years agoMerge pull request #675 from owncloud/hotfix_full_sync_ignoring_etag oc-android-1.6.1
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...

10 years agoMerge branch 'thumbnails_from_server' of https://github.com/tobiasKaminsky/android...
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

10 years agoMerge pull request #676 from owncloud/sorting_files
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

10 years agoBump workaround app version to 1.0.19
David A. Velasco [Fri, 24 Oct 2014 08:52:41 +0000 (10:52 +0200)]
Bump workaround app version to 1.0.19

10 years agoBump app version to 1.6.1
David A. Velasco [Fri, 24 Oct 2014 08:51:40 +0000 (10:51 +0200)]
Bump app version to 1.6.1

10 years agoFull-account synchronization should never fetch the contents of a folder
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

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 24 Oct 2014 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex

10 years agoFixed. When trying to open the app in Galaxy mini 2, a crash appears
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

10 years agoFixed. In devices with Android 2.x 'Sort' option in menu has not icon related
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

10 years agoMerge branch 'develop' into idn_hosts
jabarros [Thu, 23 Oct 2014 09:20:09 +0000 (11:20 +0200)]
Merge branch 'develop' into idn_hosts

10 years agoAdd comment removed when fixing conflict in merge
jabarros [Thu, 23 Oct 2014 09:16:31 +0000 (11:16 +0200)]
Add comment removed when fixing conflict in merge

10 years agoMerge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting...
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

10 years agoMerge branch 'develop' into sorting_files_2
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

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 23 Oct 2014 05:13:40 +0000 (01:13 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 22 Oct 2014 05:14:52 +0000 (01:14 -0400)]
[tx-robot] updated from transifex

10 years agoRemoves remember last share location setting
Magnus Sjoqvist [Tue, 21 Oct 2014 15:27:47 +0000 (17:27 +0200)]
Removes remember last share location setting

10 years agoRemoves translations
Magnus Sjoqvist [Tue, 21 Oct 2014 14:17:00 +0000 (16:17 +0200)]
Removes translations

10 years agoMerge pull request #653 from LukeOwncloud/develop
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

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 21 Oct 2014 05:15:22 +0000 (01:15 -0400)]
[tx-robot] updated from transifex

10 years ago- added requested changes
tobiasKaminsky [Mon, 20 Oct 2014 17:52:12 +0000 (19:52 +0200)]
- added requested changes

10 years agoMerge branch 'master' into develop
jabarros [Mon, 20 Oct 2014 12:54:46 +0000 (14:54 +0200)]
Merge branch 'master' into develop

Conflicts:
owncloud-android-library

10 years agoFixed log import
Magnus Sjoqvist [Mon, 20 Oct 2014 12:48:06 +0000 (14:48 +0200)]
Fixed log import

10 years agoMerge with develop
Magnus Sjoqvist [Mon, 20 Oct 2014 12:38:13 +0000 (14:38 +0200)]
Merge with develop

10 years agoMerge pull request #658 from owncloud/instant_upload_path_chooseable
David A. Velasco [Mon, 20 Oct 2014 11:56:18 +0000 (13:56 +0200)]
Merge pull request #658 from owncloud/instant_upload_path_chooseable

Instant upload path chooseable

10 years agoBuild with new Android support in Travis
David A. Velasco [Wed, 15 Oct 2014 10:57:10 +0000 (12:57 +0200)]
Build with new Android support in Travis

10 years agoUpdate library reference to 0.9.3 version oc-android-1.6.0
jabarros [Mon, 20 Oct 2014 11:32:01 +0000 (13:32 +0200)]
Update library reference to 0.9.3 version

10 years agoUpdate owncloud android library reference
jabarros [Mon, 20 Oct 2014 10:58:54 +0000 (12:58 +0200)]
Update owncloud android library reference

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 20 Oct 2014 05:14:34 +0000 (01:14 -0400)]
[tx-robot] updated from transifex

10 years ago- bugfix
tobiasKaminsky [Sun, 19 Oct 2014 17:36:04 +0000 (19:36 +0200)]
- bugfix

10 years ago- fix bug
tobiasKaminsky [Sun, 19 Oct 2014 17:33:31 +0000 (19:33 +0200)]
- fix bug

10 years ago- added lgpgl
tobiasKaminsky [Sat, 18 Oct 2014 08:47:36 +0000 (10:47 +0200)]
- added lgpgl

10 years ago- Using Uri.encode...
tobiasKaminsky [Fri, 17 Oct 2014 19:54:01 +0000 (21:54 +0200)]
- Using Uri.encode...
- Thumbnail size is set to 32dp

10 years ago- requested changes by review by davivel
tobiasKaminsky [Fri, 17 Oct 2014 19:28:48 +0000 (21:28 +0200)]
- requested changes by review by davivel

10 years agoMerge with develop
Magnus Sjoqvist [Fri, 17 Oct 2014 09:06:30 +0000 (11:06 +0200)]
Merge with develop

10 years agoAdded check for that the last upload folder still exists
Magnus Sjoqvist [Tue, 14 Oct 2014 09:21:50 +0000 (11:21 +0200)]
Added check for that the last upload folder still exists

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 17 Oct 2014 05:13:52 +0000 (01:13 -0400)]
[tx-robot] updated from transifex

10 years agoFix thumbnail generation after successful upload
David A. Velasco [Thu, 16 Oct 2014 14:14:03 +0000 (16:14 +0200)]
Fix thumbnail generation after successful upload

10 years agoFix glitch in reuse of thumbnails after crossed rename of files in the server side
David A. Velasco [Thu, 16 Oct 2014 14:13:17 +0000 (16:13 +0200)]
Fix glitch in reuse of thumbnails after crossed rename of files in the server side

10 years agoFixed. File is not downloaded in the end, when adding a slash at the end of the path
jabarros [Thu, 16 Oct 2014 12:13:09 +0000 (14:13 +0200)]
Fixed. File is not downloaded in the end, when adding a slash at the end of the path

10 years agoFix lost update of remoteId when file is sync'ed after being replaced in server by...
David A. Velasco [Thu, 16 Oct 2014 11:11:32 +0000 (13:11 +0200)]
Fix lost update of remoteId when file is sync'ed after being replaced in server by other one

10 years agoFixed. App crashes when changing the path and not going to the file list. Rename...
jabarros [Thu, 16 Oct 2014 07:49:00 +0000 (09:49 +0200)]
Fixed. App crashes when changing the path and not going to the file list. Rename some methods.

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 16 Oct 2014 05:14:37 +0000 (01:14 -0400)]
[tx-robot] updated from transifex

10 years agoFixed. The thumbnail of the just uploaded image is refreshed when it is not necessary
jabarros [Wed, 15 Oct 2014 16:36:39 +0000 (18:36 +0200)]
Fixed. The thumbnail of the just uploaded image is refreshed when it is not necessary

10 years agoBuild with new Android support in Travis
David A. Velasco [Wed, 15 Oct 2014 10:57:10 +0000 (12:57 +0200)]
Build with new Android support in Travis

10 years agoThumbnails cache initialized in MainApp context to grant it is done even if the app...
David A. Velasco [Wed, 15 Oct 2014 10:29:41 +0000 (12:29 +0200)]
Thumbnails cache initialized in MainApp context to grant it is done even if the app wasn't opened, for the case of background synchronizations

10 years agoMerge branch 'idn_hosts' of https://github.com/ogasser/android into idn_hosts
jabarros [Wed, 15 Oct 2014 10:20:49 +0000 (12:20 +0200)]
Merge branch 'idn_hosts' of https://github.com/ogasser/android into idn_hosts

Conflicts:
src/com/owncloud/android/authentication/AuthenticatorActivity.java

10 years agoCreation of ThumbnailsCacheManager class, grouping all the methods needed to access...
David A. Velasco [Wed, 15 Oct 2014 09:25:29 +0000 (11:25 +0200)]
Creation of ThumbnailsCacheManager class, grouping all the methods needed to access the thumbnails cache

10 years agoFixed. When define as instant upload path a path that does not exist, a crash is...
jabarros [Wed, 15 Oct 2014 09:21:37 +0000 (11:21 +0200)]
Fixed. When define as instant upload path a path that does not exist, a crash is gotten

10 years agoFixed. App crash when setting a path without slash
jabarros [Tue, 14 Oct 2014 13:04:00 +0000 (15:04 +0200)]
Fixed. App crash when setting a path without slash

10 years agoFixed. Upload path is not place correctly in setting view
jabarros [Tue, 14 Oct 2014 12:11:42 +0000 (14:11 +0200)]
Fixed. Upload path is not place correctly in setting view

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 15 Oct 2014 05:13:34 +0000 (01:13 -0400)]
[tx-robot] updated from transifex

10 years agoRemoved unused import
David A. Velasco [Tue, 14 Oct 2014 11:19:56 +0000 (13:19 +0200)]
Removed unused import

10 years agoFixed indention, log and copyright issues in DiskLruImageCache
David A. Velasco [Tue, 14 Oct 2014 11:18:30 +0000 (13:18 +0200)]
Fixed indention, log and copyright issues in DiskLruImageCache

10 years agoUse hash ok keys as actual key in thumbnails cache instead of custom transformed key
David A. Velasco [Tue, 14 Oct 2014 11:16:32 +0000 (13:16 +0200)]
Use hash ok keys as actual key in thumbnails cache instead of custom transformed key

10 years agoFixed imports and added comments
Sam [Fri, 10 Oct 2014 13:27:54 +0000 (15:27 +0200)]
Fixed imports and added comments

10 years agoFixed merge
Magnus Sjoqvist [Fri, 10 Oct 2014 09:13:25 +0000 (11:13 +0200)]
Fixed merge

10 years agoAdded feature for remembering last upload location when sharing a file. Also added...
Magnus Sjoqvist [Wed, 8 Oct 2014 13:15:57 +0000 (15:15 +0200)]
Added feature for remembering last upload location when sharing a file. Also added an option to turn it off in prefrences.