summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11498 from nextcloud/copy-link-wordingMorris Jobke2018-10-011-5/+5
|\ | | | | Change wording of 'Copy URL' to more understandable 'Copy link'
| * Change wording of 'Copy URL' to more understandable 'Copy link'Jan-Christoph Borchardt2018-10-011-5/+5
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Merge pull request #11499 from nextcloud/public-footerMorris Jobke2018-10-011-0/+3
|\ \ | | | | | | Fix public page footer link wrap
| * | Fix public page footer link wrapJan-Christoph Borchardt2018-10-011-0/+3
| |/ | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* / Add hint for locked accounts where 2FA is enforced but not configuredChristoph Wurst2018-10-011-0/+10
|/ | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge pull request #11470 from nextcloud/avatar-hoverMorris Jobke2018-10-011-1/+3
|\ | | | | Change highlight effect of user avatar from opacity to border
| * Change highlight effect of user avatar from opacity to borderJan-Christoph Borchardt2018-09-301-1/+3
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Merge pull request #11444 from nextcloud/feature/11413/handlebars_compile_stepChristoph Wurst2018-10-011-25/+25
|\ \ | | | | | | Simple handlebars CI step
| * | Bump templates to handlebars 4.0.12Roeland Jago Douma2018-09-281-25/+25
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-10-018-12/+70
| | |
* | | Add mandatory 2FA service/classChristoph Wurst2018-09-302-0/+92
| |/ |/| | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | [tx-robot] updated from transifexNextcloud bot2018-09-304-6/+26
| |
* | [tx-robot] updated from transifexNextcloud bot2018-09-292-2/+0
|/
* Merge pull request #11037 from nextcloud/trash-webui-davMorris Jobke2018-09-281-1/+2
|\ | | | | Use trashbin dav endpoint to list trash in webui
| * fix trashbin infoparsers interfering with other dav clientsRobin Appelman2018-09-201-0/+1
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * pass existing data to info parsersRobin Appelman2018-09-201-1/+1
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #11429 from nextcloud/feature/11033/bump_strengthifyMorris Jobke2018-09-283-13/+15
|\ \ | | | | | | Bump strengthify
| * | Bump strengthifyRoeland Jago Douma2018-09-283-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #11033 For https://github.com/orgs/nextcloud/projects/18 Move to a stricter CSP safe strengthify Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #11428 from nextcloud/history-icon-center-fixRoeland Jago Douma2018-09-282-2/+2
|\ \ \ | | | | | | | | Center back the history icon
| * | | CleanupJohn Molakvoæ (skjnldsv)2018-09-281-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Center back the history iconJohn Molakvoæ (skjnldsv)2018-09-282-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | [tx-robot] updated from transifexNextcloud bot2018-09-2890-90/+90
| |/ / |/| |
* | | Merge pull request #11414 from ↵Morris Jobke2018-09-288-81/+190
|\ \ \ | |/ / |/| | | | | | | | nextcloud/csp/11029/contacts_menu_compiled_handlebars Compile contactmenu handlebars templates
| * | Compile contactmenu handlebars templatesRoeland Jago Douma2018-09-278-81/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #11029 For https://github.com/orgs/nextcloud/projects/18 Ship the compiled handlebars templates. This makes it possible to have a scricter CSP. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | TABS :DJohn Molakvoæ (skjnldsv)2018-09-281-160/+160
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Fix invalid inline input confirm borderJohn Molakvoæ (skjnldsv)2018-09-281-5/+5
|/ / | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Fixes the logo heightMichael Weimann2018-09-271-3/+3
| | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | [tx-robot] updated from transifexNextcloud bot2018-09-274-2/+16
| |
* | [tx-robot] updated from transifexNextcloud bot2018-09-262-2/+2
| |
* | Merge pull request #11143 from nextcloud/feature/2fa-occ-revampRoeland Jago Douma2018-09-255-20/+95
|\ \ | | | | | | [Mandatory 2FA] occ commands revamp
| * | Only allow 2FA state changs if providers support the operationChristoph Wurst2018-09-255-20/+95
| | | | | | | | | | | | | | | | | | | | | | | | Ref https://github.com/nextcloud/server/issues/11019. Add `twofactorauth:cleanup` command Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #11368 from nextcloud/content-list-flex-fixesRoeland Jago Douma2018-09-252-2/+4
|\ \ \ | |/ / |/| | Fix default flex shrink on list
| * | Fix default flex shrink on listJohn Molakvoæ (skjnldsv)2018-09-252-2/+4
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2018-09-252-84/+84
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-09-242-30/+30
| |
* | [tx-robot] updated from transifexNextcloud bot2018-09-234-12/+16
| |
* | [tx-robot] updated from transifexNextcloud bot2018-09-228-16/+146
| |
* | [tx-robot] updated from transifexNextcloud bot2018-09-2112-44/+88
|/
* [tx-robot] updated from transifexNextcloud bot2018-09-2012-0/+14
|
* Merge pull request #11171 from ↵Joas Schilling2018-09-191-10/+22
|\ | | | | | | | | nextcloud/bugfix/noid/shared-by-info-for-room-shares-without-names Better shared-by info for conversations without names
| * Better shared-by info for conversations without namesJoas Schilling2018-09-111-10/+22
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2018-09-192-0/+30
| |
* | Merge pull request #11208 from violoncelloch/add-mastodon-iconJoas Schilling2018-09-171-0/+2
|\ \ | | | | | | add mastodon icon to settings/user
| * | add mastodon icon to settings/userJonas Sulzer2018-09-131-0/+2
| | | | | | | | | | | | | | | | | | fixes #6714 Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
* | | [tx-robot] updated from transifexNextcloud bot2018-09-178-2/+22
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-09-166-146/+230
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-09-1516-0/+18
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-09-1486-100/+140
|/ /
* | Merge pull request #11151 from nextcloud/davclient-js-decodeJoas Schilling2018-09-131-1/+1
|\ \ | | | | | | fix js files client for user names with spaces
| * | fix js files client for user names with spacesRobin Appelman2018-09-101-1/+1
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>