summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #9659 from nextcloud/backport/9653/stable13Morris Jobke2018-05-292-0/+89
|\ \ \ \ | | | | | | | | | | [stable13] The OAuth endpoint needs to support Basic Auth
| * | | | The OAuth endpoint needs to support Basic AuthRoeland Jago Douma2018-05-292-0/+89
| |/ / / | | | | | | | | | | | | | | | | | | | | * Add test Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #9651 from nextcloud/backport/9271/stable13Morris Jobke2018-05-292-4/+2
|\ \ \ \ | | | | | | | | | | [stable13] Fix undefined variables
| * | | | Remove a check for an unused variableMorris Jobke2018-05-291-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Left over from a refactoring https://github.com/nextcloud/server/pull/1940 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Fix undefined variable - found by PhanMorris Jobke2018-05-291-1/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #9656 from nextcloud/backport/9490/stable13Morris Jobke2018-05-291-6/+14
|\ \ \ \ | | | | | | | | | | [stable13] Make LargeFileHelper.php faster by avoiding execs as much as possible
| * | | | Make LargeFileHelper.php faster by avoiding execs as much as possiblemarco442018-05-291-6/+14
| |/ / / | | | | | | | | | | | | Signed-off-by: Marc Cousin <cousinmarc@gmail.com>
* | | | Merge pull request #9649 from nextcloud/sabre-head-dont-open-file-13Morris Jobke2018-05-291-0/+0
|\ \ \ \ | | | | | | | | | | [13] dont open the file on dav HEAD request
| * | | | dont open the file on dav HEAD requestRobin Appelman2018-05-291-0/+0
| |/ / / | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #9608 from nextcloud/smb-exceptions-on-listingMorris Jobke2018-05-291-3/+13
|\ \ \ \ | |_|/ / |/| | | [13] Handle exception while itterating trough smb file listing
| * | | Make SMB module more fault-tolerantRoland Tapken2018-05-251-3/+13
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Ignore unavailable files when fetching the share's mtime or reading directory listings. This can happen on servers using a distributed file system (DFS) with unavailable destinations, for example when the remote server is offline. Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
* | | Merge pull request #9652 from nextcloud/search-category-stable13theming-1.4.5Morris Jobke2018-05-291-0/+5
|\ \ \ | |_|/ |/| | [stable13] Add search category icon
| * | Add search category iconJohn Molakvoæ (skjnldsv)2018-05-291-0/+5
|/ / | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #9647 from nextcloud/release/noid/theming-1.4.5-translationsblizzz2018-05-291-1/+1
|\ \ | | | | | | [stable13] prepare another theming release including translations for recently added imprint and privacy policy strings
| * | prepare another theming release including translations for recentlyArthur Schiwon2018-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | added imprint and privacy policy strings. Languages: fi, fr, de, de_DE (formal), it, es, pt_BR, tr Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #9620 from nextcloud/backport/9576/stable13Morris Jobke2018-05-293-8/+18
|\ \ \ | |/ / |/| | [stable13] Emit event when running ./occ db:add-missing-indices
| * | Emit event when running ./occ db:add-missing-indicesRoeland Jago Douma2018-05-283-8/+18
| | | | | | | | | | | | | | | | | | | | | This allows apps to listen to this event in order to also update indecies there. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-05-2932-8/+44
| | |
* | | Merge pull request #9629 from nextcloud/backport/9627/stable13Roeland Jago Douma2018-05-281-1/+1
|\ \ \ | | | | | | | | [stable13] Limit Sinon version to 5.0.7 at most
| * | | Limit Sinon version to 5.0.7 at mostDaniel Calviño Sánchez2018-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using fake servers with Sinon.JS, the JavaScript test framework, the XHR objects are also fake. In Sinon 5.0.8 the "setRequestHeader" of XMLHttpRequest was modified to normalize the header values (as requested by the spec), but since then only string values are accepted; null or integer values can no longer be passed to "setRequestHeader", as it expects the "replace" function to be available in the object. However, in the tests null and integer values are passed to "setRequestHeader", which causes them to fail. Both Firefox and Chromium accept passing non-string values to their "setRequestHeader" implementation, and it is done, for example, in davclient.js; it is not clear yet whether Sinon got too restrictive or the code calling "setRequestHeader" was too loose. Given that davclient.js is an external dependency, as a temporary measure Sinon version is forced to be 5.0.7 at most until either Sinon or davclient.js are updated. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #9622 from nextcloud/backport/9475/stable13Morris Jobke2018-05-283-0/+20
|\ \ \ \ | |/ / / |/| | | [stable13] Delete the previews when a version is restored
| * | | Delete the previews when a version is restoredRoeland Jago Douma2018-05-263-0/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Fixes #9469 When a version of a file is restored the previews are no longer valid. Thus we should remove them so they are regenerated. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9619 from nextcloud/backport/9515/stable13Roeland Jago Douma2018-05-281-0/+1
|\ \ \ | | | | | | | | [stable13] Regenerate session id after public share auth
| * | | Regenerate session id after public share authRoeland Jago Douma2018-05-261-0/+1
| |/ / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-05-2826-0/+74
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-05-27114-188/+252
| | |
* | | Merge pull request #9621 from nextcloud/backport/9418/stable13Roeland Jago Douma2018-05-261-0/+5
|\ \ \ | |/ / |/| | [stable13] Add PHP missing message to index.php
| * | Add PHP missing message to index.phpMarius Blüm2018-05-261-0/+5
|/ / | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* / [tx-robot] updated from transifexNextcloud bot2018-05-2670-98/+214
|/
* [tx-robot] updated from transifexNextcloud bot2018-05-25236-408/+582
|
* Merge pull request #9590 from nextcloud/bug/9514/fix-settings-menuMorris Jobke2018-05-241-1/+1
|\ | | | | [stable13] Fix settings menu
| * Fix scope of nav css ruleJulius Härtl2018-05-241-1/+1
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #9579 from ↵Morris Jobke2018-05-242-7/+48
|\ \ | | | | | | | | | | | | nextcloud/bugfix_stable13/noid/fix_force_language_html_attr [stable13] make sure force language is reflected in html lang attribute
| * | Always set the request language to the force languageRoeland Jago Douma2018-05-241-6/+5
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | make sure force language is reflected in html lang attributeGeorg Ehrke2018-05-242-7/+49
| |/ | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | Merge pull request #9586 from nextcloud/feature/9577/privacy-linkMorris Jobke2018-05-2410-25/+178
|\ \ | |/ |/| [stable13] add privacy link to theming and fix scrollbars
| * bump theming version ¯\_(ツ)_/¯Arthur Schiwon2018-05-241-1/+1
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * addjust footer height when legal links are present. fixes #9572Arthur Schiwon2018-05-243-3/+16
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * also add a privacy linkArthur Schiwon2018-05-248-22/+162
|/ | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Merge pull request #9573 from nextcloud/fix/9568/theming-wo-sigRoeland Jago Douma2018-05-241-8/+6
|\ | | | | bump version for theming again 🙇
| * bump version for theming again 🙇Arthur Schiwon2018-05-241-8/+6
| | | | | | | | | | | | also make appinfo compliant with appstore's schema. except default_enable… Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | [tx-robot] updated from transifexNextcloud bot2018-05-24140-110/+502
| |
* | Merge pull request #9566 from nextcloud/backport/9395/stable13Morris Jobke2018-05-231-9/+12
|\ \ | | | | | | [stable13] cleanup locks in scanner on error
| * | cleanup locks in scanner on errorRobin Appelman2018-05-231-9/+12
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #9392 from nextcloud/dav-upload-lock-13Roeland Jago Douma2018-05-231-1/+10
|\ \ \ | |/ / |/| | [13] only allow a single concurrent dav write to a file
| * | only allow a single concurrent dav write to a fileRobin Appelman2018-05-041-1/+10
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #9540 from nextcloud/backport/9517/stable13Morris Jobke2018-05-2321-74/+852
|\ \ \ | |_|/ |/| | [stable13] Improve OAuth
| * | Add testsRoeland Jago Douma2018-05-222-40/+324
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Don't use special chars to avoid confusionRoeland Jago Douma2018-05-222-1/+8
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Rotate tokenRoeland Jago Douma2018-05-221-11/+43
| | | | | | | | | | | | | | | | | | | | | | | | On a refresh token request: * rorate * reset expire Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>