wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
52034 commits 157 branches 562 tags 714 MiB
Commit graph

393 commits

Author SHA1 Message Date
Nextcloud bot
0092e3adec
[tx-robot] updated from transifex 2018-10-27 00:12:35 +00:00
Nextcloud bot
a9fb21f9fc
[tx-robot] updated from transifex 2018-10-23 14:54:28 +00:00
Morris Jobke
24a2107e03
Fix a case where "password_by_talk" was not a boolean (e.g. null or "0") and actively cast it to a boolean 
This was the error message that we have seen:

```
Argument 1 passed to OC\\Share20\\Share::setSendPasswordByTalk() must be of the type boolean, null given, called in apps/sharebymail/lib/ShareByMailProvider.php on line 981
```

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-10-12 17:01:54 +02:00
Nextcloud bot
7c26bbbd82
[tx-robot] updated from transifex 2018-10-10 00:13:11 +00:00
Joas Schilling
ea21aa3f7a
Use numeric placeholders if there are multiple, so that RTL languages can operate better 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-10-09 14:32:14 +02:00
Nextcloud bot
7dd2212b2c
[tx-robot] updated from transifex 2018-10-06 00:12:15 +00:00
Nextcloud bot
d9fe68ed12
[tx-robot] updated from transifex 2018-10-05 00:12:56 +00:00
Nextcloud bot
d9504a4e06
[tx-robot] updated from transifex 2018-10-04 00:12:07 +00:00
Nextcloud bot
67d04f2d57
[tx-robot] updated from transifex 2018-10-03 16:58:45 +00:00
Morris Jobke
71072a0b56
Merge pull request #11338 from rubo77/password-br 
sharebymail: Add linebreak before password
 2018-10-03 12:57:22 +02:00
rubo77
a3849e60ba sharebymail: Add linebreak before password 
Signed-off-by: Ruben Barkow <github@r.z11.de>
 2018-10-03 11:42:12 +02:00
Nextcloud bot
b6e86121bc
[tx-robot] updated from transifex 2018-10-01 00:12:39 +00:00
Nextcloud bot
bdb01064e2
[tx-robot] updated from transifex 2018-09-25 00:12:07 +00:00
Nextcloud bot
d8f554944d
[tx-robot] updated from transifex 2018-09-19 00:12:24 +00:00
Nextcloud bot
2a51572cc4
[tx-robot] updated from transifex 2018-09-17 00:12:30 +00:00
Nextcloud bot
3771aeb584
[tx-robot] updated from transifex 2018-09-15 00:12:09 +00:00
Nextcloud bot
6112adfe06
[tx-robot] updated from transifex 2018-09-14 00:12:27 +00:00
Nextcloud bot
10351cb9da
[tx-robot] updated from transifex 2018-09-13 00:12:08 +00:00
Nextcloud bot
039145c4d1
[tx-robot] updated from transifex 2018-09-12 00:12:12 +00:00
Nextcloud bot
13166feed3
[tx-robot] updated from transifex 2018-09-09 00:13:09 +00:00
Nextcloud bot
09a223fee9
[tx-robot] updated from transifex 2018-09-07 00:12:37 +00:00
Nextcloud bot
3a08f71981
[tx-robot] updated from transifex 2018-09-06 00:12:53 +00:00
Joas Schilling
47cc5e5895
Update version requirements and versions of shipped apps 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-09-05 14:27:06 +02:00
Nextcloud bot
4da9a15b32
[tx-robot] updated from transifex 2018-08-30 00:12:07 +00:00
Nextcloud bot
8b47f45afa
[tx-robot] updated from transifex 2018-08-27 00:12:14 +00:00
Nextcloud bot
503fbc953e
[tx-robot] updated from transifex 2018-08-24 00:12:20 +00:00
Nextcloud bot
c0f48a7b40
[tx-robot] updated from transifex 2018-08-23 00:12:59 +00:00
Nextcloud bot
be3438ca97
[tx-robot] updated from transifex 2018-08-21 00:12:16 +00:00
Nextcloud bot
ccb040ee01
[tx-robot] updated from transifex 2018-08-13 00:12:09 +00:00
Roeland Jago Douma
90a656305b
Bump autoloaders 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-10 15:03:22 +02:00
Nextcloud bot
103a2c30fb
[tx-robot] updated from transifex 2018-08-10 00:12:26 +00:00
Nextcloud bot
ca54166e35
[tx-robot] updated from transifex 2018-08-06 00:12:21 +00:00
Nextcloud bot
6a9bee478d
[tx-robot] updated from transifex 2018-08-01 00:11:59 +00:00
Nextcloud bot
5e43f3c6a6
[tx-robot] updated from transifex 2018-07-31 00:12:12 +00:00
Nextcloud bot
0c7a17795b
[tx-robot] updated from transifex 2018-07-28 00:12:07 +00:00
Nextcloud bot
6ccc34f5af
[tx-robot] updated from transifex 2018-07-27 00:12:20 +00:00
Nextcloud bot
e98f4de66a
[tx-robot] updated from transifex 2018-07-26 00:12:01 +00:00
Daniel Calviño Sánchez
d582a66bea Honour "sendPasswordByTalk" property in mail shares 
When a password was set for a mail share an e-mail was sent to the
recipient with the password. Now the e-mail is no longer sent if the
password is meant to be sent by Talk.

