2728 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jenkins for ownCloud	4ab6d85c47	[tx-robot] updated from transifex	2014-11-07 01:13:38 -05:00
Jenkins for ownCloud	5b37b99af3	[tx-robot] updated from transifex	2014-11-06 01:13:41 -05:00
David A. Velasco	80cfc55fda	Merge pull request #706 from owncloud/christmas_app ... Winter holidays fix	2014-11-05 09:09:48 +01:00
jabarros	eb77fe1da1	Merge pull request #700 from owncloud/remember_last_share_location_fixed ... Remember last share location	2014-11-05 08:36:16 +01:00
Jenkins for ownCloud	02b8ac0d91	[tx-robot] updated from transifex	2014-11-05 01:13:37 -05:00
Jorge Antonio Diaz-Benito Soriano	1c5416e4cd	Cleanup	2014-11-04 16:25:55 +01:00
Jorge Antonio Diaz-Benito Soriano	f202094286	Track right branch	2014-11-04 16:23:14 +01:00
Jorge Antonio Diaz-Benito Soriano	244758e850	Update Gradle plugin to 0.14 for compatibility with Android Studio 0.9.0	2014-11-04 11:20:25 +01:00
jabarros	2790c2379d	Fixed. App crashes when accesing to an account where you have not accessed after uploading a file in another	2014-11-04 11:15:59 +01:00
David A. Velasco	183cd732d0	Merge pull request #687 from owncloud/thumbnails_from_server ... Get remote thumbnails from server (OC8)	2014-11-03 13:38:58 +01:00
jabarros	7283f54158	Fixed. App crashes when selecting an account where you have not accessed yet	2014-11-03 13:00:13 +01:00
David A. Velasco	58040881bd	Some clean-up in ThumbnailsCacheManager	2014-11-03 11:30:44 +01:00
David A. Velasco	a09a837585	Adjust the thumbnails size to the size used on screen	2014-11-03 11:27:51 +01:00
jabarros	e53c6001dd	Merge branch 'develop' into christmas_app	2014-11-03 10:41:49 +01:00
jabarros	9f1dd62c90	Update getSeasonalId method on DisplayUtils class for not changing the app icon on branded clients	2014-11-03 10:37:56 +01:00
Jorge Antonio Diaz-Benito Soriano	bade3b9f6c	Update submodule	2014-11-01 16:15:44 +01:00
Jorge Antonio Diaz-Benito Soriano	9316ce96ac	Update Gradle plugin to 0.14 for compatibility with Android Studio 0.9.0	2014-11-01 16:08:15 +01:00
Jenkins for ownCloud	8de92ba3b0	[tx-robot] updated from transifex	2014-11-01 01:13:35 -04:00
David A. Velasco	0bedcb9128	Merge branch 'remember_last_share_location' into remember_last_share_location_fixed	2014-10-31 15:23:59 +01:00
David A. Velasco	87aa0fcfb7	Enable 'up' navigation from home button	2014-10-31 15:20:48 +01:00
David A. Velasco	dbd981f012	Fixed crash and remembered location when there are multiple accounts	2014-10-31 15:08:08 +01:00
David A. Velasco	9709593ccf	Crash in Android < 3 fixed: getSupportActionBar() instead of getActionBar()	2014-10-31 15:06:45 +01:00
jabarros	f345e3fed2	Fix. Update the way of setting the needed of update a thumbnail when the image changes on the server	2014-10-31 13:52:26 +01:00
jabarros	639d122721	Fixed. When an image is updated in the server and app folder is refreshed, the thumbnail does not change and it is not updated	2014-10-31 13:30:26 +01:00
Jenkins for ownCloud	ca0eac841a	[tx-robot] updated from transifex	2014-10-31 01:13:34 -04:00
jabarros	0a39462210	Merge pull request #697 from owncloud/fix_https_access_via_proxy ... Update reference to library with bugfix	2014-10-30 14:33:58 +01:00
David A. Velasco	c71b0de051	Update reference to library with bugfix	2014-10-30 14:26:58 +01:00
tobiasKaminsky	595a63bc39	Bugfix	2014-10-30 08:20:55 +01:00
grecep	31ffae0093	Revert "Add "select all" option to photo (or other) upload screen"	2014-10-29 22:37:45 +01:00
grecep	fd7a940dee	Merge pull request #669 from grecep/master ... Add "select all" option to photo (or other) upload screen	2014-10-29 22:29:38 +01:00
jabarros	945c584f34	Merge pull request #686 from tobiasKaminsky/bugfixMultipleSelect ... Bugfix multiple select	2014-10-29 18:09:16 +01:00
Jenkins for ownCloud	068b826b32	[tx-robot] updated from transifex	2014-10-29 01:13:41 -04:00
grecep	8d29b6318c	removed unnecessary code	2014-10-28 20:50:09 +01:00
Jorge Antonio Diaz-Benito Soriano	073e7e46bd	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	2014-10-28 19:13:03 +01:00
Jorge Antonio Diaz-Benito Soriano	b1ef5d94d4	Fixed a bug that would cause the details view to be shown upon turning off and on the screen	2014-10-28 19:11:31 +01:00
Jorge Antonio Diaz-Benito Soriano	093bf4fb5c	Reverted the text preview system to a single TextView	2014-10-28 19:11:31 +01:00
Jorge Antonio Diaz-Benito Soriano	9bdb2cd17a	Solved 'Share with copied link' flow	2014-10-28 19:11:31 +01:00
Jorge Antonio Diaz-Benito Soriano	5aa4d0e6c8	Removed unnecessary actions	2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano	0c384167c1	Added some margins.	2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano	c9105c61d9	Added Java 1.5 restriction to match the application standards	2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano	1629981256	Fixed line breaks	2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano	3877ddf85a	Minor updates	2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano	65e82bff36	Removed any remains of list appearance	2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano	fac3332900	Fixed a mistake.	2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano	ec9f1c7eb8	Reworked the text file preview system to avoid UI freezes with large text files	2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano	7cc88a22d1	Added text file preview	2014-10-28 19:11:30 +01:00
Jorge Antonio Diaz-Benito Soriano	b22dc8bce6	Minor updates	2014-10-28 18:43:10 +01:00
Jorge Antonio Diaz-Benito Soriano	c95722a9b3	Fix Linux setup script	2014-10-28 16:47:28 +01:00
Jorge Antonio Diaz-Benito Soriano	d7d4726929	Merge branch 'gradleWithInternalDependency' of github.com:owncloudChalmers/android into gradleWithInternalDependency ... Conflicts: setup_env.sh	2014-10-28 16:13:10 +01:00
MMMarcy	9fbeb05ad9	Readded git link that was erraneously removed by the rebase	2014-10-28 16:09:34 +01:00