summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3444 from nextcloud/recognize-bat-and-cmdMorris Jobke2017-02-131-0/+14
|\
| * Recognize .bat and .cmd filesJoas Schilling2017-02-101-0/+14
* | Merge pull request #3448 from kuimovvg/masterLukas Reschke2017-02-131-1/+1
|\ \
| * | bug when connect to yandex webdav servervkuimov2017-02-101-1/+1
* | | Merge pull request #3417 from nextcloud/push-notificationMorris Jobke2017-02-102-2/+27
|\ \ \
| * | | Make sure to use the right appdata directoryJoas Schilling2017-02-091-0/+7
| * | | Save the used token id in the session so it can be used later onJoas Schilling2017-02-091-2/+20
| |/ /
* | | Merge pull request #3430 from nextcloud/fix-ios-client-detectionMorris Jobke2017-02-101-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix detection of the new iOS appJoas Schilling2017-02-101-1/+1
* | | Merge pull request #3424 from nextcloud/fix-upgrade-pathBjörn Schießle2017-02-101-1/+1
|\ \ \
| * | | Fix return value of getAllowedPreviousVersions()Morris Jobke2017-02-091-1/+1
| |/ /
* / / Set vendor during installMorris Jobke2017-02-091-0/+15
|/ /
* | Merge pull request #3297 from nextcloud/cloud-id-resolveRobin Appelman2017-02-096-40/+209
|\ \
| * | fix copyright headersRobin Appelman2017-02-092-1/+5
| * | 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-086-40/+206
| |/
* | 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
* | | Merge pull request #3352 from nextcloud/public-page-guest-css-loaderMorris Jobke2017-02-061-1/+5
|\ \ \
| * | | Fix public page css fallback loadingJohn Molakvoæ (skjnldsv)2017-02-011-1/+5
| |/ /
* / / Lower log levels of resource locatorRobin Appelman2017-02-032-4/+4
|/ /
* | 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-305-22/+211
|\ \ \
| * | | 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-111-1/+1
| * | | replace session implementation if it changes at runtimeChristoph Wurst2017-01-112-1/+11
| * | | add login credential storeChristoph Wurst2017-01-114-0/+171
* | | | Merge pull request #2970 from nextcloud/notify-self-testMorris Jobke2017-01-302-0/+117
|\ \ \ \
| * | | | Add a more powerful notify mechanismRobin Appelman2017-01-272-0/+117
* | | | | 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
* | | | | | 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
| | |_|/ / | |/| | |