Bjoern Schiessle
f556c58c22
remove 'send mail notification' option from sharing, replaced by send-by-mail feature
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-02 18:30:38 +01:00
Joas Schilling
7da3ba3f91
Merge pull request #657 from nextcloud/share-by-mail
...
New share provider: Share by mail
2016-11-02 11:04:33 +01:00
Roeland Jago Douma
42b0a0d2af
Merge pull request #1964 from nextcloud/color-the-trusted-domain-to-alert-the-admin
...
Color the trusted domain to alert the admin a bit more
2016-11-02 10:06:35 +01:00
Roeland Jago Douma
19af06cdea
Merge pull request #1951 from nextcloud/settingsmaxheight
...
restricted the height of the settings area in core/css/apps.css
2016-11-02 08:45:05 +01:00
Nextcloud bot
122fbf0092
[tx-robot] updated from transifex
2016-11-02 01:07:09 +00:00
Bjoern Schiessle
f2b2b8d894
import exception
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 20:12:01 +01:00
Bjoern Schiessle
6e52091c8e
remove unused variable
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 20:11:30 +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
6d7520b1e2
unit tests updated and new added
...
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
7436e45c91
if we have a exact match, either for the federated cloud id or for the
...
email address we only return the exact match. It is highly unlikely
that the exact same email address and federated cloud id exists
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
Bjoern Schiessle
392c8a115f
unified way to display remote shares and mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
Bjoern Schiessle
8c8a019b7e
show correct display name if we have the user in one of our address books
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
Bjoern Schiessle
60a3893ca8
improve search for federated cloud ids and email adresses
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
Bjoern Schiessle
77f74b9780
handle case if no share-by-mail share provider is loaded
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
Bjoern Schiessle
318160647a
add method to check if a share provider for a given type is loaded
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:39 +01:00
Bjoern Schiessle
96c40d14a1
update permissions
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +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
Bjoern Schiessle
0a6f02801f
introduce share by mail, ui part
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00
Lukas Reschke
ef467c3195
Merge pull request #339 from nextcloud/share-types-by-folder
...
Add getShareTypesInFolder to optimize folder listening
2016-11-01 18:44:00 +01:00
Roeland Jago Douma
7e2159e9bb
Add defaultShareProvider & federatedshareprovider tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-01 13:52:37 +01:00
Roeland Jago Douma
d2110ebb0b
Add Manager unit tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-01 12:35:50 +01:00
Roeland Jago Douma
fc4d0a86ef
Fix merging backend results
...
* Merge share types correctly
* Filter share types
* Order share types
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-01 12:16:05 +01:00
Nextcloud bot
20f45e6fe4
[tx-robot] updated from transifex
2016-11-01 01:06:57 +00:00
Roeland Jago Douma
ce7eb02685
Add remoteprovider getsharesinfolder function
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-31 20:26:11 +01:00
Roeland Jago Douma
5a00870a2b
Stricter signature
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-31 20:19:14 +01:00
Robin Appelman
3692769b0a
Add getShareTypesInFolder to optimize folder listening
...
Signed-off-by: Robin Appelman <icewind@owncloud.com>
2016-10-31 15:55:40 +01:00
Joas Schilling
247b7f37ce
Color the trusted domain to alert the admin a bit more
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-31 12:22:21 +01:00
Roeland Jago Douma
357a823457
Merge pull request #1961 from nextcloud/configphp_begone
...
Remove config.php for oc.js
2016-10-31 11:51:20 +01:00
Roeland Jago Douma
e416ee7b74
Merge pull request #1937 from nextcloud/ros-for-notification-message
...
Allow rich object strings in messages as well
2016-10-31 11:51:02 +01:00
Lukas Reschke
6f65189a1c
Merge pull request #1952 from nextcloud/deprecated_backgroudjob
...
Cleanup deprecated backgroudjob functions
2016-10-31 11:30:46 +01:00
Roeland Jago Douma
7f30cf9119
Remove config.php for oc.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-31 11:00:39 +01:00
Joas Schilling
54c0501ffa
Type hints already make sure it is an array
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-31 10:37:40 +01:00
Joas Schilling
2c0b5dee19
Allow rich object strings in messages as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-31 10:37:37 +01:00
Lukas Reschke
85016977f4
Merge pull request #1935 from nextcloud/downstream-ldap-26
...
Add prefix to the connection
2016-10-31 09:27:09 +01:00
Lukas Reschke
230dca0065
Merge pull request #1903 from nextcloud/fix-log-in-button
...
remove slight transparency of primary action button, ref #1615
2016-10-31 08:51:09 +01:00
Nextcloud bot
6d2d069c17
[tx-robot] updated from transifex
2016-10-31 01:06:55 +00:00
Marius Blüm
a08a4b5981
Merge pull request #1955 from nextcloud/issue_#1776
...
Issue-1776: Add unshare function to 3-dot menu.
2016-10-30 11:27:57 +01:00
Nextcloud bot
1187a8c183
[tx-robot] updated from transifex
2016-10-30 00:06:56 +00:00
pgys
bd7abc2d0a
restricted the height of the settings area in core/css/apps.css to max 80%
...
Signed-off-by: pgys <info@pexlab.space>
2016-10-29 17:50:51 +02:00
Julia Bode
2d91831b50
Issue-1776: Add unshare function to 3-dot menu.
...
Signed-off-by: Julia Bode <julia.bode@lulisaur.us>
2016-10-29 17:07:06 +02:00
Roeland Jago Douma
e55e6f1f14
Cleanup usages
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-29 14:29:50 +02:00
Roeland Jago Douma
d5159423cd
Removed depreacted functions (since 6.0)
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-29 14:27:12 +02:00
Lukas Reschke
e48fa1c337
Merge pull request #1948 from nextcloud/move_away_lagacy_oc_l10n
...
Move away from legacy OC_L10N
2016-10-29 09:39:22 +02:00
Nextcloud bot
035890aeb1
[tx-robot] updated from transifex
2016-10-29 00:07:14 +00:00