summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-11-1726-10/+62
* Merge pull request #12186 from owncloud/fix-12182Morris Jobke2014-11-153-13/+31
|\
| * do not output DB information, and do not set headerArthur Schiwon2014-11-143-7/+28
| * errors are already loggedArthur Schiwon2014-11-142-3/+0
| * eliminate OC_Template::printErrorPage in database classes, fixes #12182Arthur Schiwon2014-11-143-7/+7
* | Check if app is enabled for userLukas Reschke2014-11-151-0/+11
|/
* [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 deleteGroupmichag862014-10-081-0/+4
* | Merge pull request #11956 from owncloud/remove-check-for-allow_user_to_change...Morris Jobke2014-11-131-1/+1
|\ \
| * | removal of wrong/double implemented checkmichag862014-11-131-1/+1
* | | Run preupdate before an updateLukas Reschke2014-11-132-5/+17
|/ /
* | [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 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 touchLukas Reschke2014-11-121-3/+3
| |/ /
* | | 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 filenamesMorris Jobke2014-11-126-109/+13
| |/ /
* / / Remove debug statementLukas Reschke2014-11-121-4/+0
|/ /
* | Merge pull request #12105 from owncloud/dav-fixcleanpathThomas Müller2014-11-121-0/+2
|\ \
| * | Fix root path handling for WebDAV ext storageVincent Petry2014-11-111-0/+2
* | | Merge pull request #12107 from owncloud/dav-propfindmimetypeThomas Müller2014-11-121-0/+4
|\ \ \
| * | | Return real mime type on PROPFINDVincent Petry2014-11-111-0/+4
| |/ /
* | | [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
|\ \ \ | |/ / |/| |
| * | Migrate "setsecurity.php" to the AppFrameworkLukas Reschke2014-11-031-4/+11
* | | Merge pull request #12072 from owncloud/sabre-convertstoragenotavailableexcep...Vincent Petry2014-11-104-114/+156
|\ \ \
| * | | Convert StorageNotAvailableException to SabreDAV exceptionVincent Petry2014-11-104-114/+156
* | | | Merge pull request #12027 from owncloud/cleanup_exceptionsVincent Petry2014-11-101-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | 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 owncloud/enc_stop_uploading_if_private_key_is_...Lukas Reschke2014-11-071-1/+7
|\ \ \
| * | | 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 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Load PHPAss via autoloaderLukas Reschke2014-11-061-1/+2
| * | | | Use new hashing API for OC_User_DatabaseLukas Reschke2014-11-061-32/+7
* | | | | Merge pull request #12009 from owncloud/make-optionalMorris Jobke2014-11-061-2/+2
|\ \ \ \ \
| * | | | | Make second argument optionalLukas Reschke2014-11-061-2/+2
* | | | | | Merge pull request #11945 from owncloud/share-setup-other-userRobin Appelman2014-11-061-3/+18
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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 IServerContainerLukas Reschke2014-11-061-0/+7