However, before the e-mail was not sent when the share was updated but
the password was not changed. Now an e-mail is sent in that case too if
switching from a password sent by Talk to a password sent by mail.

On the other hand, when switching from a password sent by mail to a
password sent by Talk it is mandatory to change the password; otherwise
the recipient would already have access to the share without having to
call the sharer to verify her identity.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-07-24 13:56:29 +02:00
Daniel Calviño Sánchez
dd0c5e297e Store "sendPasswordByTalk" property of mail shares in the database 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-07-24 13:56:28 +02:00
Roeland Jago Douma
b41d0d32e2
Merge pull request #10218 from nextcloud/share-comments 
allow to add a personal note to a share
 2018-07-24 09:12:03 +02:00
Nextcloud bot
241e5705cb
[tx-robot] updated from transifex 2018-07-24 00:12:01 +00:00
Bjoern Schiessle
eab4d96c4c
some small template fixes 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle
b81962e3e8
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle
1ce519ad38
add direct link to the share 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
a29261175d
fix mail templates 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
73b88deeb8
add note to share object when reading it from the db 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
c116d116fa
improve mail template and escape html code 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
a93f2a648b
allow to add a personal note to a share 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Nextcloud bot
0e0dd2a90b
[tx-robot] updated from transifex 2018-07-11 00:12:15 +00:00
Nextcloud bot
a22bc0e787
[tx-robot] updated from transifex 2018-07-10 08:21:14 +00:00
Roeland Jago Douma
d805959e81
Add API to undelete delete group shares 
When a group share is deleted we keep track of this in the DB.
Right now it is only possible for a recipient to get back the share by
asking the sharer to delete it and to share it again. This doesn't
scale.

