8203 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mario Danic	3d43851130	Revert "Maybe fix modified build" ... This reverts commit 8dee57a90e3a8d0f7e7282bb0a9e045a0bfd55af.	2017-08-08 12:59:11 +02:00
Mario Danic	908ee017d0	Add onClick ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:11 +02:00
Mario Danic	8ec926697d	Work a bit more on stuff ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:11 +02:00
Mario Danic	4efb17fd1d	Work a bit on locking ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:10 +02:00
Mario Danic	441e5c7511	Acquire wakelocks to make sure all is good ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:10 +02:00
Mario Danic	d18d618ac4	Fix two smaller issues ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:10 +02:00
Mario Danic	e0cbbd0bf8	Try to fix it ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:09 +02:00
Mario Danic	1b5f0597c4	Try to fix update ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:09 +02:00
Mario Danic	878a8cb7d8	Delete shutdown receiver ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:09 +02:00
Mario Danic	f0c771c2e7	Document new auto upload job ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:08 +02:00
Mario Danic	0bae6fcfb2	Clean up code ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:08 +02:00
Mario Danic	5701d3bd13	Attempt to fix build ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:08 +02:00
Mario Danic	e78d36d2b5	Fix issues ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:07 +02:00
Mario Danic	1bdf7a8ece	Fix build ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:07 +02:00
Mario Danic	70637ba987	Change to 1.8 ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:07 +02:00
Mario Danic	e40086d2ab	Add counting magic ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:06 +02:00
Mario Danic	6496d7267a	Some work on a new job for AU ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:06 +02:00
AndyScherzinger	20681be134	fix limit variable to prevent NPE	2017-08-08 12:59:06 +02:00
AndyScherzinger	b02d4378fa	db v20 is also on master, v21 now has to be used so development doesn't break	2017-08-08 12:59:05 +02:00
AndyScherzinger	20b05e7ce2	more logging while migrating data.	2017-08-08 12:59:05 +02:00
Mario Danic	08cc99b92b	Clean up in file content provider ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:05 +02:00
Mario Danic	de962ad8b6	Clean up DB upgrade ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:04 +02:00
Mario Danic	582f29b041	Add migration procedures ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:04 +02:00
Mario Danic	378c46f0ec	Enable auto upload for all ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:04 +02:00
Mario Danic	2b313b92f8	Fix all folders ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:03 +02:00
Mario Danic	14c2d13c81	Custom folder RV item ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:03 +02:00
Mario Danic	662b08a12c	Add custom folder icon ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-08 12:59:03 +02:00
AndyScherzinger	48d66b36c9	fixed layout not displaying app bar	2017-08-08 12:59:03 +02:00
AndyScherzinger	4e82f5dc5f	also use star folder for action item	2017-08-08 12:59:02 +02:00
AndyScherzinger	a17e64da25	custom folder icon	2017-08-08 12:59:02 +02:00
AndyScherzinger	d889e32d19	fixes after rebase for DB upgrade routine	2017-08-08 12:59:02 +02:00
AndyScherzinger	9899dbbf13	add item to the top (WiP)	2017-08-08 12:59:01 +02:00
AndyScherzinger	1f0a12bbdc	create folder icon	2017-08-08 12:59:01 +02:00
AndyScherzinger	8e3edb5a19	add folder type to persistent entity	2017-08-08 12:59:01 +02:00
AndyScherzinger	2bd7611a31	fix codacy	2017-08-08 12:59:00 +02:00
AndyScherzinger	3147a2c86a	add icons to the grid headers depending on the type	2017-08-08 12:59:00 +02:00
AndyScherzinger	6916ce5142	simplified thumbnail generation	2017-08-08 12:59:00 +02:00
AndyScherzinger	fbd703b1da	fix video thumbnails	2017-08-08 12:58:59 +02:00
AndyScherzinger	c15c5da2c5	remove logs	2017-08-08 12:58:59 +02:00
AndyScherzinger	e5e68ac3e7	add videos to the list	2017-08-08 12:58:59 +02:00
AndyScherzinger	105ce09649	add video fetching	2017-08-08 12:58:56 +02:00
Nextcloud bot	81cc7eb5d7	[tx-robot] updated from transifex	2017-08-08 10:30:04 +00:00
Nextcloud bot	0ebb3c8ab5	[tx-robot] updated from transifex	2017-08-08 00:27:23 +00:00
Andy Scherzinger	d9a5fecf38	Merge pull request #1265 from nextcloud/ldap ... Update user name with correct id found by user ocs call	2017-08-07 18:58:25 +02:00
Tobias Kaminsky	3c7d327ede	Merge pull request #1244 from jsrck/1229_sharing_view ... New android sharing view #1229	2017-08-07 11:34:10 +02:00
tobiaskaminsky	95c6272b58	Merge remote-tracking branch 'remotes/origin/master' into 1229_sharing_view	2017-08-07 11:16:56 +02:00
tobiaskaminsky	79c526fa68	Revert "Disable current app in sharing" ... This reverts commit ea52edffd2.	2017-08-07 11:15:33 +02:00
tobiaskaminsky	bae6aeedd5	Revert "Fix codacy" ... This reverts commit f9b8b4faf8.	2017-08-07 11:14:43 +02:00
Tobias Kaminsky	3fd89c1638	Merge pull request #1262 from nextcloud/clearSuccessfulUploads ... Revert description for clear successful uploads	2017-08-07 10:16:35 +02:00
Tobias Kaminsky	9765897509	Merge branch 'master' into ldap	2017-08-07 08:32:15 +02:00