16161 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Camila Ayres	a47dd69a71	Merge branch 'master' into fixes-1187	2019-07-22 20:45:50 +02:00
Camila Ayres	0539e34c69	Merge pull request #1275 from ivyclare/pr/607 ... Fixes #607	2019-07-22 20:45:28 +02:00
Camila Ayres	5d30f4b1eb	Merge branch 'master' into pr/607	2019-07-22 19:38:56 +02:00
Camila Ayres	4559965abf	Merge pull request #1278 from ivyclare/pr/878 ... Fixes issue #878	2019-07-22 19:38:36 +02:00
Camila Ayres	4801bd5818	Merge branch 'master' into pr/607	2019-07-22 16:46:45 +02:00
Camila Ayres	9411a34a2b	Merge branch 'master' into pr/878	2019-07-22 16:09:52 +02:00
Camila Ayres	94bff61c45	Merge branch 'master' into fixes-1187	2019-07-22 16:09:40 +02:00
Camila Ayres	cf3dd53e12	Merge pull request #1347 from caugner/965-file-folder-ignored-as-info ... Displays FileIgnored activities with an info icon	2019-07-22 16:09:27 +02:00
Camila Ayres	0ae72cd68a	Merge branch 'master' into pr/878	2019-07-22 15:45:56 +02:00
Camila Ayres	88624f055d	Merge branch 'master' into 965-file-folder-ignored-as-info	2019-07-22 15:44:10 +02:00
Nextcloud bot	50be2e067c	[tx-robot] updated from transifex	2019-07-22 03:06:58 +00:00
Claas Augner	116c5b361f	Displays FileIgnored activities with an info icon ... See: https://github.com/nextcloud/desktop/issues/965 Signed-off-by: Claas Augner <git@caugner.de>	2019-07-21 22:02:15 +02:00
Nextcloud bot	ae28be4a10	[tx-robot] updated from transifex	2019-07-21 03:07:35 +00:00
Nextcloud bot	fa2f52b551	[tx-robot] updated from transifex	2019-07-20 03:03:51 +00:00
Nextcloud bot	658f6817ce	[tx-robot] updated from transifex	2019-07-19 03:16:29 +00:00
Nextcloud bot	28c401236b	[tx-robot] updated from transifex	2019-07-17 03:03:58 +00:00
Hiroki Goto	57ca82e620	Merge branch 'master' into fixes-1187	2019-07-15 20:08:47 +09:00
Nextcloud bot	7d700a3c84	[tx-robot] updated from transifex	2019-07-15 03:00:34 +00:00
Nextcloud bot	2c2cc5c23e	[tx-robot] updated from transifex	2019-07-14 03:03:06 +00:00
gt-h6k	1763504b4e	Fixes issue #1187 ... Signed-off-by: Hiroki Goto <git@gt-h6k.net>	2019-07-13 16:39:30 +09:00
Nextcloud bot	94db2f82a2	[tx-robot] updated from transifex	2019-07-13 03:06:30 +00:00
Nextcloud bot	d967ebac9a	[tx-robot] updated from transifex	2019-07-12 02:59:46 +00:00
Nextcloud bot	6b5b3c96cf	[tx-robot] updated from transifex	2019-07-11 02:58:04 +00:00
Nextcloud bot	a8bf75d496	[tx-robot] updated from transifex	2019-07-10 02:57:49 +00:00
Nextcloud bot	bb34de2bd8	[tx-robot] updated from transifex	2019-07-09 02:54:41 +00:00
Nextcloud bot	b146654474	[tx-robot] updated from transifex	2019-07-07 02:55:41 +00:00
Nextcloud bot	c897564d28	[tx-robot] updated from transifex	2019-07-05 02:57:08 +00:00
Nextcloud bot	ae9bc786ad	[tx-robot] updated from transifex	2019-07-04 02:55:55 +00:00
Nextcloud bot	b2d85cc4bf	[tx-robot] updated from transifex	2019-07-03 02:55:33 +00:00
Nextcloud bot	ac505aac0e	[tx-robot] updated from transifex	2019-07-02 02:54:54 +00:00
Nextcloud bot	4eac71a032	[tx-robot] updated from transifex	2019-06-30 02:55:43 +00:00
Nextcloud bot	fa29fc4028	[tx-robot] updated from transifex	2019-06-28 02:56:13 +00:00
Nextcloud bot	f352af7ffb	[tx-robot] updated from transifex	2019-06-27 02:57:19 +00:00
Nextcloud bot	d7098343a2	[tx-robot] updated from transifex	2019-06-26 02:56:31 +00:00
Nextcloud bot	908f4d34e3	[tx-robot] updated from transifex	2019-06-25 02:57:16 +00:00
Nextcloud bot	78c7aed3b9	[tx-robot] updated from transifex	2019-06-24 02:56:03 +00:00
Nextcloud bot	a8986124b8	[tx-robot] updated from transifex	2019-06-23 02:56:59 +00:00
Nextcloud bot	57ec1cdda4	[tx-robot] updated from transifex	2019-06-22 02:55:39 +00:00
Camila Ayres	9dc47438c9	Merge pull request #1309 from nextcloud/feature/show-shared-file-owner ... Displays the uid_owner of a shared file.	2019-06-21 19:53:46 +02:00
Camila San	d6a0a5272a	Displays the uid_owner of a shared file. ... Also displays the sharees that reshared it via share link. Signed-off-by: Camila San <hello@camila.codes>	2019-06-21 18:36:45 +02:00
Nextcloud bot	47ac10fb8e	[tx-robot] updated from transifex	2019-06-21 02:54:12 +00:00
Nextcloud bot	459a17bd7e	[tx-robot] updated from transifex	2019-06-20 02:55:55 +00:00
Nextcloud bot	de65b6fb7e	[tx-robot] updated from transifex	2019-06-18 02:55:35 +00:00
Nextcloud bot	6ddfc80672	[tx-robot] updated from transifex	2019-06-17 02:54:41 +00:00
Nextcloud bot	048cf3b23e	[tx-robot] updated from transifex	2019-06-16 02:56:30 +00:00
Nextcloud bot	3c958dea20	[tx-robot] updated from transifex	2019-06-13 02:48:18 +00:00
Kilian Pfeiffer	ac24874585	Merge branch 'master' into master	2019-06-12 12:41:09 +02:00
Camila Ayres	0b420c5fe6	Merge pull request #1301 from nextcloud/error-423-change-warning-color ... Add error category for http file lock error status 423.	2019-06-12 11:33:25 +02:00
Camila San	bb7d330516	Add error category for http file lock error status 423. ... It filters the error out of the list of blocking errors. It now shows up in the Activities and Notificattions list as a warning. Signed-off-by: Camila San <hello@camila.codes>	2019-06-11 23:32:10 +02:00
Nextcloud bot	795c29d5bd	[tx-robot] updated from transifex	2019-06-11 02:46:16 +00:00