summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3297 from nextcloud/cloud-id-resolveRobin Appelman2017-02-0911-40/+340
|\
| * fix copyright headersRobin Appelman2017-02-094-3/+11
| * clean cloud idsRobin Appelman2017-02-091-3/+2
| * add testsRobin Appelman2017-02-081-1/+1
| * Add a single public api for resolving a cloud id to a user and remote and backRobin Appelman2017-02-0811-40/+333
* | Merge pull request #3184 from nextcloud/issue-3165Lukas Reschke2017-02-091-20/+16
|\ \
| * | Prevent migration from ownCloud 11 to Nextcloud 12Joas Schilling2017-01-231-20/+16
* | | Merge pull request #3408 from nextcloud/nullstorage-free-spaceJoas Schilling2017-02-091-1/+2
|\ \ \
| * | | return unknown free space from nullstorageRobin Appelman2017-02-081-1/+2
| | |/ | |/|
* | | Merge pull request #3396 from nextcloud/dont-log-password-on-failed-confirmationLukas Reschke2017-02-091-1/+2
|\ \ \
| * | | Don't log the password on confirmPassword when LDAP throws an exceptionJoas Schilling2017-02-071-1/+2
* | | | Merge pull request #3362 from nextcloud/fix/nc-token-cookie-nameJoas Schilling2017-02-091-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | oc_token should be nc_tokenChristoph Wurst2017-02-021-1/+1
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-082-0/+352
| |/ / |/| |
* | | [tx-robot] updated from transifexNextcloud bot2017-02-072-0/+396
* | | Merge pull request #3352 from nextcloud/public-page-guest-css-loaderMorris Jobke2017-02-062-5/+5
|\ \ \
| * | | Fix public page css fallback loadingJohn Molakvoæ (skjnldsv)2017-02-012-5/+5
* | | | Merge pull request #3364 from nextcloud/sass-loggingRobin Appelman2017-02-062-4/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Lower log levels of resource locatorRobin Appelman2017-02-032-4/+4
| |/ /
* / / [tx-robot] updated from transifexNextcloud bot2017-02-022-10/+10
|/ /
* | Merge pull request #3321 from nextcloud/revert-unintentional-change-of-log-ti...Morris Jobke2017-01-312-3/+3
|\ \
| * | Revert unintentional log timestamp format changeJoas Schilling2017-01-302-3/+3
* | | Merge pull request #2044 from nextcloud/login-credential-storeMorris Jobke2017-01-3010-22/+357
|\ \ \
| * | | always allow remembered loginChristoph Wurst2017-01-111-21/+0
| * | | do not hard-require the token providerChristoph Wurst2017-01-112-8/+16
| * | | use login hook credentials as fallbackChristoph Wurst2017-01-111-0/+21
| * | | fix @since annotations (9.1->12)Christoph Wurst2017-01-114-8/+8
| * | | replace session implementation if it changes at runtimeChristoph Wurst2017-01-112-1/+11
| * | | add @since annotations and document methodsChristoph Wurst2017-01-112-0/+14
| * | | add login credential storeChristoph Wurst2017-01-119-0/+303
* | | | [tx-robot] updated from transifexNextcloud bot2017-01-312-42/+84
* | | | Merge pull request #2970 from nextcloud/notify-self-testMorris Jobke2017-01-308-0/+300
|\ \ \ \
| * | | | update autoloaderRobin Appelman2017-01-272-0/+10
| * | | | Add sinceRobin Appelman2017-01-273-0/+28
| * | | | Add a more powerful notify mechanismRobin Appelman2017-01-276-0/+262
* | | | | Merge pull request #3298 from nextcloud/downstream-26928blizzz2017-01-301-12/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | remove obsolete hack (#26928)Jörn Friedrich Dreyer2017-01-271-12/+1
* | | | | Merge pull request #3176 from nextcloud/default-value-datadirblizzz2017-01-303-3/+3
|\ \ \ \ \
| * | | | | Add proper default value for datadirMorris Jobke2017-01-193-3/+3
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-01-292-0/+422
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-01-282-2/+2
* | | | | | Merge pull request #2822 from nextcloud/add-navigation-via-info.xmlMorris Jobke2017-01-272-8/+107
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Force to specify the nameJoas Schilling2017-01-271-4/+7
| * | | | | Add navigation via info.xml (#26785)Thomas Müller2016-12-222-8/+104
* | | | | | Merge pull request #3178 from nextcloud/default-value-logdateformatJoas Schilling2017-01-272-3/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | fix default value for logdateformat - fixes #3107Morris Jobke2017-01-192-3/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #3046 from nextcloud/issue-2190-imagepath-is-root-sensitiveLukas Reschke2017-01-271-1/+1
|\ \ \ \ \
| * | | | | Make sure different webroots use different cached pathsJoas Schilling2017-01-121-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #3284 from nextcloud/remove-avatar-fixupMorris Jobke2017-01-264-120/+0
|\ \ \ \ \
| * | | | | remote now unneeded AvatarPermissions repair stepRobin Appelman2017-01-264-120/+0