Jorge Antonio Diaz-Benito Soriano [Sat, 29 Nov 2014 20:12:51 +0000 (21:12 +0100)]
Merge remote-tracking branch 'upstream/develop' into us4_view_text_files
jabarros [Fri, 28 Nov 2014 13:25:32 +0000 (14:25 +0100)]
Merge pull request #768 from owncloudChalmers/owncloud_submodule
Change submodule from owncloudChalmers/android-library to owncloud/android-library
Jorge Antonio Diaz-Benito Soriano [Fri, 28 Nov 2014 11:16:34 +0000 (12:16 +0100)]
Change submodule from owncloudChalmers/android-library to ownCloud/android-library
jabarros [Fri, 28 Nov 2014 09:55:39 +0000 (10:55 +0100)]
Update owncloud library reference
jabarros [Fri, 28 Nov 2014 08:10:45 +0000 (09:10 +0100)]
Merge pull request #661 from owncloudChalmers/gradleWithInternalDependency
Gradle support (squashed history)
Jenkins for ownCloud [Fri, 28 Nov 2014 06:13:32 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jorge Antonio Diaz-Benito Soriano [Tue, 25 Nov 2014 20:51:26 +0000 (21:51 +0100)]
Merge remote-tracking branch 'origin/gradleWithInternalDependency' into us4_view_text_files
Conflicts:
.idea/misc.xml
.idea/modules.xml
android.iml
Jorge Antonio Diaz-Benito Soriano [Tue, 25 Nov 2014 20:34:20 +0000 (21:34 +0100)]
Update the submodule version to the restored .gitignore
Jorge Antonio Diaz-Benito Soriano [Tue, 25 Nov 2014 19:46:44 +0000 (20:46 +0100)]
Restore .gitignore and SETUP.md, remove files that were added
Jorge Antonio Diaz-Benito Soriano [Mon, 24 Nov 2014 11:57:02 +0000 (12:57 +0100)]
Merge branch 'gradleWithInternalDependency' into us4_view_text_files
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Jorge Antonio Diaz-Benito Soriano [Mon, 24 Nov 2014 11:37:12 +0000 (12:37 +0100)]
Update submodule to version with updated .gitignore
Jorge Antonio Diaz-Benito Soriano [Mon, 24 Nov 2014 11:17:01 +0000 (12:17 +0100)]
Updated instructions to the continuous presence of the *.iml files
Jorge Antonio Diaz-Benito Soriano [Mon, 24 Nov 2014 10:57:01 +0000 (11:57 +0100)]
Update .gitignore and re-add missing files
Jenkins for ownCloud [Mon, 24 Nov 2014 06:13:31 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 22 Nov 2014 06:13:44 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jorge Antonio Diaz-Benito Soriano [Fri, 21 Nov 2014 15:16:37 +0000 (16:16 +0100)]
Update submodule with the rebased version
Jorge Antonio Diaz-Benito Soriano [Fri, 21 Nov 2014 14:31:14 +0000 (15:31 +0100)]
Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency
Jorge Antonio Diaz-Benito Soriano [Fri, 21 Nov 2014 14:31:04 +0000 (15:31 +0100)]
Update submodule
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:56:08 +0000 (10:56 +0100)]
Merge pull request #722 from ogasser/idn_share_fix
Convert IDN from ASCII to Unicode in Upload Dialog
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
Jorge Antonio Diaz-Benito Soriano [Mon, 17 Nov 2014 13:10:55 +0000 (14:10 +0100)]
Merge remote-tracking branch 'origin/gradleWithInternalDependency' into us4_view_text_files
jabarros [Mon, 17 Nov 2014 13:07:48 +0000 (14:07 +0100)]
Fix crash in Android Lollipop when cliking on refresh the whole account
Luke Owncloud [Sun, 12 Oct 2014 18:36:34 +0000 (20:36 +0200)]
small changes for building on Linux
Conflicts:
SETUP.md
setup_env.sh
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
Jorge Antonio Diaz-Benito Soriano [Mon, 17 Nov 2014 12:36:26 +0000 (13:36 +0100)]
Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency
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
Jorge Antonio Diaz-Benito Soriano [Tue, 4 Nov 2014 15:25:55 +0000 (16:25 +0100)]
Cleanup
Jorge Antonio Diaz-Benito Soriano [Tue, 4 Nov 2014 15:23:14 +0000 (16:23 +0100)]
Track right branch
Jorge Antonio Diaz-Benito Soriano [Tue, 4 Nov 2014 10:20:25 +0000 (11:20 +0100)]
Update Gradle plugin to 0.14 for compatibility with Android Studio 0.9.0
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
Jorge Antonio Diaz-Benito Soriano [Sat, 1 Nov 2014 15:15:44 +0000 (16:15 +0100)]
Update submodule
Jorge Antonio Diaz-Benito Soriano [Sat, 1 Nov 2014 15:08:15 +0000 (16:08 +0100)]
Update Gradle plugin to 0.14 for compatibility with Android Studio 0.9.0
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
Jorge Antonio Diaz-Benito Soriano [Tue, 28 Oct 2014 18:13:03 +0000 (19:13 +0100)]
Merge branch 'us4_view_text_files' of github.com:owncloudChalmers/android into us4_view_text_files
Conflicts:
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Jorge Antonio Diaz-Benito Soriano [Sun, 26 Oct 2014 14:38:57 +0000 (15:38 +0100)]
Fixed a bug that would cause the details view to be shown upon turning off and on the screen
Jorge Antonio Diaz-Benito Soriano [Sun, 26 Oct 2014 09:45:06 +0000 (10:45 +0100)]
Reverted the text preview system to a single TextView
Jorge Antonio Diaz-Benito Soriano [Sun, 26 Oct 2014 08:09:59 +0000 (09:09 +0100)]
Solved 'Share with copied link' flow
Jorge Antonio Diaz-Benito Soriano [Sat, 25 Oct 2014 19:32:38 +0000 (21:32 +0200)]
Removed unnecessary actions
Jorge Antonio Diaz-Benito Soriano [Sat, 25 Oct 2014 19:32:21 +0000 (21:32 +0200)]
Added some margins.
projects / pub / Android / ownCloud.git / log