This endpoint makes it possible to get back the share.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-05 12:43:56 +02:00
Nextcloud bot
a4b5ff8420
[tx-robot] updated from transifex 2018-06-24 00:12:06 +00:00
Nextcloud bot
f9c98d8621
[tx-robot] updated from transifex 2018-06-21 00:12:47 +00:00
Nextcloud bot
5ecfd80f07
[tx-robot] updated from transifex 2018-06-13 00:12:59 +00:00
Nextcloud bot
d91bed9490
[tx-robot] updated from transifex 2018-06-12 00:12:46 +00:00
Nextcloud bot
ae3bdb4fb9
[tx-robot] updated from transifex 2018-06-09 00:13:06 +00:00
Nextcloud bot
d3fceb9b83
[tx-robot] updated from transifex 2018-06-01 00:12:28 +00:00
Nextcloud bot
7df563ee39
[tx-robot] updated from transifex 2018-05-30 00:12:08 +00:00
Nextcloud bot
f0fdac8078
[tx-robot] updated from transifex 2018-05-26 00:13:01 +00:00
Nextcloud bot
60734cd79d
[tx-robot] updated from transifex 2018-05-25 00:14:54 +00:00
Nextcloud bot
514b374923
[tx-robot] updated from transifex 2018-05-18 00:13:45 +00:00
Nextcloud bot
ef665fde42
[tx-robot] updated from transifex 2018-05-17 00:13:46 +00:00
Nextcloud bot
6ee00a8be5
[tx-robot] updated from transifex 2018-04-28 00:11:58 +00:00
Nextcloud bot
9e3522af54
[tx-robot] updated from transifex 2018-04-27 00:11:53 +00:00
Arthur Schiwon
38a90130ce
move log constants to ILogger 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 10:45:52 +02:00
Nextcloud bot
3c250b1a35
[tx-robot] updated from transifex 2018-04-17 00:13:08 +00:00
Nextcloud bot
af3ab1de10
[tx-robot] updated from transifex 2018-03-21 01:11:55 +00:00
Nextcloud bot
b7e7ae5d6d
[tx-robot] updated from transifex 2018-03-16 01:11:31 +00:00
Nextcloud bot
055d15e305
[tx-robot] updated from transifex 2018-03-15 01:11:41 +00:00
Nextcloud bot
a20e9d7891
[tx-robot] updated from transifex 2018-03-09 01:12:12 +00:00
Nextcloud bot
3867a74f0d
[tx-robot] updated from transifex 2018-03-06 01:12:16 +00:00
Nextcloud bot
6975cef00b
[tx-robot] updated from transifex 2018-03-04 01:12:42 +00:00
Nextcloud bot
3b000d4f91
[tx-robot] updated from transifex 2018-03-03 01:12:14 +00:00
Nextcloud bot
533e8351ad
[tx-robot] updated from transifex 2018-02-28 01:12:31 +00:00
Joas Schilling
226e63695f
Merge pull request #8026 from nextcloud/feature/noid/allow-custom-html-in-html-emails 
Allow custom HTML in HTML Emails
 2018-02-26 13:38:39 +01:00
