summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12072 from ↵Vincent Petry2014-11-104-114/+156
|\ | | | | | | | | owncloud/sabre-convertstoragenotavailableexception-secondtry Convert StorageNotAvailableException to SabreDAV exception
| * Convert StorageNotAvailableException to SabreDAV exceptionVincent Petry2014-11-104-114/+156
| | | | | | | | | | | | | | | | | | Convert \OCP\Files\StorageNotAvailableException to \Sabre\DAV\Exception\ServiceUnavailable for every file/directory operation happening inside of SabreDAV. This is necessary to avoid having the exception bubble up to remote.php which would return an exception page instead of an appropriate response.
* | Merge pull request #12027 from owncloud/cleanup_exceptionsVincent Petry2014-11-101-2/+2
|\ \ | |/ |/| [encryption] clean up encryption exceptions
| * clean up encryption exceptionsBjoern Schiessle2014-11-071-2/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-102-2/+2
| |
* | logging changesCraig Morrissey2014-11-071-0/+3
| |
* | don't scan part filesBjoern Schiessle2014-11-072-5/+5
| |
* | Also propagate etag changes when the watcher finds a changed fileRobin Appelman2014-11-072-0/+7
|/
* Merge pull request #11954 from ↵Lukas Reschke2014-11-071-1/+7
|\ | | | | | | | | owncloud/enc_stop_uploading_if_private_key_is_missing Enc stop uploading if private key is missing
| * throw exception if private key is missingBjoern Schiessle2014-11-051-1/+7
| |
* | Merge pull request #12019 from owncloud/fix-template-shortcutsThomas Müller2014-11-071-2/+2
|\ \ | | | | | | second parameter in template shortcuts script() and style() is optional
| * | second parameter in template shortcuts script() and style() is optionalMorris Jobke2014-11-061-2/+2
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-072-0/+2
| | |
* | | Merge pull request #12003 from owncloud/password-migrationLukas Reschke2014-11-062-33/+9
|\ \ \ | |/ / |/| | Use new hashing API for OC_User_Database
| * | Load PHPAss via autoloaderLukas Reschke2014-11-061-1/+2
| | |
| * | Use new hashing API for OC_User_DatabaseLukas Reschke2014-11-061-32/+7
| | | | | | | | | | | | This will use the new Hashing API for OC_User_Database and migrate old passwords upon initial login of the user.
* | | Merge pull request #12009 from owncloud/make-optionalMorris Jobke2014-11-061-2/+2
|\ \ \ | | | | | | | | Make second argument optional
| * | | Make second argument optionalLukas Reschke2014-11-061-2/+2
| | | | | | | | | | | | | | | | Equivalent to addVendorScript und addScript from OC_Util
* | | | Merge pull request #11945 from owncloud/share-setup-other-userRobin Appelman2014-11-061-3/+18
|\ \ \ \ | |/ / / |/| | | Setup shared mounts for the correct user when setting up the filesystem
| * | | Support displaynames for dummy user backendRobin Appelman2014-11-061-3/+18
| | | |
* | | | Merge pull request #11998 from owncloud/add-get-logger-to-interfaceLukas Reschke2014-11-061-0/+7
|\ \ \ \ | |_|/ / |/| | | Add getLogger() to IServerContainer
| * | | Add getLogger() to IServerContainerLukas Reschke2014-11-061-0/+7
| | | | | | | | | | | | | | | | Makes my IDE complaining less ;-)
* | | | Add OCP\Security\IHasherLukas Reschke2014-11-064-0/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Public interface for hashing which also works with legacy ownCloud hashes and supports updating the legacy hash via a passed reference. Follow-up of https://github.com/owncloud/core/pull/10219#issuecomment-61624662 Requires https://github.com/owncloud/3rdparty/pull/136
* | | | Merge pull request #11883 from owncloud/clear-session-for-setupLukas Reschke2014-11-061-1/+2
|\ \ \ \ | |_|/ / |/| | | Clear session before setup
| * | | Clear session before setupLukas Reschke2014-10-311-1/+2
| | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/11861
* | | | Merge pull request #11972 from owncloud/usermanager-remove-deleteLukas Reschke2014-11-062-22/+5
|\ \ \ \ | |_|/ / |/| | | Remove confusingly names \OC\User\Manager::delete and fix the automatic ...
| * | | Remove confusingly names \OC\User\Manager::delete and fix the automatic ↵Robin Appelman2014-11-052-22/+5
| | | | | | | | | | | | | | | | cache cleanup instead
* | | | md5 now handled via bowerMorris Jobke2014-11-061-1/+1
| | | |
* | | | bower snapjsMorris Jobke2014-11-061-1/+1
| | | |
* | | | Merge pull request #11982 from owncloud/bower-underscoreVincent Petry2014-11-061-1/+1
|\ \ \ \ | | | | | | | | | | bower underscore
| * | | | bower underscoreMorris Jobke2014-11-051-1/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-062-0/+2
|/ / / /
* | | | Merge pull request #11936 from owncloud/bower-jqueryLukas Reschke2014-11-051-2/+2
|\ \ \ \ | | | | | | | | | | Bower jquery
| * | | | migrate jQuery to bowerMorris Jobke2014-11-041-2/+2
| | | | |
* | | | | Merge pull request #11965 from owncloud/fix-jsonresponseThomas Müller2014-11-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fix typo in content type for JSONResponse
| * | | | | fix typo in content typeBernhard Posselt2014-11-051-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #11928 from owncloud/support-HTML-in-logoThomas Müller2014-11-052-0/+20
|\ \ \ \ \ | |/ / / / |/| | | | Support HTML in logo
| * | | | Support HTML in logo claimLukas Reschke2014-11-032-0/+20
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-052-0/+2
| |_|_|/ |/| | |
* | | | fix shortcuts - underline instead of camelCaseMorris Jobke2014-11-041-2/+2
| |/ / |/| |
* | | Merge pull request #11916 from owncloud/introduce-bowerMorris Jobke2014-11-043-17/+75
|\ \ \ | | | | | | | | Introduce bower dependency managment for frontend libraries
| * | | replace moment.js with bower versionMorris Jobke2014-11-031-1/+1
| | | | | | | | | | | | | | | | * fix JS unit tests
| * | | ability to add bower resourcesMorris Jobke2014-11-032-16/+74
| |/ / | | | | | | | | | | | | | | | * add addVendorScript & addVendorStyle * refactoring of addScript and addStyle * add shortcuts vendorScript and vendorStyle
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-042-2/+2
| | |
* | | Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfigMorris Jobke2014-11-031-1/+1
|\ \ \ | |/ / |/| | First check whether it is the default config before touching
| * | First check whether it is the default config before touchignLukas Reschke2014-11-031-1/+1
| | | | | | | | | | | | Potentially fixes https://github.com/owncloud/core/issues/11678
* | | Update Pimple to V3.0Thomas Müller2014-11-033-15/+17
| | |
* | | Update Symfony/Console to 2.5 & Update Symfony/Routing to 2.5Thomas Müller2014-11-031-2/+0
|/ /
* | fix odd behaviourMorris Jobke2014-10-311-4/+8
| |
* | Merge pull request #9044 from owncloud/add-missing-email-principalVincent Petry2014-10-311-0/+12
|\ \ | | | | | | adding missing email address for principal
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-08 15:02:38 +0000