aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix typ in constant nameLukas Reschke2016-11-021-4/+4
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Fix invalid PHPDocsLukas Reschke2016-11-021-1/+1
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* inject ISecureRandom into user session and use injected config tooChristoph Wurst2016-11-023-61/+79
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* bring back remember-meChristoph Wurst2016-11-0220-184/+420
| | | | | | | | | | * 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>
* Merge pull request #1977 from nextcloud/adjust-badgesJoas Schilling2016-11-021-1/+2
|\ | | | | Adjust badges
| * Adjust badgesLukas Reschke2016-11-021-1/+2
| | | | | | | | | | | | | | | | | | - 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>
* | Merge pull request #1966 from nextcloud/fix-csrf-token-generationRoeland Jago Douma2016-11-023-7/+15
|\ \ | | | | | | Fix CSRF token generation / validation
| * | Fix CSRF token generation / validationLeon Klingele2016-11-023-7/+15
| | | | | | | | | | | | | | | | | | | | | Operate on raw bytes instead of base64-encoded strings. Issue was introduced in a977465 Signed-off-by: Leon Klingele <git@leonklingele.de>
* | | Merge pull request #1975 from ↵Roeland Jago Douma2016-11-024-38/+66
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/federated-sharing-always-https-by-default use https by default if no protocol is given.
| * | use https by default if no protocol is given. Only use unsecure connection ↵Bjoern Schiessle2016-11-024-38/+66
| |/ | | | | | | | | | | if it is explicitely given Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #657 from nextcloud/share-by-mailJoas Schilling2016-11-0225-290/+2120
|\ \ | |/ |/| New share provider: Share by mail
| * import exceptionBjoern Schiessle2016-11-011-0/+1
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * remove unused variableBjoern Schiessle2016-11-011-1/+0
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * add new method getSharesInFolder(), see #339Bjoern Schiessle2016-11-012-1/+84
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * add tests for the share-by-mail providerBjoern Schiessle2016-11-012-8/+622
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * always show correct place holder, mention share by mail only if the share ↵Bjoern Schiessle2016-11-015-10/+151
| | | | | | | | | | | | provider is enabled Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * enabled by default and add to shipped.jsonBjoern Schiessle2016-11-012-0/+2
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * unit tests updated and new addedBjoern Schiessle2016-11-015-187/+161
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * find and show share-by mail linksBjoern Schiessle2016-11-012-0/+11
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * don't show 'notify by mail' option or permissions not available for mail sharesBjoern Schiessle2016-11-013-6/+14
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * send mail for share-by-mail sharesBjoern Schiessle2016-11-014-7/+180
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * if we have a exact match, either for the federated cloud id or for theBjoern Schiessle2016-11-011-26/+41
| | | | | | | | | | | | | | 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>
| * unified way to display remote shares and mail sharesBjoern Schiessle2016-11-014-10/+17
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * show correct display name if we have the user in one of our address booksBjoern Schiessle2016-11-011-4/+24
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * improve search for federated cloud ids and email adressesBjoern Schiessle2016-11-011-8/+58
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * handle case if no share-by-mail share provider is loadedBjoern Schiessle2016-11-013-2/+16
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * add method to check if a share provider for a given type is loadedBjoern Schiessle2016-11-013-0/+62
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * update permissionsBjoern Schiessle2016-11-012-2/+10
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * add share by mail share providerBjoern Schiessle2016-11-017-7/+685
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * introduce share by mail, ui partBjoern Schiessle2016-11-013-75/+45
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #1964 from ↵Roeland Jago Douma2016-11-023-6/+35
|\ \ | | | | | | | | | | | | nextcloud/color-the-trusted-domain-to-alert-the-admin Color the trusted domain to alert the admin a bit more
| * | Color the trusted domain to alert the admin a bit moreJoas Schilling2016-10-313-6/+35
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #1951 from nextcloud/settingsmaxheightRoeland Jago Douma2016-11-021-0/+3
|\ \ \ | | | | | | | | restricted the height of the settings area in core/css/apps.css
| * | | restricted the height of the settings area in core/css/apps.css to max 80%pgys2016-10-291-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: pgys <info@pexlab.space>
* | | | [tx-robot] updated from transifexNextcloud bot2016-11-0228-4/+236
| |_|/ |/| |
* | | Merge pull request #339 from nextcloud/share-types-by-folderLukas Reschke2016-11-0112-10/+412
|\ \ \ | | | | | | | | Add getShareTypesInFolder to optimize folder listening
| * | | Add defaultShareProvider & federatedshareprovider testsRoeland Jago Douma2016-11-012-0/+136
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Add Manager unit testsRoeland Jago Douma2016-11-011-6/+77
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Fix merging backend resultsRoeland Jago Douma2016-11-014-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Merge share types correctly * Filter share types * Order share types Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Add remoteprovider getsharesinfolder functionRoeland Jago Douma2016-10-311-2/+40
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Stricter signatureRoeland Jago Douma2016-10-314-6/+9
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Add getShareTypesInFolder to optimize folder listeningRobin Appelman2016-10-3110-4/+146
| | |/ | |/| | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
* / | [tx-robot] updated from transifexNextcloud bot2016-11-0192-2858/+3274
|/ /
* | Merge pull request #1961 from nextcloud/configphp_begoneRoeland Jago Douma2016-10-311-207/+0
|\ \ | | | | | | Remove config.php for oc.js
| * | Remove config.php for oc.jsRoeland Jago Douma2016-10-311-207/+0
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #1937 from nextcloud/ros-for-notification-messageRoeland Jago Douma2016-10-312-12/+76
|\ \ \ | | | | | | | | Allow rich object strings in messages as well
| * | | Type hints already make sure it is an arrayJoas Schilling2016-10-311-16/+6
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Allow rich object strings in messages as wellJoas Schilling2016-10-312-0/+74
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #1952 from nextcloud/deprecated_backgroudjobLukas Reschke2016-10-313-112/+0
|\ \ \ \ | |_|/ / |/| | | Cleanup deprecated backgroudjob functions
| * | | Cleanup usagesRoeland Jago Douma2016-10-292-20/+0
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-01 21:49:39 +0000