Joas Schilling
f095001e4b
Fix info.xml files of shipped apps 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-16 10:24:03 +01:00
Joas Schilling
339e320064
Fix existing usages 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-15 12:18:51 +01:00
Nextcloud bot
01623d4aca
[tx-robot] updated from transifex 2018-02-14 21:37:31 +00:00
Morris Jobke
d3d045dd5c
Remove unused import statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-14 16:55:43 +01:00
Nextcloud bot
3fc6d6234e
[tx-robot] updated from transifex 2018-02-13 10:48:27 +00:00
Nextcloud bot
91c67eb667
[tx-robot] updated from transifex 2018-02-12 21:33:37 +00:00
Nextcloud bot
b78da27d0a
[tx-robot] updated from transifex 2018-02-01 18:28:02 +00:00
Morris Jobke
eb51f06a3b
Use ::class statement instead of string 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-29 12:03:47 +01:00
Morris Jobke
4dbee99b7b
Remove useless return statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 22:50:40 +01:00
Morris Jobke
2a38605545
Properly log the full exception instead of only the message 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-23 10:57:21 +01:00
Roeland Jago Douma
db411f8771
Bump apps 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-14 11:40:53 +01:00
Morris Jobke
f578b69729
Update composer 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-12 23:16:10 +01:00
Nextcloud bot
2e683d3502
[tx-robot] updated from transifex 2018-01-06 01:11:09 +00:00
Roeland Jago Douma
0280cff66f
Composer updated 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-04 16:31:16 +01:00
Nextcloud bot
298b79410d
[tx-robot] updated from transifex 2018-01-04 09:48:31 +00:00
Roeland Jago Douma
49b095b78e
Use proper authorative-autoloader for app autoloaders 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-14 08:31:31 +01:00
Nextcloud bot
96b15cec83
[tx-robot] updated from transifex 2017-11-20 01:09:40 +00:00
Nextcloud bot
8e3861563b
[tx-robot] updated from transifex 2017-11-12 01:10:00 +00:00
Nextcloud bot
6ca4abfc0b
[tx-robot] updated from transifex 2017-11-11 01:10:09 +00:00
Nextcloud bot
ede6499de4
[tx-robot] updated from transifex 2017-11-10 01:09:43 +00:00
Nextcloud bot
aa525d89e8
[tx-robot] updated from transifex 2017-11-09 01:09:13 +00:00
Nextcloud bot
f9b7109de3
[tx-robot] updated from transifex 2017-11-07 01:08:57 +00:00
Nextcloud bot
81ac1ec977
[tx-robot] updated from transifex 2017-11-06 01:09:07 +00:00
Nextcloud bot
7e1e9430b6
[tx-robot] updated from transifex 2017-11-03 01:09:06 +00:00
Joas Schilling
ce12cd91db
Merge pull request #6875 from nextcloud/app_autoloaders 
Move server apps to dedicated autoloader
 2017-11-01 11:15:27 +01:00
Nextcloud bot
84f3d247f2
[tx-robot] updated from transifex 2017-10-28 00:08:32 +00:00
Morris Jobke
ab36980d20
Use ::class in test mocks of dav app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-26 10:16:12 +02:00
Roeland Jago Douma
dd9d2bcb19
ShareByMail Autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-24 20:40:13 +02:00
Morris Jobke
43e498844e
Use ::class in test mocks 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-24 17:45:32 +02:00
Nextcloud bot
1860190305
[tx-robot] updated from transifex 2017-10-24 00:08:45 +00:00
Nextcloud bot
db1096bcfd
[tx-robot] updated from transifex 2017-10-23 00:08:39 +00:00
Nextcloud bot
2b31b82891
[tx-robot] updated from transifex 2017-10-22 00:08:36 +00:00
Nextcloud bot
07b6e234bd
[tx-robot] updated from transifex 2017-10-19 00:08:27 +00:00
Joas Schilling
3119fd41ce
Set the data from the template 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-18 15:12:03 +02:00
Joas Schilling
8b37fe7f65
Set the subject with the email template to allow theming 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-18 15:12:03 +02:00
Nextcloud bot
de2dc3c919
[tx-robot] updated from transifex 2017-09-27 00:08:23 +00:00
Stephan Müller
f7790c2960
expect call of getSlogan() exactly twice 
Signed-off-by: Stephan Müller <mail@stephanmueller.eu>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-25 09:20:46 +02:00
Stephan Müller
86265320b8
do not show hyphen after instance name in emails if slogan does not exist 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-25 09:20:46 +02:00
Nextcloud bot
d603d78630
[tx-robot] updated from transifex 2017-09-19 00:08:27 +00:00
Nextcloud bot
7698781a1e
[tx-robot] updated from transifex 2017-09-14 00:08:12 +00:00
Nextcloud bot
5ce3c7003b
[tx-robot] updated from transifex 2017-09-13 00:08:12 +00:00
Nextcloud bot
194f880073
[tx-robot] updated from transifex 2017-09-08 00:08:16 +00:00
Joas Schilling
6dbb64c4a2
Merge setMetaData into constructor 
This ensures that the meta data is set in the beginning

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-04 15:07:41 +02:00
Nextcloud bot
45f687a279
[tx-robot] updated from transifex 2017-09-01 00:08:27 +00:00
Morris Jobke
404bd1be60
Implement metadata for email templates of remaining emails 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-30 22:56:14 +02:00
Nextcloud bot
1e24fe858a
[tx-robot] updated from transifex 2017-08-30 00:08:26 +00:00
Morris Jobke
3cfe91bf0f
Add shareWith to email template metadata 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-29 16:09:25 +02:00
Morris Jobke
be23f7e1de
Allow the expiration date to be set to null 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-28 17:49:16 +02:00
Morris Jobke
2bf15eda26 Merge pull request #6255 from nextcloud/email-meta-data 
Add meta information to emails for better customisation
 2017-08-26 18:53:52 +02:00
