Commit Graph

3450 Commits

Author SHA1 Message Date
Nextcloud bot 948d6742ce
[tx-robot] updated from transifex 2017-08-17 00:08:23 +00:00
Marin Treselj eaa00ea2c8 Change id to class in the main share template
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-14 22:24:00 +02:00
Nextcloud bot ee73ddd8a9
[tx-robot] updated from transifex 2017-08-12 00:08:28 +00:00
Nextcloud bot 79f4b8566b
[tx-robot] updated from transifex 2017-08-10 00:08:24 +00:00
Nextcloud bot 72029627fc
[tx-robot] updated from transifex 2017-08-09 00:08:30 +00:00
Morris Jobke cf16087585 Disable default activity email for incoming shares
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 20:57:12 +02:00
Nextcloud bot 9f346fecf1
[tx-robot] updated from transifex 2017-08-01 00:08:35 +00:00
Nextcloud bot a6499afb5b
[tx-robot] updated from transifex 2017-07-30 00:08:13 +00:00
Nextcloud bot 820a74e71b
[tx-robot] updated from transifex 2017-07-29 00:08:40 +00:00
Nextcloud bot 569892d3c0
[tx-robot] updated from transifex 2017-07-27 00:08:13 +00:00
Nextcloud bot 2902677ccf
[tx-robot] updated from transifex 2017-07-26 00:08:14 +00:00
Nextcloud bot 79522f4078
[tx-robot] updated from transifex 2017-07-25 00:08:13 +00:00
Nextcloud bot 65dba8a558
[tx-robot] updated from transifex 2017-07-24 00:08:13 +00:00
Nextcloud bot 12590bf3d8
[tx-robot] updated from transifex 2017-07-23 00:08:07 +00:00
Roeland Jago Douma 73b293fa6a Merge pull request #5754 from nextcloud/fed-unshare-fail-remote-12
[12] still remove the federated share even if we cant notify the remote
2017-07-21 12:46:31 +02:00
Nextcloud bot 9fe53e2649
[tx-robot] updated from transifex 2017-07-21 00:08:16 +00:00
Robin Appelman e49b8959c4
still remove the federated share even if we cant notify the remote
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-17 14:21:22 +02:00
Nextcloud bot 0463ef7e3b
[tx-robot] updated from transifex 2017-07-15 00:09:06 +00:00
Nextcloud bot 281e5eb8bc
[tx-robot] updated from transifex 2017-07-14 00:08:47 +00:00
Nextcloud bot a9b38c025f
[tx-robot] updated from transifex 2017-07-13 00:08:42 +00:00
Roeland Jago Douma 38ee24d56b Merge pull request #5687 from nextcloud/jail-propagator-12
[12] Fix propagating changes within jail wrapper
2017-07-12 11:50:10 +02:00
Roeland Jago Douma 405d3ccbd7 Merge pull request #5463 from nextcloud/shared-cache-during-init-12
[12] dont die if we try to access the shared cache while setting up the shared storage
2017-07-12 11:18:49 +02:00
Nextcloud bot 05b03c173e
[tx-robot] updated from transifex 2017-07-12 00:08:54 +00:00
Maxence Lange 02baa45898 wrong call
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 20:21:06 +02:00
Maxence Lange 7464996c56 verify that circles is installed
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 20:21:06 +02:00
Robin Appelman 2f7d0bbb18
Fix propagating changes within jail wrapper
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-11 19:20:51 +02:00
Joas Schilling 509bc4f1eb
Fix activity emails for accept/decline of remote shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:28:32 +02:00
Nextcloud bot 28a37f04dc
[tx-robot] updated from transifex 2017-07-10 00:08:51 +00:00
Morris Jobke a5182ab7c1 Merge pull request #5648 from nextcloud/backport-5483-png-files-for-activity-emails
[stable12] Use PNG icons for activity emails and ios client
2017-07-07 14:04:01 +02:00
Björn Schießle 8ad1123d5d Merge pull request #5458 from nextcloud/backport-5375-shared-folder-for-remote-shares
[stable12] Use the share_folder config for remote shares
2017-07-07 11:54:11 +02:00
Joas Schilling 87e69b5510
Use PNG version of the icons for shipped activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-07 11:16:44 +02:00
Nextcloud bot a1f3f1783e
[tx-robot] updated from transifex 2017-07-07 00:08:35 +00:00
Nextcloud bot 2711dbb445
[tx-robot] updated from transifex 2017-07-03 00:08:31 +00:00
Nextcloud bot af6e02976a
[tx-robot] updated from transifex 2017-06-29 00:08:35 +00:00
Robin Appelman cbabc568db
dont die if we try to access the shared cache while setting up the shared storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-19 14:00:52 +02:00
Robin Appelman e76081e858
Revert "dont die if we try to access the shared cache while setting up the shared storage"
Revent accidental push

This reverts commit ed89034047.
2017-06-19 14:00:27 +02:00
Robin Appelman 64864bf654
dont die if we try to access the shared cache while setting up the shared storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-19 13:58:30 +02:00
Joas Schilling b94a7a0ba3
Use the share_folder config for remote shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-19 10:21:56 +02:00
Nextcloud bot 0e608188d2
[tx-robot] updated from transifex 2017-06-17 00:08:36 +00:00
Joas Schilling cdd4a75c17
Backport of #5384 to stable12
Allow to find local users by their email address

Signed-off-by: Joas Schilling <coding@schilljs.com>

Make sure to only add system users once

Signed-off-by: Joas Schilling <coding@schilljs.com>

Add unit test

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-15 19:23:31 +02:00
Nextcloud bot 1965889fc8
[tx-robot] updated from transifex 2017-06-15 00:08:52 +00:00
Bjoern Schiessle 751bc180cc
fix 'add to your nextcloud' input field, this is not an email address
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-13 17:46:00 +02:00
Nextcloud bot d00c5886aa
[tx-robot] updated from transifex 2017-06-08 00:08:37 +00:00
Nextcloud bot 85418640b3
[tx-robot] updated from transifex 2017-06-07 00:09:14 +00:00
Nextcloud bot 7ff205cf94
[tx-robot] updated from transifex 2017-06-06 00:08:55 +00:00
Nextcloud bot cf3988e248
[tx-robot] updated from transifex 2017-06-04 00:08:39 +00:00
Nextcloud bot 5d6345ea4b
[tx-robot] updated from transifex 2017-06-03 00:09:12 +00:00
Nextcloud bot 577ea59968
[tx-robot] updated from transifex 2017-06-02 00:08:40 +00:00
Nextcloud bot db22c42e78
[tx-robot] updated from transifex 2017-06-01 00:08:48 +00:00
Nextcloud bot 6ae58b6dcb
[tx-robot] updated from transifex 2017-05-30 00:08:54 +00:00