2280 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David A. Velasco	f5e3f97ef1	Removed conflict mark	2014-07-25 09:14:07 +02:00
David A. Velasco	92876a038c	Updated library reference	2014-07-25 09:11:22 +02:00
jabarros	2b21d67791	Add case for when trying to download a file that is no longer available on the server	2014-07-25 09:11:21 +02:00
jabarros	61c8f7f083	Upgrade notifications on status bar when uploading to show proper message about fails due to lack of permissions and removed FailedUploaderActivity	2014-07-25 09:11:20 +02:00
jabarros	a28fa921c9	Update ErrorMessageAdapter class to generate appropiate error messages for operations failed due to lack of permissions (ResultCode.FORBIDDEN)	2014-07-25 09:10:26 +02:00
David A. Velasco	fa326f51c8	Fixed use of removed text messages unnoticed before updating all the languages	2014-07-25 08:45:39 +02:00
Jenkins for ownCloud	843a47ebd0	[tx-robot] updated from transifex	2014-07-25 01:13:41 -04:00
David A. Velasco	9953a942ea	Merge branch 'master' into develop	2014-07-24 09:30:11 +02:00
David A. Velasco	a03e7e48eb	Update library reference to 0.9.2 version	2014-07-24 09:23:29 +02:00
Jenkins for ownCloud	3dd7015ebb	[tx-robot] updated from transifex	2014-07-24 01:13:37 -04:00
Jenkins for ownCloud	707f00b8d4	[tx-robot] updated from transifex	2014-07-22 01:13:32 -04:00
Jenkins for ownCloud	3a1a294f79	[tx-robot] updated from transifex	2014-07-20 01:13:36 -04:00
Jenkins for ownCloud	825c593e40	[tx-robot] updated from transifex	2014-07-18 01:13:35 -04:00
Jenkins for ownCloud	4367efcffc	[tx-robot] updated from transifex	2014-07-17 01:13:33 -04:00
jabarros	04ddaaef6b	Fixed bug. Changed icon for 'send' option in file actions menu	2014-07-15 12:45:28 +02:00
jabarros	b0eeca0e80	Fixed bug. Changed icons for 'open file with' and 'rename' file options	2014-07-15 10:09:33 +02:00
David A. Velasco	9778f720dc	Fixed bug: failed upload notification not appearing in Android 2.x devices	2014-07-14 14:50:02 +02:00
jabarros	055be96386	Remove InstantUploadActivity and related resources	2014-07-14 08:40:16 +02:00
Jenkins for ownCloud	edc743a15a	[tx-robot] updated from transifex	2014-07-12 01:13:34 -04:00
David A. Velasco	e5f20fb85b	Update reference to library	2014-07-10 13:08:54 +02:00
Jenkins for ownCloud	3765e677f5	[tx-robot] updated from transifex	2014-07-10 03:57:16 -04:00
jabarros	ab5e9250d2	Fixed bug. The size of a file is moved to the left when it is shared by link	2014-07-09 17:52:52 +02:00
jabarros	64a94f351d	Fixed bug. Icons are not shown correctly in the file list	2014-07-09 17:26:20 +02:00
David A. Velasco	8ede5e728e	Merge remote-tracking branch 'origin/release-1.5.8' into release-1.5.8	2014-07-09 12:36:28 +02:00
jabarros	d96708ecc2	Update library reference	2014-07-09 12:33:32 +02:00
David A. Velasco	49c69609ea	Merge branch 'develop' into release-1.5.8	2014-07-09 12:27:35 +02:00
jabarros	8699c0414e	Merge pull request #556 from owncloud/fix_bug_in_favorites_sync ... Fixed bug in favorites sync affecting editors that replace a file with a work copy instead of directly writing the file	2014-07-09 11:47:26 +02:00
David A. Velasco	0a99d90727	Only relative packages in AndroidManifest	2014-07-09 11:01:48 +02:00
jabarros	df5fe2d648	Change the star and downloaded/downloading/uploading icons in list_item layout desing	2014-07-09 09:09:37 +02:00
Jenkins for ownCloud	666634ec7c	[tx-robot] updated from transifex	2014-07-09 01:13:35 -04:00
jabarros	96e2d198e0	Merge branch 'develop' into release-1.5.8	2014-07-08 13:03:09 +02:00
David A. Velasco	4c4a0cb023	Merge pull request #555 from owncloud/update_shared_folder_icon ... Updated icon for folder publicly shared.	2014-07-08 12:57:19 +02:00
David A. Velasco	c880929ffd	Fixed last minute bugs, and clean up	2014-07-08 12:51:01 +02:00
David A. Velasco	e610046e0d	Watch for replacements of favorite file besides than direct notifications	2014-07-08 10:26:54 +02:00
David A. Velasco	e2a7e9bbf9	Watch local changes of kept-in-sync files by observing their parent folder, instead of the file itself	2014-07-08 10:26:53 +02:00
David A. Velasco	5205fe22ae	Avoid the app crashes at every start due to a stuck obsolete broadcast ... intent.	2014-07-08 10:24:37 +02:00
jabarros	dba9c3a64d	Create observer class for parent folders	2014-07-08 10:24:36 +02:00
David A. Velasco	6647790620	Testing observance on parent folders to deal with apps that replace a favorite file (delete it) when updating it	2014-07-08 10:22:54 +02:00
David A. Velasco	014096ab2d	Improved release of resources in FileObserverService#onDestroy	2014-07-08 10:21:38 +02:00
David A. Velasco	115032a36e	Clean up FileObserverService to avoid redundant instances of OwnCloudFileObservers that may be driving mad inotify in some Android devices	2014-07-08 10:21:37 +02:00
jabarros	a1f52fe73b	Modify OwncloudFileObserver for enforcing watching the file when an external app cancelled the watch and added a handler for startWatching again	2014-07-08 10:17:02 +02:00
jabarros	1c89aae29e	Update version number and name in workaround-app subproject	2014-07-07 14:46:21 +02:00
jabarros	0ed5d39993	Update version number and name	2014-07-07 14:38:19 +02:00
jabarros	0bca42bcd8	Remove unused class FailedUploadActivity and related resources	2014-07-07 13:52:13 +02:00
jabarros	df8e9fa2c3	Merge pull request #541 from owncloud/fix_issue_540 ... Fix issue 540	2014-07-07 13:02:42 +02:00
jabarros	ed909e45f3	Remove duplicate ic_action_create_dir and ic_action_upload icons	2014-07-07 12:27:09 +02:00
jabarros	ce871c126b	Show 'downloaded' icon over the file icon	2014-07-07 10:58:45 +02:00
jabarros	0b8cf52626	Add folder public icon	2014-07-07 10:48:13 +02:00
jabarros	42946bcc6d	Show folder icon with world above on the left side of any folder that is publicity shared	2014-07-07 10:10:18 +02:00
jabarros	19e0f950e0	Show left side icons in the list of files with size 32x32 dp instead of the current 20x20 dp	2014-07-07 09:22:12 +02:00