summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix URL to developer manualLukas Reschke2015-01-101-1/+1
* Merge pull request #13204 from owncloud/enc_fix_key_lostVincent Petry2015-01-092-630/+714
|\
| * unit testsBjoern Schiessle2015-01-091-4/+86
| * don't move encryption keys if a mount point was renamedBjoern Schiessle2015-01-091-626/+628
* | Merge pull request #13195 from owncloud/resharepermfixMorris Jobke2015-01-092-0/+158
|\ \
| * | Fix reshare permission issueVincent Petry2015-01-092-0/+158
* | | Merge pull request #13208 from owncloud/hhvm-streamwrapper-exceptionThomas Müller2015-01-091-12/+5
|\ \ \
| * | | HHVM Workaround: Do not use Exception from Stream.Andreas Fischer2015-01-091-12/+5
* | | | Merge pull request #13192 from owncloud/cache_binary_pathThomas Müller2015-01-093-4/+45
|\ \ \ \
| * | | | Memcache binary executable searchingRobin McCorkell2015-01-091-2/+8
| * | | | Add Null memcacherRobin McCorkell2015-01-092-2/+37
* | | | | Merge pull request #13188 from owncloud/add-check-if-user-is-logged-inThomas Müller2015-01-092-0/+3
|\ \ \ \ \
| * | | | | Add check if user is logged-inLukas Reschke2015-01-092-0/+3
* | | | | | Merge pull request #13196 from owncloud/js-personal-no-passwordRobin Appelman2015-01-091-1/+3
|\ \ \ \ \ \
| * | | | | | Fix js error in personal settings if there is no password fieldRobin Appelman2015-01-091-1/+3
* | | | | | | Merge pull request #13205 from owncloud/remove-shared-iconThomas Müller2015-01-092-3/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | replace outdated 'shared' people icon with regular share icon as fallbackJan-Christoph Borchardt2015-01-092-3/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #13181 from owncloud/filecache-preventleadingslashRobin McCorkell2015-01-093-2/+38
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix cache jail to not duplicate slashesVincent Petry2015-01-091-1/+1
| * | | | | Trim leading or trailing slashes in file cache pathsVincent Petry2015-01-082-1/+37
* | | | | | Merge pull request #12011 from owncloud/reuse-etag-defaultMorris Jobke2015-01-091-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Default to reusing etags in the scannerRobin Appelman2014-11-061-2/+2
* | | | | | Merge pull request #12995 from owncloud/tbelau666-masterThomas Müller2015-01-097-32/+47
|\ \ \ \ \ \
| * | | | | | add default for dbtableprefixMorris Jobke2014-12-234-5/+5
| * | | | | | add proper prefix for migration testsMorris Jobke2014-12-231-1/+1
| * | | | | | use injected config object and fix typosMorris Jobke2014-12-224-11/+25
| * | | | | | inject \OCP\IConfig instance in migratorMorris Jobke2014-12-223-23/+13
| * | | | | | Use Doctrines filter by table nametbelau6662014-12-225-6/+17
* | | | | | | Merge pull request #13191 from owncloud/fix-rename-fieldMorris Jobke2015-01-091-2/+6
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | fix rename field position, fix #12927Jan-Christoph Borchardt2015-01-091-2/+6
|/ / / / / /
* | | | | | Merge pull request #12984 from owncloud/ldap-user-cleanup-masterLukas Reschke2015-01-0939-191/+1474
|\ \ \ \ \ \
| * | | | | | fix order of initalizing instance properties, and paremeter order in a method...Arthur Schiwon2015-01-081-10/+12
| * | | | | | fix table name for getListArthur Schiwon2015-01-081-2/+2
| * | | | | | doc fixes and removal of unnecessary use statementsArthur Schiwon2015-01-075-10/+6
| * | | | | | add test for mapping's getList methodArthur Schiwon2015-01-071-0/+24
| * | | | | | inject and use user manager to delete command instead of using old static oc_...Arthur Schiwon2015-01-072-2/+13
| * | | | | | inject DB Connection to user managerArthur Schiwon2015-01-0710-87/+94
| * | | | | | inject IDateTimeFormatter to show-remnants commandArthur Schiwon2015-01-062-4/+11
| * | | | | | inject oc config to User_LDAPArthur Schiwon2015-01-069-53/+89
| * | | | | | revert changes to deprecated preferences as it is a not needed leftoverArthur Schiwon2015-01-061-3/+1
| * | | | | | smaller fixes: coding style, PHPdoc, typos and few for DIArthur Schiwon2015-01-068-71/+51
| * | | | | | planned refactorings for OC 8Arthur Schiwon2014-12-206-55/+83
| * | | | | | move from \OC\Preferences to \OCP\IConfigArthur Schiwon2014-12-204-67/+38
| * | | | | | basic adjustments for OC 8. I.e. no visible issues, LDAP tests pass.Arthur Schiwon2014-12-2010-41/+73
| * | | | | | LDAP User Cleanup: Port from stable7 without further adjustementsArthur Schiwon2014-12-1933-66/+1257
* | | | | | | Merge pull request #13184 from owncloud/fix-keyLukas Reschke2015-01-091-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Verify existence of $_GET keyLukas Reschke2015-01-091-1/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-0988-150/+274
* | | | | | | Merge pull request #13179 from owncloud/fix-fatal-php-error-for-not-existing-...Lukas Reschke2015-01-092-18/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Verify whether type is correctLukas Reschke2015-01-082-18/+15
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 06:29:22 +0000