summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* 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
| | |
* | | Merge pull request #12003 from owncloud/password-migrationLukas Reschke2014-11-061-32/+7
|\ \ \ | |/ / |/| | Use new hashing API for OC_User_Database
| * | 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
| | |
* | | Add OCP\Security\IHasherLukas Reschke2014-11-062-0/+159
|/ / | | | | | | | | | | | | 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 #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
* | Merge pull request #11928 from owncloud/support-HTML-in-logoThomas Müller2014-11-051-0/+12
|\ \ | |/ |/| Support HTML in logo
| * Support HTML in logo claimLukas Reschke2014-11-031-0/+12
| |
* | fix shortcuts - underline instead of camelCaseMorris Jobke2014-11-041-2/+2
| |
* | Merge pull request #11916 from owncloud/introduce-bowerMorris Jobke2014-11-042-16/+74
|\ \ | | | | | | Introduce bower dependency managment for frontend libraries
| * | ability to add bower resourcesMorris Jobke2014-11-032-16/+74
| |/ | | | | | | | | | | * add addVendorScript & addVendorStyle * refactoring of addScript and addStyle * add shortcuts vendorScript and vendorStyle
* | 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-032-13/+16
|/
* 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
| * adding missing email address for principallibasys2014-10-241-0/+12
| | | | | | | | | | * fix #8515 * add mail only if it exists
* | Merge pull request #11539 from owncloud/mount-setup-onceVincent Petry2014-10-311-1/+6
|\ \ | | | | | | Only mount the storages for the user once
| * | Reset the users setup after clearing mountsRobin Appelman2014-10-281-0/+1
| | |
| * | Only mount the storages for the user onceRobin Appelman2014-10-271-1/+5
| | |
* | | Merge pull request #11877 from owncloud/fix-11875-masterMorris Jobke2014-10-301-1/+1
|\ \ \ | | | | | | | | prevent PHP notice
| * | | prevent PHP noticeThomas Müller2014-10-301-1/+1
| | | |
* | | | Merge pull request #11080 from owncloud/addheader-text-2Vincent Petry2014-10-302-9/+24
|\ \ \ \ | | | | | | | | | | Fix the addHeader tag attributes text methods to not ignore the text parameter
| * | | | Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the ↵Lukas Reschke2014-10-282-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $text parameter Also support closing tags with no text content given Conflicts: lib/private/template.php
* | | | | Merge pull request #11740 from owncloud/update-archive-tarThomas Müller2014-10-301-2/+0
|\ \ \ \ \ | | | | | | | | | | | | Update pear/archive_tar to 1.3.13
| * | | | | Update pear/archive_tar to 1.3.13Thomas Müller2014-10-301-2/+0
| | | | | |
* | | | | | Merge pull request #11864 from owncloud/clear-session-after-logoutLukas Reschke2014-10-301-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Clear session after logout
| * | | | | Clear session after logoutLukas Reschke2014-10-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/8420
* | | | | | Merge pull request #11858 from owncloud/fix-11064Morris Jobke2014-10-301-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Allow any outgoing XHR connections
| * | | | | Allow any outgoing XHR connectionsLukas Reschke2014-10-301-1/+2
| |/ / / / | | | | | | | | | | | | | | | Quickfix for https://github.com/owncloud/core/issues/11064
* | | | | Merge pull request #11860 from owncloud/fix-stupid-error-because-im-a-moroThomas Müller2014-10-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix stupid copy paste fail
| * | | | | Fix stupid copy paste failLukas Reschke2014-10-301-1/+1
| |/ / / / | | | | | | | | | | ...
* | | | | Merge pull request #11821 from owncloud/generic-responseMorris Jobke2014-10-301-2/+3
|\ \ \ \ \ | |/ / / / |/| | | | Add a generic data response
| * | | | add dataresponseBernhard Posselt2014-10-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix docstrings adjust copyright date another copyright date update another header update implement third headers argument, fix indention, fix docstrings fix docstrings
* | | | | Merge pull request #11409 from owncloud/watcher-reuseVincent Petry2014-10-292-22/+32
|\ \ \ \ \ | | | | | | | | | | | | Pass the cached data to the filesystem watcher
| * | | | | Better reuse of cache data for getFolderContentsRobin Appelman2014-10-241-6/+11
| | | | | |
| * | | | | Pass the cached data to the filesystem watcherRobin Appelman2014-10-242-16/+21
| | |_|_|/ | |/| | |
* | | | | Fix implementation of translation short cutThomas Müller2014-10-291-9/+2
| | | | |
* | | | | Fix language file detectionVincent Petry2014-10-291-1/+1
| | | | |