1624 commits

Author	SHA1	Message	Date
jabarros	0d6320aa79	Move isImage method to BitmapUtils class	2014-12-29 09:26:44 +01:00
jabarros	6e3d3cd016	Merge branch 'develop' into thumbnailForUpload	2014-12-19 10:58:08 +01:00
David A. Velasco	46b5e21ef5	Merge pull request #801 from owncloud/community_image-preview-save-position ... Restore the current image when the preview activity is hidden	2014-12-15 10:22:10 +01:00
jabarros	4e2f886b44	Merge pull request #766 from owncloud/feedbackWithVersionNumber ... Email from feedback contains version number	2014-12-12 10:05:49 +01:00
jabarros	8fc865ea76	Merge branch 'develop' into community_image-preview-save-position	2014-12-11 10:23:03 +01:00
David A. Velasco	1f796350b0	Merge pull request #781 from owncloud/fix_logs_change_orientation ... User chooser for sending mail in LogHistory (with crash fixed if device is rotated in the e-mail app)	2014-12-11 10:21:41 +01:00
jabarros	92e8194f18	Merge branch 'develop' into community_rotateImage	2014-12-11 08:51:31 +01:00
jabarros	c34646aed3	Merge branch 'fix_protocol_send_mail' into fix_logs_change_orientation	2014-12-10 14:13:32 +01:00
David A. Velasco	154188c38f	Hurry up release of source bitmap in rotations	2014-12-10 12:48:31 +01:00
David A. Velasco	77554b2b51	Cancel load task when fragment becomes invisible (fixes crash in rotations)	2014-12-10 12:46:34 +01:00
jabarros	0df8f178de	Merge pull request #754 from owncloud/RadioListOnAccounts ... Account list is now a radiobutton list	2014-12-10 08:45:12 +01:00
jabarros	700d444977	Fix. Avoid load logs again when changing device orientation	2014-12-05 14:33:04 +01:00
jabarros	766b51f497	Remove unused imports and split long lines modified	2014-12-05 10:12:57 +01:00
jabarros	7d0723261a	Fixed. App crashes when previewing an image	2014-12-05 09:33:34 +01:00
David A. Velasco	50e39f044f	Merge branch 'master' into develop	2014-12-03 11:31:49 +01:00
jabarros	d58d6ca4d0	Merge pull request #773 from owncloud/triggerMediaScan ... Trigger media scan	2014-12-03 10:10:26 +01:00
David A. Velasco	f139a7204d	Removed empty method, and some unused imports	2014-12-03 09:41:49 +01:00
David A. Velasco	1e9ff8c5fa	Trigger MediaScan for every downloaded file in a renamed or moved folder	2014-12-02 14:23:49 +01:00
David A. Velasco	5167e646ad	Refactoring: removed old FileDataStorageManager#moveFolder method, redirected to newer FileDataStorageManager#moveLocalFile	2014-12-02 13:33:57 +01:00
David A. Velasco	0f39ff841a	Bug fixed (and some refactoring): crash on local removal of a folder	2014-12-02 11:17:47 +01:00
David A. Velasco	2717c2a219	Refactoring: MediaScan triggered via FileDataStorageManager in RemoveFileDialogFragment	2014-12-02 09:29:26 +01:00
David A. Velasco	87f911c1ed	Refactoring: moved MediaScan trigger from DownloadFileOperation to FileDownloader service via FileDataStorageManager	2014-12-02 09:21:35 +01:00
David A. Velasco	e771c09ad9	Refactoring: move all the intents for MediaScanner in FileDataStorageManager to a single method	2014-12-02 09:16:56 +01:00
David A. Velasco	c95eb327f8	Refactoring: get MediaScan trigger out of OCFile for renaming	2014-12-02 09:08:55 +01:00
jabarros	0a0c808e3b	Merge pull request #662 from tobiasKaminsky/fileCount ... File count	2014-12-02 08:31:54 +01:00
tobiasKaminsky	eaa3b1ef56	Merge remote-tracking branch 'upstream/develop' into triggerMediaScan ... -fr/strings.xml Conflicts: src/com/owncloud/android/datamodel/FileDataStorageManager.java src/com/owncloud/android/datamodel/OCFile.java	2014-11-29 12:18:02 +01:00
tobiasKaminsky	e8a4780cbc	- test fix for android 4	2014-11-29 12:13:46 +01:00
tobiasKaminsky	9fcba0b801	cleanup	2014-11-29 11:23:16 +01:00
tobiasKaminsky	95967c2151	- trigger mediaScan when files are deleted remote	2014-11-29 11:12:03 +01:00
tobiasKaminsky	cb9927fb00	- trigger works when moving files	2014-11-29 10:37:13 +01:00
tobiasKaminsky	178c94e6e2	Email from feedback contains version number	2014-11-27 08:25:57 +01:00
David A. Velasco	44c0d86ede	Merge pull request #752 from owncloud/instant_uploads_set_path ... Better UI for settings path of instant uploads	2014-11-26 13:10:04 +01:00
jabarros	849dde6703	Changed var to parcelable in FolderPickerActivity	2014-11-26 13:06:00 +01:00
jabarros	48b3852f7b	Refactor after CR	2014-11-26 12:51:16 +01:00
jabarros	5c0e9ca5f2	Changes after CR	2014-11-26 09:05:23 +01:00
tobiasKaminsky	611905a5d0	- Account list is now a radiobutton list	2014-11-25 17:42:41 +01:00
tobiasKaminsky	a710797262	- bugfix	2014-11-25 16:59:21 +01:00
tobiasKaminsky	f98665bc2d	bugfix	2014-11-24 20:15:57 +01:00
tobiasKaminsky	21a505cc33	changed order to: file(s), folder(s)	2014-11-24 10:59:31 +01:00
tobiasKaminsky	d05d7361ff	- thumbnails on browsing local files during upload	2014-11-23 13:34:24 +01:00
tobiasKaminsky	df1ab9cfaa	- removed Log	2014-11-21 18:12:48 +01:00
tobiasKaminsky	580c1f008e	fix bug #742	2014-11-21 18:08:44 +01:00
tobiasKaminsky	ae6b686775	Merge remote-tracking branch 'upstream/develop' into fileCount	2014-11-21 17:59:51 +01:00
tobiasKaminsky	e9ba0ebbfa	Merge remote-tracking branch 'upstream/develop' into triggerMediaScan	2014-11-21 17:58:32 +01:00
tobiasKaminsky	5d49850c25	Merge remote-tracking branch 'upstream/develop' into triggerMediaScan	2014-11-21 17:54:47 +01:00
Jorge Antonio Diaz-Benito Soriano	c63f7fbfaf	Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency	2014-11-21 15:31:14 +01:00
David A. Velasco	e901b609ba	Merge pull request #740 from owncloud/revert-669-master ... Revert "Add "select all" option to photo (or other) upload screen"	2014-11-21 12:23:27 +01:00
jabarros	85d5035cbd	Merge pull request #722 from ogasser/idn_share_fix ... Convert IDN from ASCII to Unicode in Upload Dialog	2014-11-21 10:56:08 +01:00
Luke Owncloud	8de07698d9	integrating @davivels remarks	2014-11-20 13:46:54 +01:00
jabarros	aa16b13ab9	Remove last slash from uploads path (video/image) when showing them on settings view and they are not root folder	2014-11-20 09:39:10 +01:00