6f86e468d4
inject ISecureRandom into user session and use injected config too
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-02 13:39:16 +01:00
d907666232
bring back remember-me
...
* try to reuse the old session token for remember me login
* decrypt/encrypt token password and set the session id accordingly
* create remember-me cookies only if checkbox is checked and 2fa solved
* adjust db token cleanup to store remembered tokens longer
* adjust unit tests
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-02 13:39:16 +01:00
dada3ffb51
Merge pull request #1977 from nextcloud/adjust-badges
...
Adjust badges
2016-11-02 12:35:32 +01:00
370123b8b0
Merge pull request #1966 from nextcloud/fix-csrf-token-generation
...
Fix CSRF token generation / validation
2016-11-02 12:09:30 +01:00
acf01b7f06
Merge pull request #1975 from nextcloud/federated-sharing-always-https-by-default
...
use https by default if no protocol is given.
2016-11-02 12:09:11 +01:00
f86e4642af
Adjust badges
...
- Removes the Drone badge
- This one is lying most of the time since it isn't checking master but the latest build. Thus it fails when it effectively doesn't fail. Let's remove that since it makes us look bad.
- Add CodeCov badge
- Add CII badge
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 11:51:23 +01:00
7da3ba3f91
Merge pull request #657 from nextcloud/share-by-mail
...
New share provider: Share by mail
2016-11-02 11:04:33 +01:00
76b1dee499
use https by default if no protocol is given. Only use unsecure connection if it is explicitely given
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-02 10:44:55 +01:00
e5d78a3523
Fix CSRF token generation / validation
...
Operate on raw bytes instead of base64-encoded strings.
Issue was introduced in a977465
2016-11-02 10:38:05 +01:00
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
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
122fbf0092
[tx-robot] updated from transifex
2016-11-02 01:07:09 +00:00
f2b2b8d894
import exception
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 20:12:01 +01:00
6e52091c8e
remove unused variable
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 20:11:30 +01:00
32dbf32bc5
add new method getSharesInFolder(), see #339
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 20:05:09 +01:00
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
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
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
6d7520b1e2
unit tests updated and new added
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
1e930df91f
find and show share-by mail links
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
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
31c8c38bd6
send mail for share-by-mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
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
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
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
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
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
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
96c40d14a1
update permissions
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00
a17c6a485d
add share by mail share provider
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00
0a6f02801f
introduce share by mail, ui part
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00
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
7e2159e9bb
Add defaultShareProvider & federatedshareprovider tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-01 13:52:37 +01:00
d2110ebb0b
Add Manager unit tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-01 12:35:50 +01:00
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
20f45e6fe4
[tx-robot] updated from transifex
2016-11-01 01:06:57 +00:00
ce7eb02685
Add remoteprovider getsharesinfolder function
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-31 20:26:11 +01:00
5a00870a2b
Stricter signature
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-31 20:19:14 +01:00
3692769b0a
Add getShareTypesInFolder to optimize folder listening
...
Signed-off-by: Robin Appelman <icewind@owncloud.com>
2016-10-31 15:55:40 +01:00
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
357a823457
Merge pull request #1961 from nextcloud/configphp_begone
...
Remove config.php for oc.js
2016-10-31 11:51:20 +01:00
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
6f65189a1c
Merge pull request #1952 from nextcloud/deprecated_backgroudjob
...
Cleanup deprecated backgroudjob functions
2016-10-31 11:30:46 +01:00
7f30cf9119
Remove config.php for oc.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-31 11:00:39 +01:00
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
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
85016977f4
Merge pull request #1935 from nextcloud/downstream-ldap-26
...
Add prefix to the connection
2016-10-31 09:27:09 +01:00
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
6d2d069c17
[tx-robot] updated from transifex
2016-10-31 01:06:55 +00:00
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
Christoph Wurst
Joas Schilling
Roeland Jago Douma
Lukas Reschke
Bjoern Schiessle
Leon Klingele
Nextcloud bot
Roeland Jago Douma
Robin Appelman
Marius Blüm