3244 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David A. Velasco	4af15f7b4e	Merge branch 'develop' into imageGrid	2015-02-02 13:48:30 +01:00
masensio	ab8bf56a15	Detect if the account exists before the tranfer starts	2015-02-02 13:23:33 +01:00
David A. Velasco	7f23fa5a77	Merge pull request #844 from owncloud/delete_local_files ... Removal of media files is notified to MediaProvider directly - MediaScan API does not work properly in Android 4.x	2015-02-02 09:39:40 +01:00
masensio	c6124920d1	Changes from comments in PR 844	2015-02-02 09:34:43 +01:00
Jenkins for ownCloud	8bf624ff8f	[tx-robot] updated from transifex	2015-02-01 01:13:30 -05:00
Jenkins for ownCloud	2210ce961a	[tx-robot] updated from transifex	2015-01-31 01:13:34 -05:00
masensio	42b5a1e28f	Update some icons	2015-01-30 14:37:16 +01:00
masensio	0dfe4d27c7	Merge pull request #869 from owncloud/hotfix__fixed_start_of_SAML_dialog ... Hotfix - fixed start of SAML dialog	2015-01-30 13:17:06 +01:00
masensio	7f6c5bd3b2	Merge commit 'refs/pr/701' into create_folder_during_upload_pr_701_with_develop	2015-01-30 12:10:15 +01:00
David A. Velasco	2f4e2808d2	Internal version bump	2015-01-30 11:49:31 +01:00
David A. Velasco	7ddb745bef	Clean-up excess of logs in SAML dialog	2015-01-30 11:34:44 +01:00
David A. Velasco	54dc3efc18	Load SAML log-in dialog from the original URL so that cookies returned with the redirection are not lost	2015-01-30 11:34:43 +01:00
masensio	700318fec0	Update some icons	2015-01-30 11:00:14 +01:00
Jenkins for ownCloud	9d491f71ed	[tx-robot] updated from transifex	2015-01-30 01:13:31 -05:00
masensio	4354329b46	Fix bug: When renaming a folder, in the photos apps both folder are shown	2015-01-29 11:22:47 +01:00
Jenkins for ownCloud	16b36d0418	[tx-robot] updated from transifex	2015-01-29 01:13:38 -05:00
masensio	d19128e770	Merge branch 'develop' into delete_local_files	2015-01-28 10:37:08 +01:00
David A. Velasco	bcef916292	Removed commented code	2015-01-28 09:40:59 +01:00
masensio	d3b0747dde	Merge pull request #866 from owncloud/download_folder ... Download a folder	2015-01-28 09:31:25 +01:00
masensio	0b8f3db914	Recover badges: show status icons in grid View ( favoriteIcon, localFileIndicator, shareIcon and shareWithMeIcon	2015-01-28 08:59:57 +01:00
Jenkins for ownCloud	da67575522	[tx-robot] updated from transifex	2015-01-28 01:13:45 -05:00
Carla Schroder	b7664364d7	Update version number	2015-01-27 16:35:45 -08:00
Daniel Molkentin	0bb94f3c29	user manual: Fix incorrect line wrapping in config file	2015-01-27 23:41:33 +01:00
Daniel Molkentin	67ea45aa9f	Add means to build user manual via make	2015-01-27 23:40:53 +01:00
Daniel Molkentin	a9d12f3b1c	manual: omit ocdoc/* during doc generation	2015-01-27 23:35:45 +01:00
Daniel Molkentin	931bc1e62c	manual: omit ocdoc/* during doc generation	2015-01-27 23:29:49 +01:00
Carla Schroder	7d1839ee96	add submodule to user manual	2015-01-27 12:11:26 -08:00
Carla Schroder	ead95b9d9c	Add Android app manual to develop branch, and Allow building manual in owncloud themes	2015-01-27 12:07:43 -08:00
masensio	a69c04d8e9	Fix bug: audio are not refreshed when delete them from the app	2015-01-27 14:31:44 +01:00
masensio	8ebaba45e7	Show status icons in gridview	2015-01-27 13:51:44 +01:00
David A. Velasco	0df1eeaac4	Fixed download of folder after updating credentials in the app	2015-01-27 13:50:14 +01:00
masensio	051265620c	Add share icons and localFileIndicator to grid_image and grid_item layout	2015-01-27 09:46:19 +01:00
masensio	281a6b8e1a	Fix bug (Media Scan) Files are not refreshed when delete from the app)	2015-01-26 15:15:00 +01:00
David A. Velasco	e89e030077	Commented excess of logs	2015-01-26 13:37:46 +01:00
David A. Velasco	7d16de3c07	Fixed cancellation of SynchronizeOperationFolder	2015-01-26 13:32:54 +01:00
masensio	d2d20d9ec1	Fix bug: Footer is not shown correct in the grid view	2015-01-26 13:09:07 +01:00
David A. Velasco	c21c8e118b	Version bump	2015-01-26 11:49:27 +01:00
Jenkins for ownCloud	597af6ac4f	Hotfix on French translation	2015-01-26 11:41:54 +01:00
David A. Velasco	d860ae7cd4	Added indexed tree of synchronizing folders to SyncFolderHandler	2015-01-26 09:42:44 +01:00
Jenkins for ownCloud	97386bdb87	[tx-robot] updated from transifex	2015-01-26 01:13:30 -05:00
David A. Velasco	9093ef8f9f	Refactored SyncFolderHandler out of OperationsService	2015-01-23 09:34:45 +01:00
jabarros	7d21a9ec5d	Merge pull request #825 from owncloud/SettingsGreyedOut ... Instant Upload settings hide/show	2015-01-23 09:29:11 +01:00
David A. Velasco	a07937cb6f	Minimize refresh of list of files on reception of events from FileDownloader	2015-01-22 22:15:08 +01:00
David A. Velasco	265e32dee6	Added cancelation for subtrees	2015-01-22 20:01:41 +01:00
David A. Velasco	5b54915209	Added indexed tree of folders downloading anything	2015-01-22 17:06:09 +01:00
jabarros	68eb22929d	'Fixed. 'Upload pictures via WIFI only' is hidden when going to files and come back to settings	2015-01-22 13:49:31 +01:00
jabarros	18b45ff589	Fixed. Some message dissapear from list view as 'loading' and 'nothing in here...'	2015-01-22 13:14:57 +01:00
jabarros	0470de47e0	Fixed. Line behind the folder is not shown in the upload view	2015-01-22 09:29:36 +01:00
jabarros	81a8604f7f	Fixed. Remove size from folders in the Upload view	2015-01-21 18:18:39 +01:00
David A. Velasco	70dd4d0653	Merge pull request #858 from owncloud/imageGrid_footer ... Fixed. Footer message should be showed in the list view mode. Also added...	2015-01-21 18:14:45 +01:00