| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [tx-robot] updated from transifex | Nextcloud bot | 2018-08-15 | 4 | -0/+8 |
| | | |||||
| * | Merge pull request #10679 from nextcloud/fix/10667/dialog-button-layout | Roeland Jago Douma | 2018-08-14 | 1 | -17/+8 |
| |\ | | | | | switches the oc dialog button row to flex | ||||
| | * | switches the oc dialog button row to flex | Michael Weimann | 2018-08-13 | 1 | -17/+8 |
| | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu> | ||||
| * | | [tx-robot] updated from transifex | Nextcloud bot | 2018-08-14 | 2 | -0/+10 |
| |/ | |||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2018-08-13 | 8 | -2/+96 |
| | | |||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2018-08-11 | 10 | -0/+16 |
| | | |||||
| * | Merge pull request #10623 from nextcloud/bugfix/10622/mobile-header | Roeland Jago Douma | 2018-08-10 | 1 | -0/+2 |
| |\ | | | | | Apply flex-basis to right header | ||||
| | * | Apply flex-basis to right header | Julius Härtl | 2018-08-09 | 1 | -0/+2 |
| | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | | Merge pull request #10619 from nextcloud/bugfix/4550/redirect-page-update | Roeland Jago Douma | 2018-08-10 | 1 | -1/+1 |
| |\ \ | | | | | | | Redirect to the same page after an update | ||||
| | * | | Redirect to the same page after an update | Julius Härtl | 2018-08-09 | 1 | -1/+1 |
| | |/ | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | | Merge pull request #10546 from nextcloud/popover-tokens | Christoph Wurst | 2018-08-10 | 1 | -4/+7 |
| |\ \ | | | | | | | Popovermenu fix and token settings design fixes | ||||
| | * | | POpovermenu fix and token settings design fixes | John Molakvoæ (skjnldsv) | 2018-08-06 | 1 | -4/+7 |
| | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-08-10 | 2 | -6/+6 |
| | | | | |||||
| * | | | Merge pull request #10614 from nextcloud/bugfix/noid/fix_including_invalid_file | Roeland Jago Douma | 2018-08-09 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Do not use file as template parameter | ||||
| | * | | | Do not use file as template parameter | Roeland Jago Douma | 2018-08-09 | 1 | -1/+1 |
| | | |/ | |/| | | | | | | | | | | | | | | | | | | | Using file will overwrite the $file parameter in the template base. Leading to trying to include a file that is the exception message. Which will of course fail. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Merge pull request #10598 from schoonc/patch-1 | Roeland Jago Douma | 2018-08-09 | 1 | -2/+0 |
| |\ \ \ | |/ / |/| | | Removed unused variable isFile | ||||
| | * | | Removed unused variable isFile | schoonc | 2018-08-09 | 1 | -2/+0 |
| | | | | |||||
| * | | | Merge pull request #10588 from nextcloud/fix/single-2fa-provider-login-redirect | Roeland Jago Douma | 2018-08-09 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Fix login redirection if only one 2FA provider is active | ||||
| | * | | | Rename providerset method to get primary providers | Christoph Wurst | 2018-08-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| | * | | | Fix login redirection if only one 2FA provider is active | Christoph Wurst | 2018-08-08 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/10500. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | | | Merge pull request #10255 from nextcloud/add-support-for-room-shares | Björn Schießle | 2018-08-09 | 3 | -1/+15 |
| |\ \ \ | | | | | | | | | Add support for room shares | ||||
| | * | | | Add custom handling for room shares to the resharer information | Daniel Calviño Sánchez | 2018-08-08 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like done with group shares, received room shares are described as such in the UI. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com> | ||||
| | * | | | Add custom handling for room shares to the list of sharees | Daniel Calviño Sánchez | 2018-08-08 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like done for other types of shares, room shares are now explicitly described as such in the UI. The avatar used is the image provided in the "shareWithAvatar" property of the share. If none is given then the avatar is the first letter of the display name of the room share with a coloured background seeded from the room token. If the display name of the room is empty then no letter is shown in the avatar; no special handling is done in that case. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com> | ||||
| | * | | | Add type for room shares | Daniel Calviño Sánchez | 2018-08-08 | 1 | -0/+1 |
| | |/ / | | | | | | | | | | | | | | | | This type represents shares with a Nextcloud Talk conversation. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com> | ||||
| * / / | Restores the guest icons | Michael Weimann | 2018-08-08 | 3 | -0/+3 |
| |/ / | |||||
| * | | Merge pull request #10568 from nextcloud/apps-menu-fixes | John Molakvoæ | 2018-08-08 | 1 | -1/+1 |
| |\ \ | | | | | | | Fix apps max-height | ||||
| | * | | Fix apps max-height | John Molakvoæ (skjnldsv) | 2018-08-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | | | Merge pull request #10525 from nextcloud/notifications-fix | Roeland Jago Douma | 2018-08-08 | 1 | -1/+2 |
| |\ \ \ | | | | | | | | | Fixed notifications position | ||||
| | * | | | Fixed notifications position | John Molakvoæ (skjnldsv) | 2018-08-03 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-08-08 | 4 | -12/+114 |
| | |/ / |/| | | |||||
| * | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-08-07 | 2 | -0/+2 |
| | | | | |||||
| * | | | Merge pull request #10530 from nextcloud/bugfix/10528/public-template | Joas Schilling | 2018-08-06 | 3 | -8/+13 |
| |\ \ \ | | | | | | | | | Fix issues when using the public layout without a PublicTemplateResponse | ||||
| | * | | | Make public layout also usable without a PublicTemplateResponse | Julius Härtl | 2018-08-03 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| | * | | | Fix base layout content padding | Julius Härtl | 2018-08-03 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| | * | | | Remove header-classes since it is never used | Julius Härtl | 2018-08-03 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | | | Merge pull request #10485 from nextcloud/update-triangle | Roeland Jago Douma | 2018-08-06 | 4 | -17/+24 |
| |\ \ \ | |_|/ |/| | | Fix design of update error page | ||||
| | * | | Fix HTML on update error page | Jan-Christoph Borchardt | 2018-08-03 | 1 | -14/+7 |
| | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| | * | | Add margin below detailed logs | Jan-Christoph Borchardt | 2018-08-03 | 1 | -1/+2 |
| | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| | * | | Use images instead of inline SVG and unicode | Jan-Christoph Borchardt | 2018-08-03 | 3 | -4/+13 |
| | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| | * | | Fix double container on 'Possible CSRF attack' page | Jan-Christoph Borchardt | 2018-08-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| | * | | Inline error svg icon because there is no SCSS on guest page | Jan-Christoph Borchardt | 2018-08-01 | 1 | -0/+3 |
| | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| | * | | Fix text overflow on update page | Jan-Christoph Borchardt | 2018-08-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| | * | | Fix triangle on update page | Jan-Christoph Borchardt | 2018-08-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-08-06 | 2 | -0/+8 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-08-05 | 2 | -0/+2 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-08-04 | 6 | -0/+10 |
| | |/ |/| | |||||
| * | | Merge pull request #10519 from nextcloud/min-height-wrapper | Roeland Jago Douma | 2018-08-03 | 1 | -0/+3 |
| |\ \ | | | | | | | Min height 100% on content-wrapper | ||||
| | * | | Min height 100% on content-wrapper | John Molakvoæ (skjnldsv) | 2018-08-03 | 1 | -0/+3 |
| | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | | | Merge pull request #10515 from nextcloud/revert-zindex | Roeland Jago Douma | 2018-08-03 | 2 | -3/+3 |
| |\ \ \ | | | | | | | | | Fixed design zindex | ||||
| | * | | | Fixed design zindex | John Molakvoæ (skjnldsv) | 2018-08-03 | 2 | -3/+3 |
| | |/ / | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |