summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3573 from ↵Lukas Reschke2017-02-221-1/+8
|\ | | | | | | | | nextcloud/correctly-catch-the-exception-from-pathinfo Catch exception from path info
| * Catch exception from path infoJoas Schilling2017-02-221-1/+8
| | | | | | | | | | | | | | We don't really care when the path info can not be gathered correctly. we will simply not use SCSS then but the CSS fallback. Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2017-02-222-2/+2
| |
* | Merge pull request #3544 from nextcloud/iservercontainer-containerMorris Jobke2017-02-201-1/+1
|\ \ | |/ |/| IServerContainer is effectively an IContainer
| * IServerContainer is effectively an IContainerChristoph Wurst2017-02-201-1/+1
| | | | | | | | | | | | This relation was not explicitly declared in the class description. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #3505 from robert-scheck/autoindexLukas Reschke2017-02-201-0/+2
|\ \ | |/ |/| Only request "IndexIgnore" if mod_autoindex is loaded
| * Only request "IndexIgnore" if mod_autoindex is loadedRobert Scheck2017-02-201-0/+2
| | | | | | | | Signed-off-by: Robert Scheck <robert@fedoraproject.org>
* | [tx-robot] updated from transifexNextcloud bot2017-02-182-0/+368
| |
* | Revert "cache the storage info for 5 min"Morris Jobke2017-02-161-29/+5
| |
* | Merge pull request #3439 from nextcloud/oc-26963Lukas Reschke2017-02-161-8/+8
|\ \ | | | | | | Make sure invalid images don't flood the log file
| * | Check if color exists in palette before using itVictor Dubiniuk2017-02-101-3/+3
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | Make sure invalid images don't flood the log fileJoas Schilling2017-02-101-5/+5
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Don't force displayname if backend already provides oneLukas Reschke2017-02-161-1/+12
| |/ |/| | | | | | | | | | | | | `\OC_User::loginWithApache` is used in combination with backend mechanisms like our SSO / SAML integration. Those can optionally already provide a displayname using other means. For example by mapping SAML attributes. The current approach makes it however impossible for backends using `\OCP\Authentication\IApacheBackend` to set a displayname on their own. Because the display name will simply be overwritten with the loginname. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #2606 from temparus/masterblizzz2017-02-151-3/+6
|\ \ | | | | | | Add preLoginValidation hook
| * | Update license headerSandro Lutz2017-02-071-0/+2
| | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
| * | Merge remote-tracking branch 'nextcloud/master'Sandro Lutz2017-02-07161-3696/+4822
| |\ \ | | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
| * | | Add check if UserManager is of type PublicEmitter before calling preLogin hookSandro Lutz2017-02-011-1/+3
| | | | | | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
| * | | Change where preLogin hook gets calledSandro Lutz2017-02-011-3/+2
| | | | | | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
| * | | Remove preLoginValidation hookSandro Lutz2017-02-011-3/+0
| | | | | | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
| * | | Fix indentationSandro Lutz2017-02-011-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
| * | | Add preLoginValidation hookSandro Lutz2017-02-011-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
* | | | Merge pull request #3495 from nextcloud/dav-protectedRoeland Jago Douma2017-02-151-7/+7
|\ \ \ \ | | | | | | | | | | Make it easier to subclass DAV storage
| * | | | Make it easier to subclass DAV storageRobin Appelman2017-02-151-7/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #3447 from nextcloud/getmetadata-permissions-maskRoeland Jago Douma2017-02-152-1/+10
|\ \ \ \ \ | | | | | | | | | | | | also apply permissions mask in getMetaData
| * | | | | also apply permissions mask in getMetaDataRobin Appelman2017-02-102-1/+10
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #3262 from nextcloud/jail-scanner-storage-idRoeland Jago Douma2017-02-153-7/+3
|\ \ \ \ \ | | | | | | | | | | | | Make sure we use the correct storage id and parent id when scanning a jailed storage
| * | | | | Make sure we use the correct storage id when scanning a jailed storageRobin Appelman2017-01-253-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-02-152-0/+16
| | | | | |
* | | | | | Merge pull request #3477 from nextcloud/fix-cloud-id-manager-injectionMorris Jobke2017-02-142-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix DI of the cloud id manager into apps
| * | | | | | Fix DI of the cloud id manager into appsJoas Schilling2017-02-142-0/+6
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #3472 from nextcloud/enable-avatars-alwaysMorris Jobke2017-02-143-6/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Always enable avatars
| * | | | | | Always enable avatarsMorris Jobke2017-02-133-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * we introduced this setting in the begining because our avatar support caused some performance issues, but we fixed them and should only provide one way how Nextcloud looks Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #3465 from nextcloud/storage-log-locksLukas Reschke2017-02-144-3/+86
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Add option to enable locking debug logging
| * | | | | | Add missing PHPDoc and properly throw exceptionMorris Jobke2017-02-134-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | Add storage to log item as wellLukas Reschke2017-02-131-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | | Add option to enable locking debug loggingRobin Appelman2017-02-131-3/+48
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-02-144-4/+376
| | | | | |
* | | | | | Merge pull request #3444 from nextcloud/recognize-bat-and-cmdMorris Jobke2017-02-131-0/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Recognize .bat and .cmd files
| * | | | | | Recognize .bat and .cmd filesJoas Schilling2017-02-101-0/+14
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #3448 from kuimovvg/masterLukas Reschke2017-02-131-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | bug when connect to yandex webdav server
| * | | | | bug when connect to yandex webdav servervkuimov2017-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server think that request like <?xml version="1.0" encoding="UTF-8"?> <d:propfind xmlns:d="DAV:"> <d:prop/> </d:propfind> is 400: Bad Request
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-02-132-0/+2
| | | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-02-116-10/+504
| | | | | |
* | | | | | Merge pull request #3417 from nextcloud/push-notificationMorris Jobke2017-02-102-2/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | Push notification
| * | | | | | Make sure to use the right appdata directoryJoas Schilling2017-02-091-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Save the used token id in the session so it can be used later onJoas Schilling2017-02-091-2/+20
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #3430 from nextcloud/fix-ios-client-detectionMorris Jobke2017-02-102-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix detection of the new iOS app
| * | | | | Fix detection of the new iOS appJoas Schilling2017-02-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #3424 from nextcloud/fix-upgrade-pathBjörn Schießle2017-02-101-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix return value of getAllowedPreviousVersions()
| * | | | | | Fix return value of getAllowedPreviousVersions()Morris Jobke2017-02-091-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 06:10:40 +0000