summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* logging changesCraig Morrissey2014-11-071-0/+3
* Merge pull request #11736 from owncloud/enc_get_fileinfo_from_real_fileBjörn Schießle2014-11-074-10/+14
|\
| * only set the values we need and make sure that we write the file info for bothBjoern Schiessle2014-11-071-3/+7
| * don't scan part filesBjoern Schiessle2014-11-072-5/+5
| * also try to get file info from part fileBjoern Schiessle2014-11-071-2/+2
|/
* Merge pull request #11575 from owncloud/cache-watcher-propagateRobin Appelman2014-11-073-0/+38
|\
| * Also propagate etag changes when the watcher finds a changed fileRobin Appelman2014-11-073-0/+38
|/
* Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_...Lukas Reschke2014-11-075-3/+22
|\
| * throw exception if private key is missingBjoern Schiessle2014-11-054-1/+21
| * still try to encrypt files, even if the session is not initialized. The strea...Bjoern Schiessle2014-11-041-2/+1
* | 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-07118-128/+162
* | | 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-067-14/+71
|\ \ \ \ | |/ / / |/| | |
| * | | Fix sharing testsRobin Appelman2014-11-063-2/+15
| * | | Support displaynames for dummy user backendRobin Appelman2014-11-061-3/+18
| * | | Setup shared mounts for the correct user when setting up the filesystem for t...Robin Appelman2014-11-063-6/+33
| * | | Dont make real users in testsRobin Appelman2014-11-061-3/+5
* | | | Merge pull request #12000 from owncloud/bower-strengthifyMorris Jobke2014-11-068-16/+212
|\ \ \ \
| * | | | bower strengthifyMorris Jobke2014-11-068-16/+212
|/ / / /
* | | | 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
* | | | Merge pull request #11947 from owncloud/public-hash-apiThomas Müller2014-11-067-0/+341
|\ \ \ \
| * | | | Add OCP\Security\IHasherLukas Reschke2014-11-067-0/+341
|/ / / /
* | | | update to 3rdparty masterMorris Jobke2014-11-061-0/+0
* | | | 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-064-29/+18
|\ \ \ \
| * | | | Remove confusingly names \OC\User\Manager::delete and fix the automatic cache...Robin Appelman2014-11-054-29/+18
* | | | | Merge pull request #11993 from owncloud/enc_repeat_passwordLukas Reschke2014-11-061-1/+15
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | check if the provided password is really the current log-in passwordBjoern Schiessle2014-11-061-1/+15
* | | | | Merge pull request #11984 from owncloud/bower-md5Thomas Müller2014-11-065-1/+287
|\ \ \ \ \
| * | | | | md5 now handled via bowerMorris Jobke2014-11-065-1/+287
|/ / / / /
* | | | | Merge pull request #11985 from owncloud/bower-snapMorris Jobke2014-11-066-5/+805
|\ \ \ \ \
| * | | | | bower snapjsMorris Jobke2014-11-066-5/+805
|/ / / / /
* | | | | Merge pull request #11989 from owncloud/bower-zxcvbnThomas Müller2014-11-067-3/+72
|\ \ \ \ \
| * | | | | bower zxcvbnMorris Jobke2014-11-067-3/+72
|/ / / / /
* | | | | Merge pull request #11981 from owncloud/bower-jcropThomas Müller2014-11-068-2/+1893
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | bower jcropMorris Jobke2014-11-068-2/+1893
|/ / / /
* | | | Merge pull request #11980 from owncloud/bower-select2Morris Jobke2014-11-0663-1301/+16
|\ \ \ \
| * | | | manage select2 via bowerMorris Jobke2014-11-0663-1301/+16
|/ / / /
* | | | Merge pull request #11982 from owncloud/bower-underscoreVincent Petry2014-11-067-8/+35
|\ \ \ \
| * | | | bower underscoreMorris Jobke2014-11-057-8/+35
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-06100-308/+182
* | | | | Merge pull request #11983 from owncloud/drop-chosenMorris Jobke2014-11-062-2/+0
|\ \ \ \ \ | |/ / / / |/| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 21:43:22 +0000