summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* [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 nextcloud/properly-do-bruteforce-protection-via...Roeland Jago Douma2017-04-141-25/+11
|\
| * Make BruteForceProtection annotation more cleverLukas Reschke2017-04-131-25/+11
* | [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 emailMorris Jobke2017-04-122-25/+18
* | Merge pull request #2424 from nextcloud/fix-login-controller-test-consolidate...Morris Jobke2017-04-131-1/+4
|\ \
| * | do login routine only once when done via LoginControllerArthur Schiwon2017-04-061-1/+1
| * | fix login controller testsArthur Schiwon2017-04-061-0/+3
* | | Merge pull request #4337 from nextcloud/fix-adblock-share-iconMorris Jobke2017-04-133-12/+11
|\ \ \
| * | | Fix AdBlock blocking share icon, ref #866Jan-Christoph Borchardt2017-04-123-12/+11
* | | | Add support for ratelimiting via annotationsLukas Reschke2017-04-131-1/+1
* | | | 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 loginJoas Schilling2017-04-071-2/+10
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-1370-380/+418
* | | | | Move to handlebars.min.jsRoeland Jago Douma2017-04-125-9192/+34
| |_|_|/ |/| | |
* | | | Moved to jquery-ui.custom.min.jsRoeland Jago Douma2017-04-125-29698/+9
| |/ / |/| |
* | | Merge pull request #4309 from nextcloud/remove-unused-codeLukas Reschke2017-04-122-51/+0
|\ \ \
| * | | Removes unused code for link share emailsMorris Jobke2017-04-112-51/+0
* | | | [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 a major versionRoeland Jago Douma2017-04-103-42/+9
| * | | [js] Bump blueimp-md5Roeland Jago Douma2017-04-106-562/+10
* | | | Merge pull request #4280 from nextcloud/share_via_displayRoeland Jago Douma2017-04-112-0/+40
|\ \ \ \
| * | | | Show 'shared via' in share list for resharesRoeland Jago Douma2017-04-112-0/+40
| |/ / /
* | | | Merge pull request #4256 from nextcloud/themingLukas Reschke2017-04-115-29/+10
|\ \ \ \
| * | | | Move OC_Defaults to OCP\DefaultsMorris Jobke2017-04-095-29/+10
* | | | | Merge pull request #2618 from nextcloud/2fa-challenge-textLukas Reschke2017-04-112-21/+25
|\ \ \ \ \
| * | | | | Use button instead of simple linksChristoph Wurst2017-03-062-6/+4
| * | | | | Move log out and back codes link into 2fa box for better readabilityChristoph Wurst2017-03-062-21/+27
* | | | | | [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
|\ \ \ \
| * | | | Parse date trough momentRoeland Jago Douma2017-04-071-1/+1
| * | | | Fix share dropdown opacity issueJan-Christoph Borchardt2017-04-071-0/+1
| * | | | Fix font-weight of Unshare entryJan-Christoph Borchardt2017-04-071-2/+2
| * | | | reset password field properties before we hide itBjoern Schiessle2017-04-071-1/+7
| * | | | add datepicker to the popoverBjoern Schiessle2017-04-071-10/+26
| * | | | allow to edit single files shared by mail. This is useful for collaborative e...Bjoern Schiessle2017-04-071-2/+0
| * | | | update unit testsBjoern Schiessle2017-04-071-4/+3
| * | | | change permission orderBjoern Schiessle2017-04-031-12/+10
| * | | | make sure that variables are defined correctlyBjoern Schiessle2017-04-031-4/+2
| * | | | fix typo and capitalize crudsBjoern Schiessle2017-04-031-8/+8
| * | | | set expire date for all share typesBjoern Schiessle2017-04-033-12/+49
| * | | | add secure drop functionallity to mail sharesBjoern Schiessle2017-04-032-1/+50