summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge pull request #2044 from nextcloud/login-credential-storeMorris Jobke2017-01-3022-80/+637
|\ \
| * | minor version bumpChristoph Wurst2017-01-172-2/+2
| * | always allow remembered loginChristoph Wurst2017-01-119-32/+0
| * | fix constructor params in failing testChristoph Wurst2017-01-111-6/+9
| * | do not hard-require the token providerChristoph Wurst2017-01-113-9/+25
| * | use login hook credentials as fallbackChristoph Wurst2017-01-113-19/+77
| * | migrate 'password::sessioncredentials' extern storage auth to credential storeChristoph Wurst2017-01-111-32/+24
| * | 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-1111-0/+496
* | | Merge pull request #3169 from nextcloud/update-doctrineMorris Jobke2017-01-301-0/+0
|\ \ \
| * | | Update doctrineJoas Schilling2017-01-301-0/+0
* | | | [tx-robot] updated from transifexNextcloud bot2017-01-3116-82/+244