summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9590 from nextcloud/bug/9514/fix-settings-menuMorris Jobke2018-05-241-1/+1
|\
| * Fix scope of nav css ruleJulius Härtl2018-05-241-1/+1
* | Merge pull request #9579 from nextcloud/bugfix_stable13/noid/fix_force_langua...Morris Jobke2018-05-242-7/+48
|\ \
| * | Always set the request language to the force languageRoeland Jago Douma2018-05-241-6/+5
| * | make sure force language is reflected in html lang attributeGeorg Ehrke2018-05-242-7/+49
| |/
* | Merge pull request #9586 from nextcloud/feature/9577/privacy-linkMorris Jobke2018-05-2410-25/+178
|\ \ | |/ |/|
| * bump theming version ¯\_(ツ)_/¯Arthur Schiwon2018-05-241-1/+1
| * addjust footer height when legal links are present. fixes #9572Arthur Schiwon2018-05-243-3/+16
| * also add a privacy linkArthur Schiwon2018-05-248-22/+162
|/
* Merge pull request #9573 from nextcloud/fix/9568/theming-wo-sigRoeland Jago Douma2018-05-241-8/+6
|\
| * bump version for theming again 🙇Arthur Schiwon2018-05-241-8/+6
* | [tx-robot] updated from transifexNextcloud bot2018-05-24140-110/+502
* | Merge pull request #9566 from nextcloud/backport/9395/stable13Morris Jobke2018-05-231-9/+12
|\ \
| * | cleanup locks in scanner on errorRobin Appelman2018-05-231-9/+12
* | | Merge pull request #9392 from nextcloud/dav-upload-lock-13Roeland Jago Douma2018-05-231-1/+10
|\ \ \ | |/ / |/| |
| * | only allow a single concurrent dav write to a fileRobin Appelman2018-05-041-1/+10
* | | Merge pull request #9540 from nextcloud/backport/9517/stable13Morris Jobke2018-05-2321-74/+852
|\ \ \ | |_|/ |/| |
| * | Add testsRoeland Jago Douma2018-05-222-40/+324
| * | Don't use special chars to avoid confusionRoeland Jago Douma2018-05-222-1/+8
| * | Rotate tokenRoeland Jago Douma2018-05-221-11/+43
| * | Authenticate the clients on requesting a tokenRoeland Jago Douma2018-05-221-2/+45
| * | Fail if the response type is not properly setRoeland Jago Douma2018-05-221-1/+10
| * | Set OAuth token expirationRoeland Jago Douma2018-05-225-2/+89
| * | Certain tokens can expireRoeland Jago Douma2018-05-2212-16/+238
| * | Allow the rotation of tokensRoeland Jago Douma2018-05-225-2/+96
* | | Merge pull request #9522 from nextcloud/backport/9325/stable13Roeland Jago Douma2018-05-231-0/+3
|\ \ \
| * | | unbound cloned connection fixRoger Szabo2018-05-181-0/+3
* | | | [tx-robot] updated from transifexNextcloud bot2018-05-23482-21942/+24006
* | | | Merge pull request #9548 from remyj38/stable13Morris Jobke2018-05-221-0/+3
|\ \ \ \
| * | | | Fix translation bug on lost password pageRémy Jacquin2018-05-221-0/+3
* | | | | Merge pull request #9547 from nextcloud/bump/noid/themingJulius Härtl2018-05-221-1/+1
|\ \ \ \ \
| * | | | | bump theming version for extraordinary releaseArthur Schiwon2018-05-221-1/+1
|/ / / / /
* | | | | Merge pull request #9516 from nextcloud/backport/9437/stable13Morris Jobke2018-05-2210-9/+136
|\ \ \ \ \
| * | | | | Backport of #9437Arthur Schiwon2018-05-1810-9/+136
| | |/ / / | |/| | |
* | | | | Merge pull request #9525 from nextcloud/backport/8504/stable13Morris Jobke2018-05-221-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Dont use $info as array when its not an arrayJoas Schilling2018-05-181-1/+1
| |/ / /
* | | | [tx-robot] updated from transifexNextcloud bot2018-05-2234-38/+166
* | | | [tx-robot] updated from transifexNextcloud bot2018-05-212-0/+4
| |/ / |/| |
* | | [tx-robot] updated from transifexNextcloud bot2018-05-2010-2/+28
* | | [tx-robot] updated from transifexNextcloud bot2018-05-1914-0/+72
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-05-18330-458/+458
* | [tx-robot] updated from transifexNextcloud bot2018-05-17232-524/+524
* | Merge pull request #9454 from nextcloud/stable13-9245-fix-race-condition-when...Morris Jobke2018-05-141-1/+17
|\ \
| * | Fix race condition when preparing upload folderDaniel Calviño Sánchez2018-05-101-1/+17
* | | Merge pull request #9453 from nextcloud/stable13-9237-fix-ids-of-permission-c...Morris Jobke2018-05-142-13/+61
|\ \ \
| * | | Remove no longer needed escaping of special charactersDaniel Calviño Sánchez2018-05-101-3/+1
| * | | Fix ids of permission checkboxes for sharesDaniel Calviño Sánchez2018-05-102-11/+61
| |/ /
* | | Merge pull request #9432 from nextcloud/backport/9225/ipv6-database-hostMorris Jobke2018-05-142-10/+80
|\ \ \
| * | | php 5.6 compatibilityJoas Schilling2018-05-091-1/+1
| * | | Add tests for special domain nameMorris Jobke2018-05-091-0/+2