summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-11-144-0/+4
|
* Merge pull request #11479 from owncloud/cleanup-group-admin-on-deleteGroupMorris Jobke2014-11-131-0/+4
|\ | | | | cleanup group admin(s) on deleteGroup
| * cleanup group admin(s) on deleteGroupmichag862014-10-081-0/+4
| |
* | Merge pull request #11956 from ↵Morris Jobke2014-11-131-1/+1
|\ \ | | | | | | | | | | | | owncloud/remove-check-for-allow_user_to_change_display_name removal of wrong/double implemented check
| * | removal of wrong/double implemented checkmichag862014-11-131-1/+1
| | | | | | | | | | | | Check already implemented in core/settings/ajax/changedisplayname.php
* | | Run preupdate before an updateLukas Reschke2014-11-132-5/+17
|/ / | | | | | | | | | | | | | | The update routine tries to test the database migration before actually performing the update. However, this will fail hard if the schema has changed (for example an unique key has been added). App developers can convert the DB in preupdate.php, however it is not called before and therefore the update fails. This actually breaks ownCloud updates from ownCloud 6 to ownCloud 7 when the files_antivirus app is enabled.
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-132-4/+4
| |
* | Merge pull request #12141 from owncloud/kill-dav-clientMorris Jobke2014-11-121-59/+0
|\ \ | | | | | | OC_DAVClient is not longer used - no need to carry it around anymore
| * | OC_DAVClient is not longer used - no need to carry it around anymoreThomas Müller2014-11-121-59/+0
| | |
* | | Merge pull request #12139 from owncloud/DoNotTouchMeThomas Müller2014-11-121-3/+3
|\ \ \ | | | | | | | | Try to read the file only instead of trying to touch
| * | | Try to read the file only instead of trying to touchLukas Reschke2014-11-121-3/+3
| |/ / | | | | | | | | | | | | | | | The permissions are already catched properly on the installation so we just have to check whether the file is readable to prevent fatal errors from happening. Fixes https://github.com/owncloud/core/issues/12135
* | | Merge pull request #12128 from owncloud/drop-formfactorJan-Christoph Borchardt2014-11-126-109/+13
|\ \ \ | | | | | | | | Drop form_factor that is appended to JS, CSS and template filenames
| * | | Drop form_factor that is appended to JS, CSS and template filenamesMorris Jobke2014-11-126-109/+13
| |/ /
* / / Remove debug statementLukas Reschke2014-11-121-4/+0
|/ / | | | | | | Either we throw an exception or we ignore it. But we should certainly not print this to the end-user...
* | Merge pull request #12105 from owncloud/dav-fixcleanpathThomas Müller2014-11-121-0/+2
|\ \ | | | | | | Fix root path handling for WebDAV ext storage
| * | Fix root path handling for WebDAV ext storageVincent Petry2014-11-111-0/+2
| | | | | | | | | | | | | | | | | | Added missing cleanPath() call that converts "/" to "" when calling SabreDAV. This is needed because SabreDAV will discard its base URL when passing "/".
* | | Merge pull request #12107 from owncloud/dav-propfindmimetypeThomas Müller2014-11-121-0/+4
|\ \ \ | | | | | | | | Return real mime type on PROPFIND
| * | | Return real mime type on PROPFINDVincent Petry2014-11-111-0/+4
| |/ / | | | | | | | | | Return the real (insecure) mime type on PROPFIND
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-124-2/+14
| | |
* | | Fix Pimple unsetBernhard Posselt2014-11-111-1/+1
| | |
* | | Merge pull request #11917 from owncloud/fix-11909Thomas Müller2014-11-111-4/+11
|\ \ \ | |/ / |/| | Add checkbox to enforce SSL for subdomains
| * | Migrate "setsecurity.php" to the AppFrameworkLukas Reschke2014-11-031-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add switch to enforce SSL for subdomains Add unit tests Add test for boolean values Camel-case Fix ugly JS
* | | 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
| | | | | |