Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add groups to user info output | Bjoern Schiessle | 2017-02-09 | 2 | -3/+36 |
* | Merge pull request #3297 from nextcloud/cloud-id-resolve | Robin Appelman | 2017-02-09 | 35 | -231/+707 |
|\ | |||||
| * | fix copyright headers | Robin Appelman | 2017-02-09 | 4 | -3/+11 |
| * | clean cloud ids | Robin Appelman | 2017-02-09 | 3 | -11/+10 |
| * | add tests | Robin Appelman | 2017-02-08 | 3 | -1/+146 |
| * | register cloudidmanager for files_sharing | Robin Appelman | 2017-02-08 | 1 | -0/+4 |
| * | log ocs exceptions | Robin Appelman | 2017-02-08 | 1 | -0/+1 |
| * | remove test for removed code | Robin Appelman | 2017-02-08 | 1 | -22/+0 |
| * | Add a single public api for resolving a cloud id to a user and remote and back | Robin Appelman | 2017-02-08 | 32 | -209/+550 |
* | | Merge pull request #3184 from nextcloud/issue-3165 | Lukas Reschke | 2017-02-09 | 3 | -105/+48 |
|\ \ | |||||
| * | | Prevent migration from ownCloud 11 to Nextcloud 12 | Joas Schilling | 2017-01-23 | 3 | -105/+48 |
* | | | Merge pull request #3408 from nextcloud/nullstorage-free-space | Joas Schilling | 2017-02-09 | 2 | -2/+4 |
|\ \ \ | |||||
| * | | | Fix unit tests | Morris Jobke | 2017-02-08 | 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 #3407 from nextcloud/issue-3312-user-settings-email-accoun... | Björn Schießle | 2017-02-09 | 1 | -0/+17 |
|\ \ \ \ | |||||
| * | | | | Update the email in the accounts table as well | Joas Schilling | 2017-02-08 | 1 | -0/+17 |
* | | | | | Merge pull request #3362 from nextcloud/fix/nc-token-cookie-name | Joas Schilling | 2017-02-09 | 4 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | oc_token should be nc_token | Christoph Wurst | 2017-02-02 | 4 | -5/+5 |
* | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-09 | 40 | -1092/+1300 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge pull request #3394 from nextcloud/issue-3344-files-activity-expects-par... | Lukas Reschke | 2017-02-08 | 8 | -768/+541 |
|\ \ \ \ \ | |||||
| * | | | | | Fix files sharing legacy as well | Joas Schilling | 2017-02-08 | 7 | -750/+296 |
| * | | | | | Add tests for getUser() | Joas Schilling | 2017-02-07 | 1 | -0/+71 |
| * | | | | | Add tests for getFile() | Joas Schilling | 2017-02-07 | 2 | -11/+149 |
| * | | | | | Make sure ownCloud 8.2 activities also can get displayed | Joas Schilling | 2017-02-07 | 1 | -12/+30 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #3403 from nextcloud/rename-dbpassword-toggle | Joas Schilling | 2017-02-08 | 2 | -9/+9 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Rename database password toggle | Morris Jobke | 2017-02-07 | 2 | -9/+9 |
| |/ / / | |||||
* / / / | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-08 | 16 | -2/+1086 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-07 | 22 | -72/+702 |
* | | | Merge pull request #3352 from nextcloud/public-page-guest-css-loader | Morris Jobke | 2017-02-06 | 5 | -120/+89 |
|\ \ \ | |||||
| * | | | TOTP css | John Molakvoæ (skjnldsv) | 2017-02-06 | 1 | -0/+18 |
| * | | | Various fixes guest css | John Molakvoæ (skjnldsv) | 2017-02-01 | 1 | -112/+66 |
| * | | | Fix public page css fallback loading | John Molakvoæ (skjnldsv) | 2017-02-01 | 4 | -8/+5 |
* | | | | Merge pull request #3364 from nextcloud/sass-logging | Robin Appelman | 2017-02-06 | 3 | -5/+5 |
|\ \ \ \ | |||||
| * | | | | fix unit tests | Morris Jobke | 2017-02-03 | 1 | -1/+1 |
| * | | | | Lower log levels of resource locator | Robin Appelman | 2017-02-03 | 2 | -4/+4 |
| |/ / / | |||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-06 | 16 | -60/+128 |
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-05 | 10 | -0/+50 |
* | | | | Merge pull request #3353 from nextcloud/mobile-view-files-fix | Marius Blüm | 2017-02-04 | 1 | -1/+4 |
|\ \ \ \ | |||||
| * | | | | Fix files mobile view | John Molakvoæ (skjnldsv) | 2017-02-01 | 1 | -1/+4 |
| |/ / / | |||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-04 | 2 | -0/+4 |
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-03 | 10 | -14/+30 |
| |/ / |/| | | |||||
* | | | Merge pull request #3359 from nextcloud/fix-sharing-app-description | Morris Jobke | 2017-02-02 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Fix Sharing app description | Joas Schilling | 2017-02-02 | 1 | -2/+2 |
|/ / / | |||||
* / / | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-02 | 42 | -60/+274 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-01 | 36 | -88/+1104 |
* | | Merge pull request #3321 from nextcloud/revert-unintentional-change-of-log-ti... | Morris Jobke | 2017-01-31 | 3 | -6/+5 |
|\ \ | |||||
| * | | Fix config.sample.php | Morris Jobke | 2017-01-30 | 1 | -3/+2 |
| * | | Revert unintentional log timestamp format change | Joas Schilling | 2017-01-30 | 2 | -3/+3 |