8120 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Tobias Kaminsky	796fba0354	Merge branch 'master' into clearSuccessfulUploads	2017-08-07 08:14:15 +02:00
Andy Scherzinger	35d0c38c06	Merge pull request #1213 from nextcloud/showEmptyMessageAgain ... Show empty message again	2017-08-05 17:28:04 +01:00
Andy Scherzinger	048f88524e	Merge pull request #1214 from nextcloud/emptyMessageReceiveExternalFiles ... Show empty message when receiving external files	2017-08-05 17:26:36 +01:00
Mario Danic	f9b8b4faf8	Fix codacy ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-05 12:35:11 +02:00
Mario Danic	ea52edffd2	Disable current app in sharing ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2017-08-05 11:52:58 +02:00
Mario Đanić	fcee6e3741	Merge pull request #1231 from jsrck/1221-details-page-reappears ... Picture "details "page reappear when it shouldn't. #1221	2017-08-05 10:23:00 +02:00
Andy Scherzinger	fa4f7590b0	Merge pull request #1252 from nextcloud/reduceLintErrors ... Reduce lint errors	2017-08-05 08:16:44 +01:00
Nextcloud bot	0c49d53a38	[tx-robot] updated from transifex	2017-08-05 00:27:03 +00:00
nextcloud-android-bot	3a73f95b1e	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-08-04 12:50:16 +00:00
Tobias Kaminsky	7eaba89ae3	Merge a1be1064d2 into 75d6de9b7c	2017-08-04 12:46:34 +00:00
tobiasKaminsky	a1be1064d2	Merge remote-tracking branch 'origin/reduceLintErrors' into reduceLintErrors2	2017-08-04 14:46:31 +02:00
tobiasKaminsky	e9f16c1bcf	add lint.xml to ignore invalidPackage from freemarker	2017-08-04 14:46:22 +02:00
nextcloud-android-bot	4752cb4a03	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-08-04 12:04:17 +00:00
Tobias Kaminsky	d55ae20e97	Merge fccf72e7db into 75d6de9b7c	2017-08-04 10:46:53 +00:00
Tobias Kaminsky	fccf72e7db	Merge branch 'master' into reduceLintErrors	2017-08-04 12:46:51 +02:00
nextcloud-android-bot	2e5fc5668d	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-08-04 10:28:43 +00:00
Tobias Kaminsky	b9f1544d81	Merge 08875fe1e5 into 75d6de9b7c	2017-08-04 09:58:08 +00:00
tobiasKaminsky	08875fe1e5	update user name with correct id found by user ocs call	2017-08-04 11:54:34 +02:00
nextcloud-android-bot	b33947a78f	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-08-04 05:58:23 +00:00
Tobias Kaminsky	6ede2ac215	Merge 6e327673bb into 75d6de9b7c	2017-08-04 05:51:55 +00:00
tobiasKaminsky	6e327673bb	revert description for clear successful uploads	2017-08-04 07:50:15 +02:00
Andy Scherzinger	75d6de9b7c	Merge pull request #1253 from nextcloud/domAPI ... Enabling dom storage api	2017-08-03 08:27:18 +01:00
Nextcloud bot	3a00aa8930	[tx-robot] updated from transifex	2017-08-03 00:27:18 +00:00
Nextcloud bot	fc8afbd18e	[tx-robot] updated from transifex	2017-08-02 00:27:56 +00:00
nextcloud-android-bot	28b86fea57	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-08-01 13:04:35 +00:00
Tobias Kaminsky	9ca37d4de6	Merge 58832b176d into 12cd1ba651	2017-08-01 12:03:33 +00:00
tobiasKaminsky	58832b176d	fix: Wrong argument count, format string media_event_done requires 1 but format call supplies 0	2017-08-01 14:03:16 +02:00
nextcloud-android-bot	8f80f7ce57	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-08-01 10:13:11 +00:00
nextcloud-android-bot	abf952c919	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2017-08-01 10:11:21 +00:00
Tobias Kaminsky	6a71cac2a2	Merge bd897d856c into 12cd1ba651	2017-08-01 10:07:39 +00:00
tobiasKaminsky	bd897d856c	enabling dom storage api	2017-08-01 12:06:52 +02:00
Tobias Kaminsky	393874eab6	Merge da5f6ef7e1 into 12cd1ba651	2017-08-01 09:59:00 +00:00
tobiasKaminsky	da5f6ef7e1	Merge remote-tracking branch 'remotes/origin/master' into reduceErrors	2017-08-01 11:58:23 +02:00