4040 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jenkins for ownCloud	a317483f44	[tx-robot] updated from transifex	2015-10-12 01:13:37 -04:00
Jenkins for ownCloud	42f38fe876	[tx-robot] updated from transifex	2015-10-11 01:13:36 -04:00
Jenkins for ownCloud	f206eaaeb4	[tx-robot] updated from transifex	2015-10-10 01:13:37 -04:00
Andy Scherzinger	4b4c323810	actual lib reference	2015-10-09 15:46:35 +02:00
Andy Scherzinger	a61f862677	directly link owncloud_blue color ID to setup.xml's actionbar_start_color to enable proper color manipulation. Technical debt: setup should rename the actionbar_start_color (and actionbar_end_color) since it is basically the primary-oiiod value due to material design terms.	2015-10-09 15:04:39 +02:00
Andy Scherzinger	5db8c47b8a	Merge branch 'master' of https://github.com/owncloud/android into notification_coloring	2015-10-09 14:45:32 +02:00
Jenkins for ownCloud	f9b7cbd2d5	[tx-robot] updated from transifex	2015-10-09 01:13:37 -04:00
Maria Asensio	567355eed0	Merge pull request #1190 from owncloud/1182_Open_With_Fix ... Fix for #1182 on Android 5	2015-10-07 11:19:16 +02:00
Jenkins for ownCloud	8ba051f851	[tx-robot] updated from transifex	2015-10-07 01:13:37 -04:00
Maria Asensio	72e588b6b7	Merge pull request #1117 from owncloud/sortAccents ... Sort accents	2015-10-06 14:51:14 +02:00
Andy Scherzinger	75e2349e5b	Code review	2015-10-06 09:58:16 +02:00
Jenkins for ownCloud	435d4969fe	[tx-robot] updated from transifex	2015-10-06 01:13:31 -04:00
Andy Scherzinger	8f0ea82efd	Fix for #1182 on Android 5	2015-10-05 18:44:50 +02:00
Jenkins for ownCloud	eddd3aa450	[tx-robot] updated from transifex	2015-10-04 01:13:38 -04:00
Jenkins for ownCloud	f056247e75	[tx-robot] updated from transifex	2015-10-03 01:13:37 -04:00
tobiasKaminsky	7579d3daf7	Merge remote-tracking branch 'remotes/upstream/master' into sortAccents	2015-10-02 16:04:18 +02:00
masensio	99d7e18916	Merge pull request #839 from fluffy88/develop ... Trigger media scan after file upload	2015-10-01 18:45:01 +02:00
masensio	8f67624a4f	Fix: Long press menu shows two extra options: old cancel download and old cancel upload	2015-10-01 10:37:37 +02:00
masensio	08d02058c8	Use SYNC_CONFLICT instead CONFLICT for conflicts in UploadFileOperation	2015-09-30 17:59:12 +02:00
masensio	9494620cc4	Merge branch 'master' into sync_full_folder ... Conflicts: src/com/owncloud/android/providers/FileContentProvider.java	2015-09-30 12:24:01 +02:00
masensio	8090269d55	Merge branch 'master' of github.com:owncloud/android ... Conflicts: CHANGELOG.md	2015-09-30 10:49:47 +02:00
masensio	5a8f605ed9	Merge branch 'stable'	2015-09-30 10:45:20 +02:00
masensio	df1f824e13	Update Changelog for 1.8 version	2015-09-30 10:43:56 +02:00
Raquel Pérez Bartolomé	6a9f1ad08c	Update CHANGELOG.md ... Updated 1.8.0 changelog	2015-09-29 15:53:57 +02:00
Jenkins for ownCloud	b6c5188fd0	[tx-robot] updated from transifex	2015-09-29 01:13:58 -04:00
masensio	4316d7082f	Remove strings for values-en_DE	2015-09-28 13:57:22 +02:00
masensio	ee9aa68d23	Merge branch 'release-1.8'	2015-09-28 12:33:47 +02:00
David A. Velasco	001801a39b	Upload operations end in conflict if overriding a version different than the last known	2015-09-28 11:21:33 +02:00
Jenkins for ownCloud	9a3872d003	[tx-robot] updated from transifex	2015-09-28 02:33:53 -04:00
Andy Scherzinger	796b1bd297	Add ownCloud color to notifications (only works on lollipop and up) for progress bar and icon background	2015-09-27 21:40:52 +02:00
David A. Velasco	fb482fa33a	Updated reference to library after rebase	2015-09-25 15:15:33 +02:00
David A. Velasco	056b7c964d	Updated error message for failed folder synchronization ('download' not anymore)	2015-09-25 15:13:59 +02:00
David A. Velasco	7d7767aa11	Removed some logs	2015-09-25 15:13:57 +02:00
David A. Velasco	44023a6059	Clean-up: removed unused imports and methods, and commented code	2015-09-25 15:13:56 +02:00
David A. Velasco	499d628aa1	Removed separated 'download folder' in contextual menu and unused DownloadFolderOperation class	2015-09-25 15:13:54 +02:00
David A. Velasco	1e59a632bc	Fixed permanent 'uploading' icon on files that are automatically renamed during the upload	2015-09-25 15:13:53 +02:00
David A. Velasco	b8a3dc71e4	Safe blanket to clean DB if wrong conflicts keep stored	2015-09-25 15:13:51 +02:00
David A. Velasco	95bebe9382	Remove conflict badge from ancestors when conflict is solved there are no more conflicts below	2015-09-25 15:13:50 +02:00
David A. Velasco	7399508e05	Removed conflict badge when conflict is solved	2015-09-25 15:13:49 +02:00
David A. Velasco	a2aa0479fc	Added conflict icon to folders containing files with conflicts	2015-09-25 15:13:47 +02:00
David A. Velasco	e6c1454458	Persist conflicts in local database and show with an icon in the list of files	2015-09-25 15:13:46 +02:00
David A. Velasco	5f41bb14d3	ETag used to detect changes in remote files (not only in folders)	2015-09-25 15:13:44 +02:00
David A. Velasco	c0c52fa16a	Fixed NullPointerExceptionS in upload cancelations	2015-09-25 15:13:43 +02:00
David A. Velasco	9b5506f81e	Join cancelation of downloads and uploads in 'cancel sync', both for files and folders	2015-09-25 15:13:41 +02:00
David A. Velasco	68b52ddc5f	Rewritten queue of FileUploader based on IndexedForest	2015-09-25 15:13:40 +02:00
David A. Velasco	e885c78dc7	Added icon for files synchronizing; folders use it whenever downloading or uploading any file inside	2015-09-25 15:13:38 +02:00
David A. Velasco	0162d2f9c9	Keep the old operation to sync folder as DownloadFolderOperation to allow its use while the new SyncFolderOperation gets stable	2015-09-25 15:13:37 +02:00
David A. Velasco	ac685690a2	Extend SyncFolderOperation to check local changes of all files and trigger uploads	2015-09-25 15:13:35 +02:00
David A. Velasco	a38461aaa5	Same style for log-in buttons in potrait and landscape	2015-09-25 13:54:53 +02:00
David A. Velasco	c44ed4980c	Fixed lost background color for icon in login view	2015-09-25 11:11:46 +02:00