Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix return value of getAllowedPreviousVersions() | Morris Jobke | 2017-02-09 | 1 | -1/+1 |
* | Merge pull request #3297 from nextcloud/cloud-id-resolve | Robin Appelman | 2017-02-09 | 6 | -40/+209 |
|\ | |||||
| * | fix copyright headers | Robin Appelman | 2017-02-09 | 2 | -1/+5 |
| * | clean cloud ids | Robin Appelman | 2017-02-09 | 1 | -3/+2 |
| * | add tests | Robin Appelman | 2017-02-08 | 1 | -1/+1 |
| * | Add a single public api for resolving a cloud id to a user and remote and back | Robin Appelman | 2017-02-08 | 6 | -40/+206 |
* | | Merge pull request #3184 from nextcloud/issue-3165 | Lukas Reschke | 2017-02-09 | 1 | -20/+16 |
|\ \ | |||||
| * | | Prevent migration from ownCloud 11 to Nextcloud 12 | Joas Schilling | 2017-01-23 | 1 | -20/+16 |
* | | | Merge pull request #3408 from nextcloud/nullstorage-free-space | Joas Schilling | 2017-02-09 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | return unknown free space from nullstorage | Robin Appelman | 2017-02-08 | 1 | -1/+2 |
| | |/ | |/| | |||||
* | | | Merge pull request #3396 from nextcloud/dont-log-password-on-failed-confirmation | Lukas Reschke | 2017-02-09 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | Don't log the password on confirmPassword when LDAP throws an exception | Joas Schilling | 2017-02-07 | 1 | -1/+2 |
| |/ / | |||||
* | | | Merge pull request #3362 from nextcloud/fix/nc-token-cookie-name | Joas Schilling | 2017-02-09 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | oc_token should be nc_token | Christoph Wurst | 2017-02-02 | 1 | -1/+1 |
* | | | Merge pull request #3352 from nextcloud/public-page-guest-css-loader | Morris Jobke | 2017-02-06 | 1 | -1/+5 |
|\ \ \ | |||||
| * | | | Fix public page css fallback loading | John Molakvoæ (skjnldsv) | 2017-02-01 | 1 | -1/+5 |
| |/ / | |||||
* / / | Lower log levels of resource locator | Robin Appelman | 2017-02-03 | 2 | -4/+4 |
|/ / | |||||
* | | Merge pull request #3321 from nextcloud/revert-unintentional-change-of-log-ti... | Morris Jobke | 2017-01-31 | 2 | -3/+3 |
|\ \ | |||||
| * | | Revert unintentional log timestamp format change | Joas Schilling | 2017-01-30 | 2 | -3/+3 |
* | | | Merge pull request #2044 from nextcloud/login-credential-store | Morris Jobke | 2017-01-30 | 5 | -22/+211 |
|\ \ \ | |||||
| * | | | always allow remembered login | Christoph Wurst | 2017-01-11 | 1 | -21/+0 |
| * | | | do not hard-require the token provider | Christoph Wurst | 2017-01-11 | 2 | -8/+16 |
| * | | | use login hook credentials as fallback | Christoph Wurst | 2017-01-11 | 1 | -0/+21 |
| * | | | fix @since annotations (9.1->12) | Christoph Wurst | 2017-01-11 | 1 | -1/+1 |
| * | | | replace session implementation if it changes at runtime | Christoph Wurst | 2017-01-11 | 2 | -1/+11 |
| * | | | add login credential store | Christoph Wurst | 2017-01-11 | 4 | -0/+171 |
* | | | | Merge pull request #2970 from nextcloud/notify-self-test | Morris Jobke | 2017-01-30 | 2 | -0/+117 |
|\ \ \ \ | |||||
| * | | | | Add a more powerful notify mechanism | Robin Appelman | 2017-01-27 | 2 | -0/+117 |
* | | | | | Merge pull request #3298 from nextcloud/downstream-26928 | blizzz | 2017-01-30 | 1 | -12/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | remove obsolete hack (#26928) | Jörn Friedrich Dreyer | 2017-01-27 | 1 | -12/+1 |
* | | | | | Merge pull request #3176 from nextcloud/default-value-datadir | blizzz | 2017-01-30 | 3 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Add proper default value for datadir | Morris Jobke | 2017-01-19 | 3 | -3/+3 |
* | | | | | | Merge pull request #2822 from nextcloud/add-navigation-via-info.xml | Morris Jobke | 2017-01-27 | 2 | -8/+107 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Force to specify the name | Joas Schilling | 2017-01-27 | 1 | -4/+7 |
| * | | | | | Add navigation via info.xml (#26785) | Thomas Müller | 2016-12-22 | 2 | -8/+104 |
* | | | | | | Merge pull request #3178 from nextcloud/default-value-logdateformat | Joas Schilling | 2017-01-27 | 2 | -3/+3 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | fix default value for logdateformat - fixes #3107 | Morris Jobke | 2017-01-19 | 2 | -3/+3 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #3046 from nextcloud/issue-2190-imagepath-is-root-sensitive | Lukas Reschke | 2017-01-27 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Make sure different webroots use different cached paths | Joas Schilling | 2017-01-12 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #3284 from nextcloud/remove-avatar-fixup | Morris Jobke | 2017-01-26 | 2 | -118/+0 |
|\ \ \ \ \ | |||||
| * | | | | | remote now unneeded AvatarPermissions repair step | Robin Appelman | 2017-01-26 | 2 | -118/+0 |
* | | | | | | Merge pull request #3246 from nextcloud/fix-sqlite-dependency | Morris Jobke | 2017-01-26 | 1 | -5/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove useless dependency on SQLite (non-PDO) | Morris Jobke | 2017-01-25 | 1 | -5/+3 |
* | | | | | | | Merge pull request #3238 from nextcloud/dav-test | Lukas Reschke | 2017-01-26 | 2 | -5/+9 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Make DAV external storage test more reliable | Robin Appelman | 2017-01-24 | 2 | -5/+9 |
* | | | | | | | Merge pull request #3197 from nextcloud/enable-scss-for-all-apps | Morris Jobke | 2017-01-25 | 2 | -10/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Appdata var fix | John Molakvoæ (skjnldsv) | 2017-01-24 | 1 | -1/+1 |
| * | | | | | | | Remove unused webroot | John Molakvoæ (skjnldsv) | 2017-01-24 | 1 | -3/+2 |
| * | | | | | | | Enable every app to generate their scss file | John Molakvoæ (skjnldsv) | 2017-01-22 | 2 | -9/+12 |
* | | | | | | | | Merge pull request #3223 from nextcloud/fix-public-page-style | Björn Schießle | 2017-01-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ |