summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4308 from nextcloud/lost-password-emailLukas Reschke2017-04-132-25/+18
|\ | | | | Update email template for lost password email
| * Update email template for lost password emailMorris Jobke2017-04-122-25/+18
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #2424 from ↵Morris Jobke2017-04-131-1/+4
|\ \ | | | | | | | | | | | | nextcloud/fix-login-controller-test-consolidate-login Fix login controller test and consolidate login
| * | do login routine only once when done via LoginControllerArthur Schiwon2017-04-061-1/+1
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | fix login controller testsArthur Schiwon2017-04-061-0/+3
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #4337 from nextcloud/fix-adblock-share-iconMorris Jobke2017-04-133-12/+11
|\ \ \ | | | | | | | | Fix AdBlock blocking share icon, ref #866
| * | | Fix AdBlock blocking share icon, ref #866Jan-Christoph Borchardt2017-04-123-12/+11
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Add support for ratelimiting via annotationsLukas Reschke2017-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows adding rate limiting via annotations to controllers, as one example: ``` @UserRateThrottle(limit=5, period=100) @AnonRateThrottle(limit=1, period=100) ``` Would mean that logged-in users can access the page 5 times within 100 seconds, and anonymous users 1 time within 100 seconds. If only an AnonRateThrottle is specified that one will also be applied to logged-in users. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #3043 from nextcloud/issue-3038-no-logentry-on-email-loginMorris Jobke2017-04-131-2/+10
|\ \ \ \ | | | | | | | | | | Dont create a log entry on email login
| * | | | Dont create a log entry on email loginJoas Schilling2017-04-071-2/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-1370-380/+418
| | | | |
* | | | | Move to handlebars.min.jsRoeland Jago Douma2017-04-125-9192/+34
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | core.js is now below 1mb! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Moved to jquery-ui.custom.min.jsRoeland Jago Douma2017-04-125-29698/+9
| |/ / |/| | | | | | | | | | | | | | Shaves off about 200kb of the default loaded js libs Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #4309 from nextcloud/remove-unused-codeLukas Reschke2017-04-122-51/+0
|\ \ \ | | | | | | | | Removes unused code for link share emails
| * | | Removes unused code for link share emailsMorris Jobke2017-04-112-51/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * now handled by sharebymail app * see https://github.com/nextcloud/server/pull/657 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-128-14/+32
|/ / /
* | | Merge pull request #4285 from nextcloud/bump-md5Morris Jobke2017-04-116-597/+12
|\ \ \ | | | | | | | | [js] Bump blueimp-md5
| * | | [js] Bump blueimp-md5 a major versionRoeland Jago Douma2017-04-103-42/+9
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | [js] Bump blueimp-md5Roeland Jago Douma2017-04-106-562/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * bumped to latest * moved to min Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #4280 from nextcloud/share_via_displayRoeland Jago Douma2017-04-112-0/+40
|\ \ \ \ | | | | | | | | | | Show 'shared via' in share list for reshares
| * | | | Show 'shared via' in share list for resharesRoeland Jago Douma2017-04-112-0/+40
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1330 userA shares a file to userB userB shares that file to userC userA can see both userB and userC. Now they can also see that userB shared it to user C Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #4256 from nextcloud/themingLukas Reschke2017-04-115-29/+10
|\ \ \ \ | | | | | | | | | | Move OC_Defaults to OCP\Defaults
| * | | | Move OC_Defaults to OCP\DefaultsMorris Jobke2017-04-095-29/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * currently there are two ways to access default values: OCP\Defaults or OC_Defaults (which is extended by OCA\Theming\ThemingDefaults) * our code used a mixture of both of them, which made it hard to work on theme values * this extended the public interface with the missing methods and uses them everywhere to only rely on the public interface Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #2618 from nextcloud/2fa-challenge-textLukas Reschke2017-04-112-21/+25
|\ \ \ \ \ | | | | | | | | | | | | Move log out and backup codes link into 2fa box for better readability
| * | | | | Use button instead of simple linksChristoph Wurst2017-03-062-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | Move log out and back codes link into 2fa box for better readabilityChristoph Wurst2017-03-062-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/2538 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-04-112-0/+12
| |_|/ / / |/| | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-104-0/+34
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-0916-6/+258
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-0872-836/+378
| |/ / / |/| | |
* | | | Merge pull request #4136 from nextcloud/expire-date-for-all-sharesMorris Jobke2017-04-074-12/+256
|\ \ \ \ | | | | | | | | | | Unified sharing options
| * | | | Parse date trough momentRoeland Jago Douma2017-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Fix share dropdown opacity issueJan-Christoph Borchardt2017-04-071-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Fix font-weight of Unshare entryJan-Christoph Borchardt2017-04-071-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | reset password field properties before we hide itBjoern Schiessle2017-04-071-1/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | add datepicker to the popoverBjoern Schiessle2017-04-071-10/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | allow to edit single files shared by mail. This is useful for collaborative ↵Bjoern Schiessle2017-04-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | editing documents Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | update unit testsBjoern Schiessle2017-04-071-4/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | change permission orderBjoern Schiessle2017-04-031-12/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | make sure that variables are defined correctlyBjoern Schiessle2017-04-031-4/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | fix typo and capitalize crudsBjoern Schiessle2017-04-031-8/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | set expire date for all share typesBjoern Schiessle2017-04-033-12/+49
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | add secure drop functionallity to mail sharesBjoern Schiessle2017-04-032-1/+50
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | allow password protected mail sharesBjoern Schiessle2017-04-032-3/+107
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | add new password column to the share table in order to set passwords for ↵Bjoern Schiessle2017-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | share by mails Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | allow the user to set a expire date for all sharesBjoern Schiessle2017-04-032-0/+38
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | Increase clickable area of app iconJan-Christoph Borchardt2017-04-071-10/+7
| |_|/ / |/| | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-074-0/+18
| |_|/ |/| |
* | | [tx-robot] updated from transifexNextcloud bot2017-04-0672-80/+108
| | |
* | | Merge pull request #4123 from nextcloud/allow-password-reset-with-emailRoeland Jago Douma2017-04-051-13/+26
|\ \ \ | | | | | | | | Allow to reset the password with the email as an input
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 06:17:16 +0000