Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Convert StorageNotAvailableException to SabreDAV exception | Vincent Petry | 2014-11-10 | 4 | -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 changes | Craig Morrissey | 2014-11-07 | 1 | -0/+3 |
| | |||||
* | don't scan part files | Bjoern Schiessle | 2014-11-07 | 2 | -5/+5 |
| | |||||
* | Also propagate etag changes when the watcher finds a changed file | Robin Appelman | 2014-11-07 | 2 | -0/+7 |
| | |||||
* | Merge pull request #11954 from ↵ | Lukas Reschke | 2014-11-07 | 1 | -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 missing | Bjoern Schiessle | 2014-11-05 | 1 | -1/+7 |
| | | |||||
* | | Merge pull request #12019 from owncloud/fix-template-shortcuts | Thomas Müller | 2014-11-07 | 1 | -2/+2 |
|\ \ | | | | | | | second parameter in template shortcuts script() and style() is optional | ||||
| * | | second parameter in template shortcuts script() and style() is optional | Morris Jobke | 2014-11-06 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #12003 from owncloud/password-migration | Lukas Reschke | 2014-11-06 | 1 | -32/+7 |
|\ \ \ | |/ / |/| | | Use new hashing API for OC_User_Database | ||||
| * | | Use new hashing API for OC_User_Database | Lukas Reschke | 2014-11-06 | 1 | -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-optional | Morris Jobke | 2014-11-06 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Make second argument optional | ||||
| * | | | Make second argument optional | Lukas Reschke | 2014-11-06 | 1 | -2/+2 |
| |/ / | | | | | | | | | | Equivalent to addVendorScript und addScript from OC_Util | ||||
* | | | Merge pull request #11945 from owncloud/share-setup-other-user | Robin Appelman | 2014-11-06 | 1 | -3/+18 |
|\ \ \ | |/ / |/| | | Setup shared mounts for the correct user when setting up the filesystem | ||||
| * | | Support displaynames for dummy user backend | Robin Appelman | 2014-11-06 | 1 | -3/+18 |
| | | | |||||
* | | | Add OCP\Security\IHasher | Lukas Reschke | 2014-11-06 | 2 | -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-delete | Lukas Reschke | 2014-11-06 | 2 | -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 Appelman | 2014-11-05 | 2 | -22/+5 |
| |/ | | | | | | | cache cleanup instead | ||||
* | | Merge pull request #11928 from owncloud/support-HTML-in-logo | Thomas Müller | 2014-11-05 | 1 | -0/+12 |
|\ \ | |/ |/| | Support HTML in logo | ||||
| * | Support HTML in logo claim | Lukas Reschke | 2014-11-03 | 1 | -0/+12 |
| | | |||||
* | | fix shortcuts - underline instead of camelCase | Morris Jobke | 2014-11-04 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #11916 from owncloud/introduce-bower | Morris Jobke | 2014-11-04 | 2 | -16/+74 |
|\ \ | | | | | | | Introduce bower dependency managment for frontend libraries | ||||
| * | | ability to add bower resources | Morris Jobke | 2014-11-03 | 2 | -16/+74 |
| |/ | | | | | | | | | | | * add addVendorScript & addVendorStyle * refactoring of addScript and addStyle * add shortcuts vendorScript and vendorStyle | ||||
* | | Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfig | Morris Jobke | 2014-11-03 | 1 | -1/+1 |
|\ \ | |/ |/| | First check whether it is the default config before touching | ||||
| * | First check whether it is the default config before touchign | Lukas Reschke | 2014-11-03 | 1 | -1/+1 |
| | | | | | | | | Potentially fixes https://github.com/owncloud/core/issues/11678 | ||||
* | | Update Pimple to V3.0 | Thomas Müller | 2014-11-03 | 2 | -13/+16 |
|/ | |||||
* | fix odd behaviour | Morris Jobke | 2014-10-31 | 1 | -4/+8 |
| | |||||
* | Merge pull request #9044 from owncloud/add-missing-email-principal | Vincent Petry | 2014-10-31 | 1 | -0/+12 |
|\ | | | | | adding missing email address for principal | ||||
| * | adding missing email address for principal | libasys | 2014-10-24 | 1 | -0/+12 |
| | | | | | | | | | | * fix #8515 * add mail only if it exists | ||||
* | | Merge pull request #11539 from owncloud/mount-setup-once | Vincent Petry | 2014-10-31 | 1 | -1/+6 |
|\ \ | | | | | | | Only mount the storages for the user once | ||||
| * | | Reset the users setup after clearing mounts | Robin Appelman | 2014-10-28 | 1 | -0/+1 |
| | | | |||||
| * | | Only mount the storages for the user once | Robin Appelman | 2014-10-27 | 1 | -1/+5 |
| | | | |||||
* | | | Merge pull request #11877 from owncloud/fix-11875-master | Morris Jobke | 2014-10-30 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | prevent PHP notice | ||||
| * | | | prevent PHP notice | Thomas Müller | 2014-10-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #11080 from owncloud/addheader-text-2 | Vincent Petry | 2014-10-30 | 2 | -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 Reschke | 2014-10-28 | 2 | -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-tar | Thomas Müller | 2014-10-30 | 1 | -2/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Update pear/archive_tar to 1.3.13 | ||||
| * | | | | | Update pear/archive_tar to 1.3.13 | Thomas Müller | 2014-10-30 | 1 | -2/+0 |
| | | | | | | |||||
* | | | | | | Merge pull request #11864 from owncloud/clear-session-after-logout | Lukas Reschke | 2014-10-30 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Clear session after logout | ||||
| * | | | | | Clear session after logout | Lukas Reschke | 2014-10-30 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/8420 | ||||
* | | | | | | Merge pull request #11858 from owncloud/fix-11064 | Morris Jobke | 2014-10-30 | 1 | -1/+2 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Allow any outgoing XHR connections | ||||
| * | | | | | Allow any outgoing XHR connections | Lukas Reschke | 2014-10-30 | 1 | -1/+2 |
| |/ / / / | | | | | | | | | | | | | | | | Quickfix for https://github.com/owncloud/core/issues/11064 | ||||
* | | | | | Merge pull request #11860 from owncloud/fix-stupid-error-because-im-a-moro | Thomas Müller | 2014-10-30 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix stupid copy paste fail | ||||
| * | | | | | Fix stupid copy paste fail | Lukas Reschke | 2014-10-30 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | ... | ||||
* | | | | | Merge pull request #11821 from owncloud/generic-response | Morris Jobke | 2014-10-30 | 1 | -2/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | Add a generic data response | ||||
| * | | | | add dataresponse | Bernhard Posselt | 2014-10-29 | 1 | -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-reuse | Vincent Petry | 2014-10-29 | 2 | -22/+32 |
|\ \ \ \ \ | | | | | | | | | | | | | Pass the cached data to the filesystem watcher | ||||
| * | | | | | Better reuse of cache data for getFolderContents | Robin Appelman | 2014-10-24 | 1 | -6/+11 |
| | | | | | | |||||
| * | | | | | Pass the cached data to the filesystem watcher | Robin Appelman | 2014-10-24 | 2 | -16/+21 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Fix implementation of translation short cut | Thomas Müller | 2014-10-29 | 1 | -9/+2 |
| | | | | | |||||
* | | | | | Fix language file detection | Vincent Petry | 2014-10-29 | 1 | -1/+1 |
| | | | | |