50cb3a5e5a
Merge pull request #1984 from nextcloud/improve-error-messages-federated-sharing
...
improved error messages in case federated sharing fails
2016-11-02 20:19:44 +01:00
88199f1cc1
Add .htaccess checker as CI step
...
Don't want anyone to commit invalid changes in that file again 🙈
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 20:11:30 +01:00
c901c851ca
Merge pull request #1960 from nextcloud/adjust-link-to-contributing.md
...
Adjust link to contributing.md
2016-11-02 20:04:45 +01:00
3bdec28dad
Merge pull request #1971 from nextcloud/fix-checkbox-glitch
...
Fix checkbox left margin glitch
2016-11-02 20:02:36 +01:00
e6b52ef4cd
Merge pull request #1347 from nextcloud/bring-back-remember-me
...
fix remember me login
2016-11-02 18:32:38 +01:00
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
4623b70cc9
catch all exception and return a user friendly exception message
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-02 18:05:14 +01:00
e81d04cd8d
Merge pull request #1940 from nextcloud/new-appstore
...
Use new appstore API
2016-11-02 17:00:24 +00:00
4da6b20e76
document what the method does
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-02 17:42:46 +01:00
23dd62b653
Merge pull request #1982 from nextcloud/revert-1949-disable-codecov-comments
...
Revert "Disable codecov comments"
2016-11-02 16:33:08 +01:00
db891d823a
Remove sunburst
2016-11-02 15:33:22 +01:00
d747590771
Revert "Disable codecov comments"
2016-11-02 15:29:13 +01:00
bc5268bdc8
Fix #1782
...
Fix checkbox left margin glitch
Fix tests
fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-02 15:07:24 +01:00
ffebc050d0
Merge pull request #1887 from nextcloud/downstream-26370
...
Added functions to check etag of elements - integration tests
2016-11-02 14:57:45 +01:00
9d6e01ef40
Add missing tests and fix PHPDoc
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 13:39:17 +01:00
271f2a4cff
Fix typ in constant name
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 13:39:17 +01:00
b269ed5a7b
Fix invalid PHPDocs
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 13:39:17 +01:00
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
d6f156feb4
Adjust link to contributing.md
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-02 10:32:30 +01:00
3011738d47
Revert "Move CONTRIBUTUNG and issue template into .github subfolder"
...
This reverts commit 9ebd8d80ff
2016-11-02 10:31:53 +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
9b66e8f7d9
Throw an exception when a shipped app was not replaced before the update
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-02 10:00:14 +01:00
ea786a35a6
Fix intergration tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-02 08:49:58 +01:00
e5bc45c349
Fix OCS API to be able to remove group shares from self as recipient
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-02 08:49:58 +01:00
3135d3a7b2
Added test case about issue 26346
2016-11-02 08:49:58 +01:00
7d9e031abe
Changed description of variable
2016-11-02 08:49:58 +01:00
a3c3ec9dd7
Added functions to check etag of elements
2016-11-02 08:49:57 +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
Lukas Reschke
Roeland Jago Douma
Morris Jobke
Bjoern Schiessle
Michael Grosser
Christoph Wurst
John Molakvoæ
Joas Schilling
Leon Klingele
Roeland Jago Douma
Sergio Bertolin
Nextcloud bot