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

202 commits

Author SHA1 Message Date
Morris Jobke
ba43a09380 Merge pull request #4512 from nextcloud/fix-translations-2 
Fix translations
 2017-04-26 08:57:08 -03:00
Joas Schilling
bec9f18a0f Merge pull request #4478 from nextcloud/improve_settings_help 
adding some documentation hints and some smaller cleanup
 2017-04-26 09:45:01 +02:00
Joas Schilling
f43e7a9405
Fix past tense 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-26 09:27:41 +02:00
Nextcloud bot
e5fe41e16b
[tx-robot] updated from transifex 2017-04-26 00:07:43 +00:00
Jan-Christoph Borchardt
bbb58625fe Wording fixes 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-25 17:45:35 +02:00
Jan-Christoph Borchardt
4e537b5d6b Small layout fixes to settings hints 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-25 17:45:35 +02:00
Frank Karlitschek
5e1ce69b05 adding some documentation hints and some smaller cleanup 2017-04-25 17:45:35 +02:00
Nextcloud bot
133f3fdc9a
[tx-robot] updated from transifex 2017-04-25 00:07:30 +00:00
Nextcloud bot
a01f946c56
[tx-robot] updated from transifex 2017-04-24 00:07:28 +00:00
Nextcloud bot
11c7953888
[tx-robot] updated from transifex 2017-04-23 00:07:31 +00:00
Lukas Reschke
7acdc2a096 Merge pull request #4432 from nextcloud/fix-grammar 
Fix grammar
 2017-04-22 08:15:46 +02:00
Nextcloud bot
363d1c69dd
[tx-robot] updated from transifex 2017-04-22 00:07:36 +00:00
Morris Jobke
aa2bed44b6
Fix grammar 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-21 16:07:12 -05:00
Morris Jobke
6c294c3407
fix typo 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-20 16:33:27 +02:00
Morris Jobke
9d07ec5a96
Fix casing 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-20 16:33:27 +02:00
Bjoern Schiessle
aa54d31bd2
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-20 16:33:27 +02:00
Bjoern Schiessle
972b4c04e2
respect password policy for auto generated passwords 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-20 16:33:26 +02:00
Bjoern Schiessle
428d7cdb5e
improve mail text 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-20 16:33:26 +02:00
Bjoern Schiessle
f00c1eccf7
create activity if a password was send by mail 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-20 16:33:26 +02:00
Bjoern Schiessle
7a8f8cbb33
templates no longer needed 2017-04-20 16:33:26 +02:00
Bjoern Schiessle
d8dcd72118
allow admin to enforce password on mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-20 16:33:26 +02:00
Morris Jobke
16c4755e03
Rename renderHTML to renderHtml 
* fixes #4383
* improves consistency

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-19 15:46:41 -05:00
Lukas Reschke
a3569a1452 Merge pull request #4382 from nextcloud/use-proper-reply-to 
Add "Reply-To" on ShareByMailProvider mails
 2017-04-19 12:04:18 +02:00
Lukas Reschke
b7fe28bba1
Fix indentation 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-19 12:03:54 +02:00
Nextcloud bot
c40b7acb09
[tx-robot] updated from transifex 2017-04-18 20:47:45 +00:00
Lukas Reschke
203ef88509
Add "Reply-To" on ShareByMailProvider mails 
Fixes https://github.com/nextcloud/server/issues/4209

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-18 22:23:07 +02:00
Nextcloud bot
b072d2c49d
[tx-robot] updated from transifex 2017-04-18 00:07:25 +00:00
Nextcloud bot
df2235c71f
[tx-robot] updated from transifex 2017-04-17 00:07:33 +00:00
Nextcloud bot
69e0e2420c
[tx-robot] updated from transifex 2017-04-16 00:07:23 +00:00
Morris Jobke
10290eb006 Merge pull request #2834 from nextcloud/accesListToShareManager 
Access list to share manager
 2017-04-15 13:06:24 -05:00
