summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4387 from nextcloud/fix-little-glitchMorris Jobke2017-04-191-1/+1
|\ | | | | Fix font-weight of settings button
| * Fix font-weight of settings buttonMorris Jobke2017-04-181-1/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4388 from nextcloud/remove-unused-stuffMorris Jobke2017-04-191-58/+0
|\ \ | | | | | | Remove unused CSS styles
| * | Remove unused CSS stylesMorris Jobke2017-04-181-58/+0
| |/ | | | | | | | | | | * could not find an traces of .popup and .arrow anywhere else Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Improve menu CSSMorris Jobke2017-04-192-7/+6
| | | | | | | | | | | | | | | | * fix mess with menus and actions in the files app * reduces amount of !important usages * keeps the behaviour on mobile as well as on desktop Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4385 from nextcloud/remove-unused-cssRoeland Jago Douma2017-04-191-6/+0
|\ \ | | | | | | Remove unused CSS
| * | Remove unused CSSMorris Jobke2017-04-181-6/+0
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4350 from ↵Roeland Jago Douma2017-04-192-12/+13
|\ \ | | | | | | | | | | | | nextcloud/adjust-old-bruteforce-protection-annotations Adjust existing bruteforce protection code
| * | Adjust existing bruteforce protection codeLukas Reschke2017-04-142-12/+13
| | | | | | | | | | | | | | | | | | | | | - Moves code to annotation - Adds the `throttle()` call on the responses on existing annotations Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | [tx-robot] updated from transifexNextcloud bot2017-04-192-0/+4
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-04-1870-646/+136
| | |
* | | Merge pull request #4369 from nextcloud/fix-translationsMorris Jobke2017-04-184-4/+4
|\ \ \ | | | | | | | | Fix translations
| * | | Fix translationsJoas Schilling2017-04-184-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | expand clickable area of popover menu entries to full widthJan-Christoph Borchardt2017-04-181-0/+1
| |_|/ |/| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | [tx-robot] updated from transifexNextcloud bot2017-04-182-0/+2
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-04-1814-4/+50
| |
* | [tx-robot] updated from transifexNextcloud bot2017-04-176-0/+58
| |
* | [tx-robot] updated from transifexNextcloud bot2017-04-1522-102/+190
|/
* Merge pull request #4346 from ↵Roeland Jago Douma2017-04-141-25/+11
|\ | | | | | | | | nextcloud/properly-do-bruteforce-protection-via-annotation Make BruteForceProtection annotation more clever
| * Make BruteForceProtection annotation more cleverLukas Reschke2017-04-131-25/+11
| | | | | | | | | | | | | | | | This makes the new `@BruteForceProtection` annotation more clever and moves the relevant code into it's own middleware. Basically you can now set `@BruteForceProtection(action=$key)` as annotation and that will make the controller bruteforce protected. However, the difference to before is that you need to call `$responmse->throttle()` to increase the counter. Before the counter was increased every time which leads to all kind of unexpected problems. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | [tx-robot] updated from transifexNextcloud bot2017-04-1470-252/+408
|/
* 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
| | | | |