MMMarcy [Fri, 17 Oct 2014 13:36:48 +0000 (15:36 +0200)]
Readded git link that was erraneously removed by the rebase
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
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
Jenkins for ownCloud [Mon, 27 Oct 2014 05:13:33 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 26 Oct 2014 05:13:34 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 25 Oct 2014 05:13:41 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
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...
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
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
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
David A. Velasco [Wed, 15 Oct 2014 10:57:10 +0000 (12:57 +0200)]
Build with new Android support in Travis
jabarros [Mon, 20 Oct 2014 11:32:01 +0000 (13:32 +0200)]
Update library reference to 0.9.3 version
jabarros [Mon, 20 Oct 2014 10:58:54 +0000 (12:58 +0200)]
Update owncloud android library reference
Jenkins for ownCloud [Mon, 20 Oct 2014 05:14:34 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
tobiasKaminsky [Sat, 18 Oct 2014 08:47:36 +0000 (10:47 +0200)]
- added lgpgl
tobiasKaminsky [Fri, 17 Oct 2014 19:28:48 +0000 (21:28 +0200)]
- requested changes by review by davivel
Jenkins for ownCloud [Fri, 17 Oct 2014 05:13:52 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Thu, 16 Oct 2014 14:14:03 +0000 (16:14 +0200)]
Fix thumbnail generation after successful upload
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
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
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
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.
Jenkins for ownCloud [Thu, 16 Oct 2014 05:14:37 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
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
David A. Velasco [Wed, 15 Oct 2014 10:57:10 +0000 (12:57 +0200)]
Build with new Android support in Travis
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
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
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
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
jabarros [Tue, 14 Oct 2014 13:04:00 +0000 (15:04 +0200)]
Fixed. App crash when setting a path without slash
jabarros [Tue, 14 Oct 2014 12:11:42 +0000 (14:11 +0200)]
Fixed. Upload path is not place correctly in setting view
Jenkins for ownCloud [Wed, 15 Oct 2014 05:13:34 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Tue, 14 Oct 2014 11:19:56 +0000 (13:19 +0200)]
Removed unused import
David A. Velasco [Tue, 14 Oct 2014 11:18:30 +0000 (13:18 +0200)]
Fixed indention, log and copyright issues in DiskLruImageCache
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
Jenkins for ownCloud [Tue, 14 Oct 2014 05:13:35 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Luke Owncloud [Sun, 12 Oct 2014 18:36:34 +0000 (20:36 +0200)]
small changes for building on Linux
Jenkins for ownCloud [Sun, 12 Oct 2014 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
tobiasKaminsky [Sat, 11 Oct 2014 07:14:14 +0000 (09:14 +0200)]
- disabled sort by size until server supports server-side folder size
calculation
Jenkins for ownCloud [Sat, 11 Oct 2014 05:13:34 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
tobiasKaminsky [Fri, 10 Oct 2014 15:13:08 +0000 (17:13 +0200)]
- removed german translation
jabarros [Fri, 10 Oct 2014 13:10:39 +0000 (15:10 +0200)]
Fixed. When removing a file inside a folder and then upload another, thumbnails are not shown correctly
David A. Velasco [Fri, 10 Oct 2014 09:04:37 +0000 (11:04 +0200)]
Merge branch 'develop' into instant_upload_path_chooseable
jabarros [Fri, 10 Oct 2014 08:36:43 +0000 (10:36 +0200)]
Merge pull request #651 from owncloud/load_proxy_settings_from_system
Update reference to ownCloud Android library to use proxy settings from device
Jenkins for ownCloud [Fri, 10 Oct 2014 08:18:14 +0000 (04:18 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Fri, 10 Oct 2014 07:27:49 +0000 (09:27 +0200)]
Update reference to ownCloud Android library
Jenkins for ownCloud [Fri, 10 Oct 2014 05:13:33 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
jabarros [Thu, 9 Oct 2014 15:26:02 +0000 (17:26 +0200)]
Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files
Conflicts:
res/menu/main_menu.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
jabarros [Thu, 9 Oct 2014 15:07:50 +0000 (17:07 +0200)]
Fix. Remove incorrect 'values-tl_PH' folder for allowing project compilation
jabarros [Thu, 9 Oct 2014 11:21:50 +0000 (13:21 +0200)]
Fixed bug. Thmumbnail is not correct when uploading a file in another folder
jabarros [Wed, 8 Oct 2014 11:50:19 +0000 (13:50 +0200)]
Fixed bug. When previewing a big image, sometimes it is not possible load it because there is an out of memory error
Jenkins for ownCloud [Wed, 8 Oct 2014 05:13:40 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Tue, 7 Oct 2014 13:04:16 +0000 (15:04 +0200)]
Some indentation updates
David A. Velasco [Tue, 7 Oct 2014 13:03:54 +0000 (15:03 +0200)]
Consider possible trailing / in input URL in login view
David A. Velasco [Tue, 7 Oct 2014 11:11:23 +0000 (13:11 +0200)]
Some indentation updates
David A. Velasco [Tue, 7 Oct 2014 10:54:31 +0000 (12:54 +0200)]
On refersh of a folder, remove from the local file system the child folders that were deleted in the server
Jenkins for ownCloud [Tue, 7 Oct 2014 05:13:42 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
jabarros [Mon, 6 Oct 2014 12:58:34 +0000 (14:58 +0200)]
Merge branch 'master' of https://github.com/loripino21/android into instant_upload_path_chooseable
Jenkins for ownCloud [Mon, 6 Oct 2014 05:13:33 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 5 Oct 2014 05:13:36 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
tobiasKaminsky [Sat, 4 Oct 2014 10:40:35 +0000 (12:40 +0200)]
- sort dialog shows the right selected item
tobiasKaminsky [Sat, 4 Oct 2014 10:23:16 +0000 (12:23 +0200)]
- persist settings for sort order
Jenkins for ownCloud [Sat, 4 Oct 2014 05:13:31 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 3 Oct 2014 05:13:33 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
jabarros [Thu, 2 Oct 2014 07:04:11 +0000 (09:04 +0200)]
Merge branch 'develop' into release-1.6.0
jabarros [Thu, 2 Oct 2014 07:00:21 +0000 (09:00 +0200)]
Update Log_OC import reference
jabarros [Thu, 2 Oct 2014 06:53:14 +0000 (08:53 +0200)]
Update owncloud library reference
Jenkins for ownCloud [Wed, 1 Oct 2014 23:22:04 +0000 (19:22 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 1 Oct 2014 10:54:48 +0000 (06:54 -0400)]
[tx-robot] updated from transifex
jabarros [Wed, 1 Oct 2014 09:40:16 +0000 (11:40 +0200)]
Merge pull request #632 from wakeup/patch-1
fix owncloud capitalization
Javier Gonzalez [Wed, 1 Oct 2014 09:35:50 +0000 (11:35 +0200)]
Merge pull request #641 from owncloud/thumbnails_for_downloaded_images
Thumbnails for downloaded images
jabarros [Wed, 1 Oct 2014 07:03:15 +0000 (09:03 +0200)]
Changes after CR
jabarros [Wed, 1 Oct 2014 06:34:14 +0000 (08:34 +0200)]
Fixed bug. Video files not previewed on accounts whose id has an space
Javier Gonzalez [Tue, 30 Sep 2014 12:15:31 +0000 (14:15 +0200)]
Merge pull request #642 from owncloud/remove_values_fil_folder
Fix. Remove 'values-fil' folder for allowing the project compilation
jabarros [Tue, 30 Sep 2014 12:04:52 +0000 (14:04 +0200)]
Fix. Remove 'values-fil' for allow the project compilation
Jenkins for ownCloud [Tue, 30 Sep 2014 05:13:36 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
jabarros [Mon, 29 Sep 2014 11:55:28 +0000 (13:55 +0200)]
Add column 'update_thumbnail' to the local files db for controlling the update of the thumbnails when images are updated on the server
Jenkins for ownCloud [Mon, 29 Sep 2014 05:13:33 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 28 Sep 2014 05:13:32 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 27 Sep 2014 05:13:32 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 25 Sep 2014 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
jabarros [Wed, 24 Sep 2014 10:22:06 +0000 (12:22 +0200)]
Fixed bug related with refreshing when moving files