summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add groups to user info outputBjoern Schiessle2017-02-092-3/+36
* Merge pull request #3297 from nextcloud/cloud-id-resolveRobin Appelman2017-02-0935-231/+707
|\
| * fix copyright headersRobin Appelman2017-02-094-3/+11
| * clean cloud idsRobin Appelman2017-02-093-11/+10
| * add testsRobin Appelman2017-02-083-1/+146
| * register cloudidmanager for files_sharingRobin Appelman2017-02-081-0/+4
| * log ocs exceptionsRobin Appelman2017-02-081-0/+1
| * remove test for removed codeRobin Appelman2017-02-081-22/+0
| * Add a single public api for resolving a cloud id to a user and remote and backRobin Appelman2017-02-0832-209/+550
* | Merge pull request #3184 from nextcloud/issue-3165Lukas Reschke2017-02-093-105/+48
|\ \
| * | Prevent migration from ownCloud 11 to Nextcloud 12Joas Schilling2017-01-233-105/+48
* | | Merge pull request #3408 from nextcloud/nullstorage-free-spaceJoas Schilling2017-02-092-2/+4
|\ \ \
| * | | Fix unit testsMorris Jobke2017-02-081-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 #3407 from nextcloud/issue-3312-user-settings-email-accoun...Björn Schießle2017-02-091-0/+17
|\ \ \ \
| * | | | Update the email in the accounts table as wellJoas Schilling2017-02-081-0/+17
* | | | | Merge pull request #3362 from nextcloud/fix/nc-token-cookie-nameJoas Schilling2017-02-094-5/+5
|\ \ \ \ \
| * | | | | oc_token should be nc_tokenChristoph Wurst2017-02-024-5/+5
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-02-0940-1092/+1300
| |_|_|/ / |/| | | |
* | | | | Merge pull request #3394 from nextcloud/issue-3344-files-activity-expects-par...Lukas Reschke2017-02-088-768/+541
|\ \ \ \ \
| * | | | | Fix files sharing legacy as wellJoas Schilling2017-02-087-750/+296
| * | | | | Add tests for getUser()Joas Schilling2017-02-071-0/+71
| * | | | | Add tests for getFile()Joas Schilling2017-02-072-11/+149
| * | | | | Make sure ownCloud 8.2 activities also can get displayedJoas Schilling2017-02-071-12/+30
| | |_|/ / | |/| | |
* | | | | Merge pull request #3403 from nextcloud/rename-dbpassword-toggleJoas Schilling2017-02-082-9/+9
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Rename database password toggleMorris Jobke2017-02-072-9/+9
| |/ / /
* / / / [tx-robot] updated from transifexNextcloud bot2017-02-0816-2/+1086
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2017-02-0722-72/+702
* | | Merge pull request #3352 from nextcloud/public-page-guest-css-loaderMorris Jobke2017-02-065-120/+89
|\ \ \
| * | | TOTP cssJohn Molakvoæ (skjnldsv)2017-02-061-0/+18
| * | | Various fixes guest cssJohn Molakvoæ (skjnldsv)2017-02-011-112/+66
| * | | Fix public page css fallback loadingJohn Molakvoæ (skjnldsv)2017-02-014-8/+5
* | | | Merge pull request #3364 from nextcloud/sass-loggingRobin Appelman2017-02-063-5/+5
|\ \ \ \
| * | | | fix unit testsMorris Jobke2017-02-031-1/+1
| * | | | Lower log levels of resource locatorRobin Appelman2017-02-032-4/+4
| |/ / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-0616-60/+128
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-0510-0/+50
* | | | Merge pull request #3353 from nextcloud/mobile-view-files-fixMarius Blüm2017-02-041-1/+4
|\ \ \ \
| * | | | Fix files mobile viewJohn Molakvoæ (skjnldsv)2017-02-011-1/+4
| |/ / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-042-0/+4
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-0310-14/+30
| |/ / |/| |
* | | Merge pull request #3359 from nextcloud/fix-sharing-app-descriptionMorris Jobke2017-02-021-2/+2
|\ \ \
| * | | Fix Sharing app descriptionJoas Schilling2017-02-021-2/+2
|/ / /
* / / [tx-robot] updated from transifexNextcloud bot2017-02-0242-60/+274
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-02-0136-88/+1104
* | Merge pull request #3321 from nextcloud/revert-unintentional-change-of-log-ti...Morris Jobke2017-01-313-6/+5
|\ \
| * | Fix config.sample.phpMorris Jobke2017-01-301-3/+2
| * | Revert unintentional log timestamp format changeJoas Schilling2017-01-302-3/+3