Nextcloud bot
dafa9c740a
[tx-robot] updated from transifex 2017-04-15 00:07:36 +00:00
Nextcloud bot
0f96d5a641
[tx-robot] updated from transifex 2017-04-14 00:07:36 +00:00
Roeland Jago Douma
cab41118f6
Mail shares trigger the public key 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-13 15:19:23 +02:00
Joas Schilling
629b7c0fc3
Adjust docs and make !$currentAccess simpler 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:58:52 +02:00
Joas Schilling
6c23a5fa35
Add unit tests for sharebymail provider 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:58:52 +02:00
Roeland Jago Douma
12afd7d1d5
Add mail element to access list 
* Each provider just returns what they have so adding an element won't
require changing everything
* Added tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-13 12:58:50 +02:00
Roeland Jago Douma
2cbac3357b
Offload acceslist creation to providers 
* This allows for effective queries.
* Introduce currentAccess parameter to speciy if the users needs to have
currently acces (deleted incomming group share). (For notifications)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-13 12:58:50 +02:00
Nextcloud bot
396618fd19
[tx-robot] updated from transifex 2017-04-13 00:08:02 +00:00
Joas Schilling
983210de2e
Dont add click-button text for plaintext mails 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-12 17:16:27 +02:00
Joas Schilling
506c7731a6
Don't duplicate the sentence with the header 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-12 17:16:26 +02:00
Morris Jobke
d0bae447fb
Use new email design for sharebymail emails 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-12 17:16:26 +02:00
Nextcloud bot
633b952358
[tx-robot] updated from transifex 2017-04-12 00:07:44 +00:00
Morris Jobke
11d6fe1023 Merge pull request #4283 from nextcloud/shares-by-folder-quote 
properly quota table names in getSharesInFolder
 2017-04-10 19:39:19 -05:00
Nextcloud bot
4d90b0520e
[tx-robot] updated from transifex 2017-04-11 00:07:29 +00:00
Robin Appelman
a555672f21
properly quota table names in getSharesInFolder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-10 17:59:40 +02:00
Bjoern Schiessle
cbacca4202
move capabilities to share by mail app 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-10 17:18:13 +02:00
Nextcloud bot
d25a96d921
[tx-robot] updated from transifex 2017-04-10 00:08:50 +00:00
Nextcloud bot
16091f4424
[tx-robot] updated from transifex 2017-04-09 00:07:40 +00:00
Morris Jobke
ca9d25169d Merge pull request #4136 from nextcloud/expire-date-for-all-shares 
Unified sharing options
 2017-04-07 17:14:05 -05:00
Bjoern Schiessle
11b46389af
adjust to changes in the theming app 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 15:44:00 +02:00
Bjoern Schiessle
3323d01db1
update unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 15:43:59 +02:00
Nextcloud bot
7d9688c89e
[tx-robot] updated from transifex 2017-04-06 00:07:50 +00:00
Nextcloud bot
84035862f7
[tx-robot] updated from transifex 2017-04-05 00:08:20 +00:00
Bjoern Schiessle
dac6826ad7
setting to disable sending password by mail 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:29:33 +02:00
Bjoern Schiessle
b84fd7c361
set expire date for all share types 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:29:32 +02:00
Bjoern Schiessle
c191173d59
allow password protected mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:29:32 +02:00
Bjoern Schiessle
c6613ee8fc
fix share provider id 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:20:49 +02:00
Nextcloud bot
9098042c95
[tx-robot] updated from transifex 2017-04-01 00:08:09 +00:00
Jan-Christoph Borchardt
9a75714c22
rename confusing getMailHeaderColor to getColorPrimary, ref #3491 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-03-29 18:23:23 +02:00
Nextcloud bot
528a903a7b
[tx-robot] updated from transifex 2017-03-20 01:07:43 +00:00
Nextcloud bot
4da6b7e796
[tx-robot] updated from transifex 2017-03-15 01:07:49 +00:00
Nextcloud bot
37fcc41004
[tx-robot] updated from transifex 2017-03-12 01:08:05 +00:00
Nextcloud bot
53195b156c
[tx-robot] updated from transifex 2017-03-02 16:48:52 +00:00
Nextcloud bot
7fc3129f0c
[tx-robot] updated from transifex 2017-02-28 01:07:54 +00:00
Nextcloud bot
f3a7b7eaa3
[tx-robot] updated from transifex 2017-02-27 01:19:49 +00:00
Nextcloud bot
556b958af2
[tx-robot] updated from transifex 2017-02-25 01:25:07 +00:00
Nextcloud bot
97b6c1496e
[tx-robot] updated from transifex 2017-02-24 01:21:37 +00:00
Nextcloud bot
54317e80c0
[tx-robot] updated from transifex 2017-02-23 01:18:48 +00:00
Nextcloud bot
a08dfd9951
[tx-robot] updated from transifex 2017-02-22 01:12:24 +00:00
Nextcloud bot
51f06bb1f8
[tx-robot] updated from transifex 2017-02-19 01:07:37 +00:00
Nextcloud bot
41276f720b
[tx-robot] updated from transifex 2017-02-15 01:07:29 +00:00
Nextcloud bot
7113af3f91
[tx-robot] updated from transifex 2017-02-14 01:07:20 +00:00
Nextcloud bot
88047aaea7
[tx-robot] updated from transifex 2017-02-13 01:07:10 +00:00
Nextcloud bot
f9d94edb0f
[tx-robot] updated from transifex 2017-02-12 01:07:26 +00:00
Nextcloud bot
01b3da612b
[tx-robot] updated from transifex 2017-02-11 01:07:23 +00:00
Morris Jobke
8a74ab88d8
add transifex config for sharebymail 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-09 19:53:32 -06:00
Bjoern Schiessle
27357569b6
generate correct path for owner and use the display name instead of the user id 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-12 12:44:41 +01:00
Joas Schilling
6de0eb0b74
Remove leading slash from sharing activity 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-15 15:53:48 +01:00
Joas Schilling
edec1fafe7
Update app versions and requirements 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-13 20:41:55 +01:00
Morris Jobke
ac1bf3c2b7 Merge pull request #2432 from nextcloud/activity-mail-language 
Make sure the activity emails can be sent in the users language
 2016-12-01 23:01:00 +01:00