Morris Jobke
f0c34a3e89
Allow the expiration date to be set to null 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-26 17:57:24 +02:00
Nextcloud bot
7b8bd8188e
[tx-robot] updated from transifex 2017-08-25 00:08:59 +00:00
Joas Schilling
09747b296a
Add meta information to emails for better customisation 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-24 17:54:22 +02:00
Nextcloud bot
a7f2dc6dd6
[tx-robot] updated from transifex 2017-08-24 00:08:50 +00:00
Nextcloud bot
ae0789ef43
[tx-robot] updated from transifex 2017-08-22 00:08:20 +00:00
Nextcloud bot
9e1884b27c
[tx-robot] updated from transifex 2017-08-21 00:08:13 +00:00
Nextcloud bot
8c458de4c2
[tx-robot] updated from transifex 2017-08-20 00:08:15 +00:00
Nextcloud bot
6b978ebd29
[tx-robot] updated from transifex 2017-08-19 00:08:26 +00:00
Nextcloud bot
0ceb06fde5
[tx-robot] updated from transifex 2017-08-17 00:08:14 +00:00
Nextcloud bot
cc40f02684
[tx-robot] updated from transifex 2017-08-15 00:08:15 +00:00
Nextcloud bot
d1f3e1de96
[tx-robot] updated from transifex 2017-08-14 00:08:21 +00:00
Nextcloud bot
a2e3c8ede5
[tx-robot] updated from transifex 2017-08-12 00:08:18 +00:00
Nextcloud bot
21dd85678f
[tx-robot] updated from transifex 2017-08-03 00:08:06 +00:00
Nextcloud bot
456392e627
[tx-robot] updated from transifex 2017-08-01 00:08:26 +00:00
Nextcloud bot
98b664a000
[tx-robot] updated from transifex 2017-07-30 00:08:03 +00:00
Nextcloud bot
ce7c62d9bb
[tx-robot] updated from transifex 2017-07-22 00:08:07 +00:00
Joas Schilling
3ff3c338c9 Merge pull request #5734 from nextcloud/only-readable-chars-in-share-tokens 
Only use readable chars in Share Tokens
 2017-07-19 16:40:18 +02:00
Lukas Reschke
d8ec399454
Run phan over code base 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-19 10:28:11 +02:00
Joas Schilling
984933e586
Only use readable chars in Share Tokens 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-18 15:44:34 +02:00
Nextcloud bot
3865c77279
[tx-robot] updated from transifex 2017-07-14 00:08:37 +00:00
Nextcloud bot
261513b04a
[tx-robot] updated from transifex 2017-07-13 00:08:31 +00:00
Nextcloud bot
13295c2d1d
[tx-robot] updated from transifex 2017-07-12 00:08:43 +00:00
Morris Jobke
b4deba2078 Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emails 
Use PNGs for icons in activity emails
 2017-07-07 11:05:00 +02:00
Nextcloud bot
d23bc9a99a
[tx-robot] updated from transifex 2017-07-07 00:08:24 +00:00
Nextcloud bot
2afb4857cc
[tx-robot] updated from transifex 2017-06-30 00:08:23 +00:00
Nextcloud bot
928b6a376e
[tx-robot] updated from transifex 2017-06-29 00:08:26 +00:00