pub/Android/ownCloud.git
11 years agouse chooser for sendmail (remove explicit gmail) in LogHistory
Luke Owncloud [Wed, 29 Oct 2014 11:39:44 +0000 (12:39 +0100)]
use chooser for sendmail (remove explicit gmail) in LogHistory

11 years ago- Thumbnail generation also obeys exif tag
tobiasKaminsky [Wed, 29 Oct 2014 06:50:40 +0000 (07:50 +0100)]
- Thumbnail generation also obeys exif tag

11 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

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

11 years agoMinor updates
Jorge Antonio Diaz-Benito Soriano [Tue, 28 Oct 2014 17:43:10 +0000 (18:43 +0100)]
Minor updates

11 years agoFix Linux setup script
Jorge Antonio Diaz-Benito Soriano [Tue, 28 Oct 2014 15:47:28 +0000 (16:47 +0100)]
Fix Linux setup script

11 years agoMerge branch 'gradleWithInternalDependency' of github.com:owncloudChalmers/android...
Jorge Antonio Diaz-Benito Soriano [Tue, 28 Oct 2014 15:13:10 +0000 (16:13 +0100)]
Merge branch 'gradleWithInternalDependency' of github.com:owncloudChalmers/android into gradleWithInternalDependency

Conflicts:
setup_env.sh

11 years agoReadded git link that was erraneously removed by the rebase
MMMarcy [Fri, 17 Oct 2014 13:36:48 +0000 (15:36 +0200)]
Readded git link that was erraneously removed by the rebase

11 years agoCommit for the PR
MMMarcy [Fri, 3 Oct 2014 10:33:41 +0000 (12:33 +0200)]
Commit for the PR

The pull request targets:

1) Introduces Gradle support
2) Updates maven support (even thou the apk generated is not
stable)
3) Updates the setup_env.* scripts to support different building
tools
4) Removes non UTF-8 characters
5) Removes switches on R.id entries (not supported anymore from
ADT >= 14)
6) Introduced a binary dependency (.aar) that replace the actionbarsherlock
sub-module

Remainders:

1) Change the sub-module back to the owncloud android library
once the PR will be merge

11 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

11 years ago- added Comment
tobiasKaminsky [Tue, 28 Oct 2014 13:27:03 +0000 (14:27 +0100)]
- added Comment

11 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

11 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

11 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

11 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

11 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

11 years ago- beautify Timestamps
tobiasKaminsky [Sun, 26 Oct 2014 20:12:45 +0000 (21:12 +0100)]
- beautify Timestamps

11 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

11 years ago- bugfix: video is now playing in fullscreen
tobiasKaminsky [Sat, 25 Oct 2014 16:55:15 +0000 (18:55 +0200)]
- bugfix: video is now playing in fullscreen

11 years ago- obey exif orientation tag
tobiasKaminsky [Sat, 25 Oct 2014 14:51:49 +0000 (16:51 +0200)]
- obey exif orientation tag

11 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

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

11 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

11 years ago-rebase on develop
tobiasKaminsky [Fri, 24 Oct 2014 16:34:39 +0000 (18:34 +0200)]
-rebase on develop

11 years agoMerge remote-tracking branch 'upstream/develop' into fileCount
tobiasKaminsky [Fri, 24 Oct 2014 16:18:06 +0000 (18:18 +0200)]
Merge remote-tracking branch 'upstream/develop' into fileCount

Conflicts:
res/layout/list_fragment.xml
res/values/strings.xml
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java

11 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

11 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...

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 years ago- same threshold
tobiasKaminsky [Wed, 22 Oct 2014 17:41:12 +0000 (19:41 +0200)]
- same threshold

11 years ago- clean up 2
tobiasKaminsky [Wed, 22 Oct 2014 10:41:56 +0000 (12:41 +0200)]
- clean up 2

11 years ago- cleaned up
tobiasKaminsky [Wed, 22 Oct 2014 10:40:17 +0000 (12:40 +0200)]
- cleaned up

11 years ago- moved MediaScan to DownloadFileOperation.
tobiasKaminsky [Wed, 22 Oct 2014 09:20:08 +0000 (11:20 +0200)]
- moved MediaScan to DownloadFileOperation.

11 years ago- fixed wrong project.properties
tobiasKaminsky [Wed, 22 Oct 2014 09:02:48 +0000 (11:02 +0200)]
- fixed wrong project.properties

11 years ago- update to obey non-image files
tobiasKaminsky [Wed, 22 Oct 2014 07:07:08 +0000 (09:07 +0200)]
- update to obey non-image files

11 years agoMerge remote-tracking branch 'upstream/develop' into triggerMediaScan
tobiasKaminsky [Wed, 22 Oct 2014 06:09:47 +0000 (08:09 +0200)]
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan

Conflicts:
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java

11 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

11 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

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

11 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

11 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

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

11 years ago- update folder_public name
tobiasKaminsky [Mon, 20 Oct 2014 17:46:10 +0000 (19:46 +0200)]
- update folder_public name

11 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

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

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

11 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

11 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

11 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

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

11 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

11 years agoAdded initial implementation to download a folder.
Riadh Habbachi [Mon, 20 Oct 2014 03:56:55 +0000 (04:56 +0100)]
Added initial implementation to download a folder.

fixes owncloud/android#308

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

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

11 years ago- minor design changes
tobiasKaminsky [Sun, 19 Oct 2014 06:56:57 +0000 (08:56 +0200)]
- minor design changes

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

11 years agoadded "x folders and y files" to end of list
tobiasKaminsky [Sat, 18 Oct 2014 08:47:08 +0000 (10:47 +0200)]
added "x folders and y files" to end of list

11 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

11 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

11 years agoReadded git link that was erraneously removed by the rebase
MMMarcy [Fri, 17 Oct 2014 13:36:48 +0000 (15:36 +0200)]
Readded git link that was erraneously removed by the rebase

11 years agoMerge remote-tracking branch 'theirs/develop' into gradleWithInternalDependency
MMMarcy [Fri, 17 Oct 2014 12:58:27 +0000 (14:58 +0200)]
Merge remote-tracking branch 'theirs/develop' into gradleWithInternalDependency

Conflicts:
owncloud-android-library
pom.xml

11 years agoCommit for the PR
MMMarcy [Fri, 3 Oct 2014 10:33:41 +0000 (12:33 +0200)]
Commit for the PR

The pull request targets:

1) Introduces Gradle support
2) Updates maven support (even thou the apk generated is not
stable)
3) Updates the setup_env.* scripts to support different building
tools
4) Removes non UTF-8 characters
5) Removes switches on R.id entries (not supported anymore from
ADT >= 14)
6) Introduced a binary dependency (.aar) that replace the actionbarsherlock
sub-module

Remainders:

1) Change the sub-module back to the owncloud android library
once the PR will be merge

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

11 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

11 years agotrigger Media Scan on:
tobiasKaminsky [Fri, 17 Oct 2014 07:35:25 +0000 (09:35 +0200)]
trigger Media Scan on:
- download
- delete local (on list and details)
- delete local & remote (on list and details)

11 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

11 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

11 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

11 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

11 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

11 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.

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

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

11 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

11 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

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

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

11 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.

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

11 years agosmall changes for building on Linux
Luke Owncloud [Sun, 12 Oct 2014 18:36:34 +0000 (20:36 +0200)]
small changes for building on Linux