summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Add mimetype support for .URL (Windows) and .webloc (macOS) files. Update ↵Thomas Ebert2017-08-311-1/+14
| | | | | | places/link svg. Add filetype/link icon. Add repair step for mime types. Signed-off-by: Thomas Ebert <thomas.ebert@te-online.net>
* Merge pull request #6296 from nextcloud/improve_2faRoeland Jago Douma2017-08-312-4/+77
|\ | | | | Improve 2FA
| * Improve 2FARoeland Jago Douma2017-08-292-4/+77
| | | | | | | | | | | | | | | | * Store the auth state in the session so we don't have to query it every time. * Added some tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2017-08-314-0/+6
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-302-0/+8
| |
* | Add shareWith to email template metadataMorris Jobke2017-08-291-0/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #6288 from nextcloud/master-6287Morris Jobke2017-08-291-2/+2
|\ \ | | | | | | Allow the expiration date to be set to null
| * | Allow the expiration date to be set to nullMorris Jobke2017-08-281-2/+2
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-08-294-0/+8
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-08-284-158/+162
| |
* | unlock file when an exception occurs during scanningRobin Appelman2017-08-261-69/+87
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Dont swallow exception when inserting mimetypes if we're inside a transactionRobin Appelman2017-08-261-0/+4
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #6255 from nextcloud/email-meta-dataMorris Jobke2017-08-263-2/+34
|\ \ | | | | | | Add meta information to emails for better customisation
| * | Add meta information to emails for better customisationJoas Schilling2017-08-243-2/+34
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #6177 from nextcloud/properly-add-slo-urlMorris Jobke2017-08-263-27/+25
|\ \ \ | | | | | | | | Properly allow \OCP\Authentication\IApacheBackend to specify logout URL
| * | | Inject \OCP\IURLGenerator to make tests workLukas Reschke2017-08-182-3/+4
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Properly allow \OCP\Authentication\IApacheBackend to specify logout URLLukas Reschke2017-08-183-26/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any `\OCP\Authentication\IApacheBackend` previously had to implement `getLogoutAttribute` which returns a string. This string is directly injected into the logout `<a>` tag, so returning something like `href="foo"` would result in `<a href="foo">`. This is rather error prone and also in Nextcloud 12 broken as the logout entry has been moved with 054e161eb5f4a5c5c13ee322ae8e93ce66f01b13 inside the navigation manager where one cannot simply inject attributes. Thus this feature is broken in Nextcloud 12 which effectively leads to the bug described at nextcloud/user_saml#112, people cannot logout anymore when using SAML using SLO. Basically in case of SAML you have a SLO url which redirects you to the IdP and properly logs you out there as well. Instead of monkey patching the Navigation manager I decided to instead change `\OCP\Authentication\IApacheBackend` to use `\OCP\Authentication\IApacheBackend::getLogoutUrl` instead where it can return a string with the appropriate logout URL. Since this functionality is only prominently used in the SAML plugin. Any custom app would need a small change but I'm not aware of any and there's simply no way to fix this properly otherwise. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #6189 from nextcloud/circle-tokenMorris Jobke2017-08-261-0/+9
|\ \ \ \ | |_|_|/ |/| | | link to getShareByToken
| * | | link to getShareByTokenMaxence Lange2017-08-201-0/+9
| | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | | Bump autoloaderRoeland Jago Douma2017-08-262-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Allow 2FA providers to specify their custom CSPChristoph Wurst2017-08-261-0/+38
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-262-0/+2
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-2518-0/+40
| | | |
* | | | Merge pull request #5870 from nextcloud/generate-system-wide-key-pairBjörn Schießle2017-08-246-13/+163
|\ \ \ \ | |_|_|/ |/| | | extend the identity proof manager to allow system wide key pairs
| * | | Update autoloaderRoeland Jago Douma2017-08-102-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | add prefix to user and system keys to avoid name collisionsBjoern Schiessle2017-08-103-3/+117
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | extend the identity proof manager to allow system wide key pairsBjoern Schiessle2017-08-102-12/+46
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-244-26/+34
| | | |
* | | | Merge pull request #6164 from nextcloud/dont-show-error-message-when-sql-failedRoeland Jago Douma2017-08-232-2/+9
|\ \ \ \ | | | | | | | | | | Prevent SQL error message in case of error
| * | | | Prevent SQL error message in case of errorLukas Reschke2017-08-172-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `\OC\User\Database::createUser` can throw a PHP exception in case the UID is longer than permitted in the database. This is against it's PHPDocs and we should cast this to `false`, so that the regular error handling triggers in. The easiest way to reproduce is on MySQL: 1. Create user `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` in admin panel 2. Create user `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` in admin panel again 3. See SQL exception as error message Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-08-232-0/+6
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-08-222-4/+6
| | | | |
* | | | | Merge pull request #6169 from nextcloud/check-encoding-logLukas Reschke2017-08-211-1/+12
|\ \ \ \ \ | | | | | | | | | | | | Ensure log message is UTF-8 encoded
| * | | | | Ensure log message is UTF-8 encodedLukas Reschke2017-08-171-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP's json_encode only accept proper UTF-8 strings, loop over all elements to ensure that they are properly UTF-8 compliant or convert them manually. Without this somebody passing an invalid User Agent may make json_encode return false which will get logged as empty newline. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-08-214-2/+4
| |_|_|/ / |/| | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-08-202-2/+10
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-08-192-2/+44
| |_|_|/ |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-186-2/+60
|/ / /
* | | Merge pull request #6158 from nextcloud/always-log-cron-executionLukas Reschke2017-08-171-1/+0
|\ \ \ | |/ / |/| | Always log cron execution
| * | Always log cron executionMorris Jobke2017-08-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a setting to disable the last execution of cron. There is no known problem with this write access and it was also questioned when this feature was build in https://github.com/owncloud/core/pull/7689#issuecomment-38264707 Recently there was also a bug report about a non-visible last cron execution (#6088) - let's better remove this. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-08-172-4/+4
|/ /
* | Merge pull request #6130 from nextcloud/cleanup-unused-methodsMorris Jobke2017-08-161-57/+0
|\ \ | | | | | | Cleanup unused methods
| * | Cleanup unused methodsMorris Jobke2017-08-151-57/+0
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-08-1656-166/+166
| | |
* | | Merge pull request #6099 from nextcloud/issue-3457-no-exception-on-sharee-errorLukas Reschke2017-08-151-0/+1
|\ \ \ | |/ / |/| | Catch exceptions on error of cloud id resolution
| * | Document that it throwsJoas Schilling2017-08-141-0/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #6123 from nextcloud/cleanup-shareItemMorris Jobke2017-08-152-21/+3
|\ \ \ | | | | | | | | Cleanup usage of shareItem in internal code base
| * | | Cleanup usage of shareItem in internal code baseMorris Jobke2017-08-152-21/+3
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #6121 from nextcloud/cleanup-registerBackendMorris Jobke2017-08-151-13/+0
|\ \ \ \ | | | | | | | | | | Use proper methods for registerBackend
| * | | | Use proper methods for registerBackendMorris Jobke2017-08-151-13/+0
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>