Lukas Reschke
a87638c6ab Merge pull request #2371 from nextcloud/issue-2369-add-share-indicator-for-mail-shares 
Add share indicator for mail shares
 2016-12-01 12:17:56 +01:00
Joas Schilling
b2f46bfa04
Adjust all implementations in the server repo 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-01 11:35:23 +01:00
Joas Schilling
15ca00c66e
Make sure the app is loaded in dav 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-30 09:21:58 +01:00
Morris Jobke
01867b42d4 Update sharedbymail template 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-30 01:07:00 +01:00
Joas Schilling
f067d0ee66
Correctly match the subjects to the parameters 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-25 11:45:40 +01:00
Joas Schilling
9f915e061c
Remove old test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-25 11:17:40 +01:00
Joas Schilling
719b1905d7
Get user name from contacts if available 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-25 11:17:06 +01:00
Joas Schilling
5c2ec58440
Move ShareByMail activities to new API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-24 16:15:51 +01:00
Lukas Reschke
bc1008ac38
Use 11.0 instead 9.2 
As discussed we're changing the version from 9.2 to 11.0 to make some more sense.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-15 14:45:58 +01:00
Joas Schilling
1c97d1b4ed
Fix some typos 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-08 17:05:29 +01:00
Bjoern Schiessle
25bcd71d02
add activity if a file was shared by mail 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-08 15:58:52 +01:00
Jan-Christoph Borchardt
219b536f70 add share by mail icon, fix #1979 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-03 14:05:43 +01:00
Lukas Reschke
ffba8297df
Run code checker on more shipped apps 
Adds:
- sharebymail
- systemtags
- theming
- workflowengine

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-03 00:11:28 +01:00
Bjoern Schiessle
f2b2b8d894
import exception 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 20:12:01 +01:00
Bjoern Schiessle
32dbf32bc5
add new method getSharesInFolder(), see #339 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 20:05:09 +01:00
Bjoern Schiessle
16ec0f2177
add tests for the share-by-mail provider 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
86b362809b
always show correct place holder, mention share by mail only if the share provider is enabled 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
ce08682c2f
enabled by default and add to shipped.json 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
1e930df91f
find and show share-by mail links 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
561dd80d57
don't show 'notify by mail' option or permissions not available for mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle
31c8c38bd6
send mail for share-by-mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle
a17c6a485d
add share by mail share provider 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:51:11 +01:00