summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2287 from nextcloud/registrationEmailJohn Molakvoæ2017-02-161-0/+5
|\
| * Fix setup issue and refine error messagesMorris Jobke2017-02-151-0/+5
* | Merge pull request #2606 from temparus/masterblizzz2017-02-151-0/+7
|\ \ | |/ |/|
| * Update license headerSandro Lutz2017-02-071-0/+2
| * Merge remote-tracking branch 'nextcloud/master'Sandro Lutz2017-02-07146-4627/+9122
| |\
| * | Add missing use statement for PublicEmitterSandro Lutz2017-02-071-0/+1
| * | Fix typo for UserManager variableSandro Lutz2017-02-011-1/+1
| * | Add check if UserManager is of type PublicEmitter before calling preLogin hookSandro Lutz2017-02-011-1/+3
| * | Change where preLogin hook gets calledSandro Lutz2017-02-011-0/+2
| * | Remove preLoginValidation hookSandro Lutz2017-02-011-3/+0
| * | Fix indentationSandro Lutz2017-02-011-1/+1
| * | Add preLoginValidation hookSandro Lutz2017-02-011-0/+3
* | | [tx-robot] updated from transifexNextcloud bot2017-02-154-2/+10
* | | add screensharing iconJan-Christoph Borchardt2017-02-145-0/+44
* | | Merge pull request #3341 from nextcloud/transparent-white-checkboxJan-Christoph Borchardt2017-02-143-8/+14
|\ \ \
| * | | Transparent white checkboxJohn Molakvoæ (skjnldsv)2017-01-313-8/+14
* | | | Merge pull request #3472 from nextcloud/enable-avatars-alwaysMorris Jobke2017-02-145-52/+17
|\ \ \ \
| * | | | Always enable avatarsMorris Jobke2017-02-135-52/+17
* | | | | [tx-robot] updated from transifexNextcloud bot2017-02-148-6/+106
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-132-50/+86
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-1214-2/+16
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-1166-68/+68
* | | | Merge pull request #3371 from m3ntalsp00n/reload_countdownblizzz2017-02-102-4/+40
|\ \ \ \
| * | | | Fix indentation and l10n compliance.m3ntalsp00n2017-02-081-3/+3
| * | | | fix tests, longer wait time, update notification stubm3ntalsp00n2017-02-041-2/+4
| * | | | showUpdate funciton allows updated messagesm3ntalsp00n2017-02-041-2/+36
* | | | | 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-091-1/+1
|\ \ \ \ \ \
| * | | | | | oc_token should be nc_tokenChristoph Wurst2017-02-021-1/+1
| | |/ / / / | |/| | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-02-092-0/+2
* | | | | | 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-084-0/+630
|/ / / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2017-02-072-0/+12
* | | | | Merge pull request #3352 from nextcloud/public-page-guest-css-loaderMorris Jobke2017-02-063-115/+84
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 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-012-3/+0
* | | | | [tx-robot] updated from transifexNextcloud bot2017-02-062-0/+4
* | | | | [tx-robot] updated from transifexNextcloud bot2017-02-052-0/+2
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-028-8/+30
|/ / /
* / / [tx-robot] updated from transifexNextcloud bot2017-02-014-0/+608
|/ /
* | Merge pull request #2044 from nextcloud/login-credential-storeMorris Jobke2017-01-302-3/+0
|\ \
| * | always allow remembered loginChristoph Wurst2017-01-112-3/+0
* | | [tx-robot] updated from transifexNextcloud bot2017-01-312-10/+10
* | | Merge pull request #3282 from nextcloud/header-menu-arrow-upMorris Jobke2017-01-301-23/+15
|\ \ \
| * | | Merge similar properties and apply arrow to menu classJohn Molakvoæ (skjnldsv)2017-01-261-23/+15
* | | | Merge pull request #3260 from nextcloud/various-scss-fixesChristoph Wurst2017-01-301-20/+22
|\ \ \ \
| * | | | Blue shadow fix 2John Molakvoæ (skjnldsv)2017-01-261-9/+12