summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | [tx-robot] updated from transifexNextcloud bot2018-10-26152-678/+364
| |
* | Merge pull request #12045 from nextcloud/improve-encrypt-all-stable14Morris Jobke2018-10-254-10/+76
|\ \ | |/ |/| [stable14] Improve encrypt all / decrypt all
| * skip already decrypted files on decrypt all commandBjoern Schiessle2018-10-252-10/+37
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * skip already encrypted files on encrypt all commandBjoern Schiessle2018-10-252-0/+39
|/ | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Merge pull request #12032 from Dagefoerde/stable14-11919-do-not-always-fallbackRoeland Jago Douma2018-10-251-1/+7
|\ | | | | [stable14] Forwarded ExpiredTokenException
| * Catch more occurences where ExpiredTokenException can be thrownRoeland Jago Douma2018-10-251-1/+5
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Expired PK tokens should not fall back to legacy tokensRoeland Jago Douma2018-10-251-0/+2
|/ | | | | | Fixes #11919 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2018-10-2538-52/+108
|
* Merge pull request #12005 from iPaat/Backport14/Fix11847Morris Jobke2018-10-242-3/+3
|\ | | | | [stable14] Remove cookies from Clear-Site-Data Header
| * Remove cookies from Clear-Site-Data HeaderPatrick Conrad2018-10-242-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://github.com/nextcloud/server/commit/2f87fb6b456fd109c90a5093c31b7a3f62a32040 this header was introduced. The referenced documentation says: > When delivered with a response from https://example.com/clear, the following header will cause cookies associated with the origin https://example.com to be cleared, as well as cookies on any origin in the same registered domain (e.g. https://www.example.com/ and https://more.subdomains.example.com/). This also applies if `https://nextcloud.example.com/` sends the `Clear-Site-Data: "cookies"` header. This is not the behavior we want at this point! So I removed the deletion of cookies from the header. This has no effect on the logout process as this header is supported only recently and the logout works in old browsers as well. Signed-off-by: Patrick Conrad <conrad@iza.org> (cherry picked from commit 1806baaeafa284808cceb1a38ea2e1a9189d0407)
* | Merge pull request #11800 from nextcloud/lookupserver-and-global-scale-stable14Morris Jobke2018-10-242-5/+307
|\ \ | | | | | | [stable14] always query the lookup server in a global scale setup
| * | add more testsBjoern Schiessle2018-10-121-0/+231
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | some small fixes and improvementsBjoern Schiessle2018-10-102-6/+29
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | adjust testsBjoern Schiessle2018-10-092-3/+32
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | always query the lookup server in a global scale setup and have a nicer labelBjoern Schiessle2018-10-091-3/+22
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #11783 from suntorytimed/stable14Morris Jobke2018-10-241-0/+4
|\ \ \ | |_|/ |/| | [stable14] backport of #10778
| * | backport of #10778Stefan Weiberg2018-10-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a check to see if keyFileContents is empty: * this fixes a download error and an exception if the data content for encryption is empty * #3958: for recovering encrypted files with a damaged signature this is necessary in addition to turning the signature check off Signed-off-by: Stefan Weiberg <sweiberg@suse.com>
* | | [tx-robot] updated from transifexNextcloud bot2018-10-24136-172/+300
| | |
* | | Merge pull request #11995 from ↵Roeland Jago Douma2018-10-2310-29/+148
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/stable14-11967-fix-opening-a-section-again-in-the-files-app [stable14] Fix opening a section again in the Files app
| * | | Add acceptance tests for opening a section in the Files appDaniel Calviño Sánchez2018-10-232-0/+88
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Remove event handler no longer neededDaniel Calviño Sánchez2018-10-232-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The custom handler for "URL changed" events were added to reload the file list whenever the sections for favorites and shares were opened; this was used to fix the problem of not reloading the file lists when opening them for a second time. However, besides that the handlers were not really necessary, and as the root of the bug was fixed in the previous commit those handlers are now removed. The file list for tags uses the handler for a different purpose, though, so that one was kept. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Fix opening a section again in the Files appDaniel Calviño Sánchez2018-10-236-7/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a section is open in the Files app a "show" event is triggered. File list objects handle that event by reloading themselves, but only if the file list was shown at least once. However, the file list objects of plugins are created when the "show" event is triggered for the first time for their section; as the file list objects register their handler for the "show" event when they are created they never handle the first triggered "show" event, as the handler is set while that event is being already handled. Therefore, from the point of view of the handler, the second time that a "show" event was triggered it was seen as if the file list was shown for the first time, and thus it was not reloaded. Now the "shown" property is explicitly set for those file lists that are created while handling a "show" event, which causes them to be reloaded as expected when opening their section again. Note that it is not possible to just reload the file list whenever it is shown; the file list is reloaded also when the directory changes, and this can happen when the web page is initially loaded and the URL is parsed. In that case, if file lists were reloaded when shown for the first time then it could be reloaded twice, one with the default parameters due to the "show" event and another one with the proper parameters once the URL was parsed, and the files that appeard in the list would depend on which response from the server was received the last. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Fix indentationDaniel Calviño Sánchez2018-10-231-11/+11
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #11994 from nextcloud/assemblly-stream-lazy-14Morris Jobke2018-10-231-5/+6
|\ \ \ \ | | | | | | | | | | lazy open first source stream in assemblystream
| * | | | lazy open first source stream in assemblystreamRobin Appelman2018-10-231-5/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #11961 from nextcloud/backport/11931/stable14Morris Jobke2018-10-231-6/+5
|\ \ \ \ \ | |/ / / / |/| | | | [14] Do not emit preHooks twice on non-part-storage
| * | | | Do not emit preHooks twice on non-part-storageRoeland Jago Douma2018-10-211-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old code would emit the hooks twice. Thus having the version written twice. Which is not very performant as it is first read twice as well. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-10-23578-2206/+3556
| |/ / / |/| | |
* | | | Merge pull request #11925 from ↵Morris Jobke2018-10-237-0/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/backport/11920/properly-ignore-compiled-files-l10n [stable14] Add .l10nignore files for compiled assets
| * | | | Add .l10nignore files for compiled assetsMorris Jobke2018-10-197-0/+25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #11979 from ↵Morris Jobke2018-10-237-107/+304
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix-stable14/noid/forbid_freebusy_but_allow_local_delivery [stable14] allow local delivery of schedule message while prohibiting FreeBusy requests
| * | | | | move disableFreeBusy check from User principal backend to Scheduling Outbox ↵Georg Ehrke2018-10-227-107/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | collection. This allows to keep local delivery of scheduling messages while prohibiting FreeBusy requests Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | Merge pull request #11976 from ↵Roeland Jago Douma2018-10-232-1/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix-stable14/9326/make_sure_usermanager_getByEmail_only_returns_IUser [stable14] filter null values for UserManager::getByEmail
| * | | | | | filter null values for UserManager::getByEmailGeorg Ehrke2018-10-222-1/+38
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | Merge pull request #11990 from ↵Roeland Jago Douma2018-10-231-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | nextcloud/backport/11972/fix-l10n-fetching-from-theme [stable14] Load apps/APP/l10n/*.js and themes/THEME/apps/APP/l10n/*.js
| * | | | | Load apps/APP/l10n/*.js and themes/THEME/apps/APP/l10n/*.jsMorris Jobke2018-10-231-0/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Before it quit right after finding the theme version of the l10n file which results in a not translated part of the UI. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #11950 from ↵Morris Jobke2018-10-222-13/+10
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Birkenstab/allow-same-origin-referrer-policy-backport Allow "same-origin" as "Referrer-Policy" (Backport to stable14)
| * | | | Allow "same-origin" as "Referrer-Policy"Moritz Beck2018-10-202-13/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #11531 Although "same-origin" is more strict than e.g. strict-origin it showed up a warning in setupcheck Based on https://scotthelme.co.uk/a-new-security-header-referrer-policy/ Signed-off-by: Moritz Beck <git@birkenstab.de>
* | | | Merge pull request #11939 from nextcloud/backport/11611/stable14Roeland Jago Douma2018-10-191-1/+1
|\ \ \ \ | | | | | | | | | | [14] Allow userId to be null
| * | | | Allow userId to be nullRoeland Jago Douma2018-10-191-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #10852 A quick hack. Still ensures some type safety however now also accepts null. Else we'd need to add a whole new layer of middlewares. This can only happen when a guest user wants to access a controller that requries the user_id. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #11929 from ↵Morris Jobke2018-10-196-8/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/backport/11870/proper-column-name-escaping [stable14] Properly escape column name in "createFunction" call
| * | | | Properly escape column name in "createFunction" callMorris Jobke2018-10-196-8/+8
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #11772 from nextcloud/stable14-pretty-urls-dont-workMorris Jobke2018-10-191-5/+4
|\ \ \ \ | |/ / / |/| | | [14] Allow overwrite.cli.url without trailing slash
| * | | Backport https://github.com/nextcloud/server/pull/11446Daniel Kesselberg2018-10-111-5/+4
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | Merge pull request #11851 from ↵Joas Schilling2018-10-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/backport/11802/fix-password_by_talk-not-a-boolean [stable14] Fix a case where "password_by_talk" was not a boolean
| * | | | Fix a case where "password_by_talk" was not a boolean (e.g. null or "0") and ↵Morris Jobke2018-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | actively cast it to a boolean This was the error message that we have seen: ``` Argument 1 passed to OC\\Share20\\Share::setSendPasswordByTalk() must be of the type boolean, null given, called in apps/sharebymail/lib/ShareByMailProvider.php on line 981 ``` Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #11798 from nextcloud/backport/11782/stable14Joas Schilling2018-10-151-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | [stable14] Add "Referrer-Policy" to htaccess file, addresses issue #11099
| * | | | Add "Referrer-Policy" to htaccess file, addresses issue #11099Patrik Kernstock2018-10-121-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrik Kernstock <info@pkern.at>
* | | | | Merge pull request #11790 from nextcloud/backport/11745/stable14Roeland Jago Douma2018-10-122-3/+65
|\ \ \ \ \ | |/ / / / |/| | | | [14] php7.3 CI
| * | | | Allow php7.3Roeland Jago Douma2018-10-121-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>