summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Do not show app score if it has no ratingsChristoph Wurst2019-06-283-4/+6
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* [tx-robot] updated from transifexNextcloud bot2019-06-2820-28/+54
|
* Merge pull request #16121 from ↵Roeland Jago Douma2019-06-271-1/+1
|\ | | | | | | | | nextcloud/bugfix/noid/dont-allow-to-disable-encryption-via-the-api Don't allow to disable encryption via the API
| * Don't allow to disable encryption via the APIJoas Schilling2019-06-271-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #16122 from nextcloud/fix/apps/sidebar-close-iconRoeland Jago Douma2019-06-274-12/+9
|\ \ | | | | | | Remove duplicate close-icon
| * | Remove duplicate close-iconGreta Doci2019-06-274-12/+9
| |/ | | | | | | Signed-off-by: Greta Doci <gretadoci@gmail.com>
* | Merge pull request #16107 from nextcloud/local-check-pathRoeland Jago Douma2019-06-271-0/+21
|\ \ | | | | | | verify that paths are valid for recursive local move
| * | verify that paths are valid for recursive local moveRobin Appelman2019-06-271-0/+21
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #16097 from ↵Joas Schilling2019-06-274-6/+291
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/correctly-check-share-permissions-for-updating-reshare-permissions Better check reshare permissions
| * | | Fix sharing testsRoeland Jago Douma2019-06-271-0/+230
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Add integration test for increasing sub reshare permissionsDaniel Calviño Sánchez2019-06-272-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests check an user share and a link share; there is a slight difference in style between them as each one is based on the test above it, which tests increasing reshare permissions. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Do not create folders with admin userDaniel Calviño Sánchez2019-06-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The admin user is not deleted after each integration test is run, so folders created by the admin user in one test are still there when the next tests run; tests should be independent one from each other, so a regular user that is created and deleted for each test should be used instead. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Correctly check share permissions when updating a re-sub-shareJoas Schilling2019-06-271-3/+13
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Before this change the node you shared was checked for permissions. This works when you reshare the folder that was shared with you. However when you reshared a subfolder (e.g. as public link), you could afterwards update the permissions and grant create+update permissions although the share you receive was read-only. Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #16118 from ↵Roeland Jago Douma2019-06-272-4/+15
|\ \ \ | |/ / |/| | | | | | | | nextcloud/fix-placement-of-icon-in-public-share-page-for-audio-files Fix placement of icon in public share page for audio files
| * | Fix placement of icon in public share page for audio filesDaniel Calviño Sánchez2019-06-272-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the preview for audio files is used an HTML 5 audio element is shown in the public share page. This element is added by the template, so it is already there when the mimetype icon is added to the "#imgframe" element. Instead of appended the icon is now prepended, so it appears before the audio element (prepending instead of appending should make no difference for other types of files, as in that case the "#imgframe" element is empty). Besides that, the CSS was modified to show the icon centered above the audio preview instead of next to it. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Fix download link included in public share page with hidden downloadDaniel Calviño Sánchez2019-06-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | The preview element in the public share page was always wrapped with a link to download the file; now that link is included only if the "Hide download" option of the share is not enabled. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #16117 from nextcloud/fix/avatar_testsRoeland Jago Douma2019-06-271-0/+0
|\ \ \ | | | | | | | | Use correct test avatar
| * | | Use correct test avatarRoeland Jago Douma2019-06-271-0/+0
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Show contacts app mgmt link in contacts menu (#16104)John Molakvoæ2019-06-278-16/+23
|\ \ \ \ | | | | | | | | | | Show contacts app mgmt link in contacts menu
| * | | | Show contacts app mgmt link in contacts menuChristoph Wurst2019-06-278-16/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #16101 from ↵blizzz2019-06-273-7/+37
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | nextcloud/fix/ldap/invaliate-user-after-delete-by-plugin invalidates user when plugin reported deletion success
| * | | | Also invalidate groups after deletionArthur Schiwon2019-06-271-2/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | invalidates user when plugin reported deletion successArthur Schiwon2019-06-262-5/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #16088 from ↵Joas Schilling2019-06-272-5/+7
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | nextcloud/bugfix/noid/allow-longer-comments-to-be-stored-in-the-comments-api Allow apps to store longer messages in the comments API
| * | | | Allow apps to store longer messages in the comments APIJoas Schilling2019-06-262-5/+7
| |/ / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2019-06-278-2/+36
| | | |
* | | | Merge pull request #15829 from nextcloud/fix/js-l10n-registrationRoeland Jago Douma2019-06-2610-72/+181
|\ \ \ \ | | | | | | | | | | Fix js l10n registration to also work with more than one bundle
| * | | | Fix js l10n registration to also work with more than one bundleChristoph Wurst2019-06-2610-72/+181
| |/ / / | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #16095 from nextcloud/bugfix/theming-filetypesJan-Christoph Borchardt2019-06-261-1/+1
|\ \ \ \ | | | | | | | | | | Only return link to themed icon if file exists
| * | | | Only return link to themed icon if file existsJulius Härtl2019-06-261-1/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #16093 from nextcloud/design/comments-iconJan-Christoph Borchardt2019-06-262-2/+2
|\ \ \ \ | | | | | | | | | | Update comments icon to use updated core one
| * | | | Update comments icon to use updated core oneJan-Christoph Borchardt2019-06-262-2/+2
| |/ / / | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #16084 from nextcloud/design/fix-files-checkboxesJan-Christoph Borchardt2019-06-261-0/+1
|\ \ \ \ | |/ / / |/| | | Fix file checkbox margin causing layout issues in file list
| * | | Fix file checkbox margin causing layout issues in file listJan-Christoph Borchardt2019-06-261-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #15859 from nextcloud/deprecate/oc-redirect-reloadRoeland Jago Douma2019-06-264-3/+5
|\ \ \ \ | | | | | | | | | | Deprecate window.location wrappers for redirect and reload
| * | | | Deprecate window.location wrappers for redirect and reloadChristoph Wurst2019-06-254-3/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-06-2610-2/+68
| |/ / / |/| | |
* | | | Merge pull request #16055 from nextcloud/design/native-fontsJan-Christoph Borchardt2019-06-2637-140/+43
|\ \ \ \ | | | | | | | | | | Use native font stack
| * | | | Use native font stackJan-Christoph Borchardt2019-06-247-299/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Move font from Nunito to Noto SansJan-Christoph Borchardt2019-06-2236-113/+309
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Merge pull request #16021 from ↵Roeland Jago Douma2019-06-252-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/fall-back-to-black-for-non-color-values Fall back to black for non-color values
| * | | | | Fall back to black for non-color valuesJoas Schilling2019-06-202-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #16027 from ↵Roeland Jago Douma2019-06-251-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/check-if-uploading-is-enabled-before-verifying Check if uploading to lookup server is enabled before verifying
| * | | | | | Check if uploading to lookup server is enabled before verifyingJoas Schilling2019-06-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #15832 from ↵Roeland Jago Douma2019-06-252-2/+5
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/fulltext-search-groupfolders Fix full text search for groupfolders
| * | | | | | Fix full text search for groupfoldersMorris Jobke2019-06-172-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #15956 from nextcloud/bugfix/noid/fix_checkapp_occRoeland Jago Douma2019-06-251-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix appid argument for integrity:check-app
| * | | | | | | Fix appid argument for integrity:check-appGeorg Ehrke2019-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | | | Merge pull request #15970 from ↵Roeland Jago Douma2019-06-2531-89/+98
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/css-loader-3.0.0 Bump css-loader from 2.1.1 to 3.0.0
| * | | | | | | | Bump css-loader from 2.1.1 to 3.0.0dependabot-preview[bot]2019-06-2531-89/+98
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 2.1.1 to 3.0.0. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v2.1.1...v3.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>