summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [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
* | | | | Add OCP\Security\IHasherLukas Reschke2014-11-064-0/+220
* | | | | Merge pull request #11883 from owncloud/clear-session-for-setupLukas Reschke2014-11-061-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Clear session before setupLukas Reschke2014-10-311-1/+2
* | | | | 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 cache...Robin Appelman2014-11-052-22/+5
* | | | | 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 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
|\ \ \ \ \
| * | | | | 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 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 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
|\ \ \ \
| * | | | replace moment.js with bower versionMorris Jobke2014-11-031-1/+1
| * | | | ability to add bower resourcesMorris Jobke2014-11-032-16/+74
| |/ / /
* | | | [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 touchignLukas Reschke2014-11-031-1/+1