summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* 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 #16097 from ↵Joas Schilling2019-06-272-3/+243
|\ \ | | | | | | | | | | | | 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>
| * | 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 #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>
* | | [tx-robot] updated from transifexNextcloud bot2019-06-274-2/+14
| | |
* | | 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>
* | | [tx-robot] updated from transifexNextcloud bot2019-06-264-2/+34
|/ /
* | Merge pull request #16055 from nextcloud/design/native-fontsJan-Christoph Borchardt2019-06-262-11/+4
|\ \ | | | | | | Use native font stack
| * | Use native font stackJan-Christoph Borchardt2019-06-242-2/+2
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Move font from Nunito to Noto SansJan-Christoph Borchardt2019-06-222-11/+4
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Bump css-loader from 2.1.1 to 3.0.0dependabot-preview[bot]2019-06-2516-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge pull request #16013 from nextcloud/versions-preview-string-idRoeland Jago Douma2019-06-256-6/+6
|\ \ \ | | | | | | | | fix previews of versions with non numeric version ids
| * | | fix previews and rollback of versions with non numeric version idsRobin Appelman2019-06-196-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #16024 from ↵Roeland Jago Douma2019-06-251-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/15944/fix-return-code-user-provision Forward OCSException to initiator
| * | | | Forward OCSException to initiatorDaniel Kesselberg2019-06-201-1/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Merge pull request #15777 from nextcloud/feature/ocp-event-dispatcherRoeland Jago Douma2019-06-2522-118/+64
|\ \ \ \ \ | | | | | | | | | | | | Add event dispatcher to OCP
| * | | | | Add event dispatcher to OCPChristoph Wurst2019-06-2522-118/+64
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-06-258-8/+44
| | | | |
* | | | | Merge pull request #15888 from nextcloud/dav-write-forward-exceptionRobin Appelman2019-06-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | log inner exception during dav write
| * | | | | log inner exception during dav writeRobin Appelman2019-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #16033 from nextcloud/fix/noid/ldap-group-wiz-selectionblizzz2019-06-243-44/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix LDAP Wizard forgetting groups on select with search
| * | | | | | fixes LDAP Wizard forgetting groups on select with searchArthur Schiwon2019-06-213-44/+32
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-06-246-4/+22
| | | | | |
* | | | | | changes the returned key from UserID to id, in accordance with getUserDataArthur Schiwon2019-06-212-7/+7
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #15964 from nextcloud/enh/noid/user-creation-optionsblizzz2019-06-216-12/+218
|\ \ \ \ \ | | | | | | | | | | | | Opt-in for generation userid, requiring email addresses
| * | | | | uses "yes" and "no" for config switch over stringified numbersArthur Schiwon2019-06-212-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | makes users management page aware of the introduced optionsArthur Schiwon2019-06-192-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | ensures mapping of chosen useridArthur Schiwon2019-06-194-6/+39
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | extends Provisioning API with optional userid and required emailArthur Schiwon2019-06-192-6/+179
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-06-212-2/+12
| | | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-06-202-2/+12
| | | | | |
* | | | | | Fix window scroll container (#16009)John Molakvoæ2019-06-191-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix window scroll container
| * | | | | | Fix window scroll containerJulius Härtl2019-06-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | Merge pull request #16011 from nextcloud/fix/noid/ldapprovider-return-one-baseblizzz2019-06-193-20/+83
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | (LDAP) API: return one base properly when multiple are configured
| * | | | | | fixes return type in php docArthur Schiwon2019-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * the backend already expects and works with the string Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | fixes returning the base when multiple are specifiedArthur Schiwon2019-06-192-19/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * reading the config directly will return the value with line breaks * using the proper accessor gives us all bases in an array * returns the first matching one * having user id provided for the group base is strange and does not let us operate like this. here we return the first one. might change in future, a backportable fix won't have an API change however. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | Merge pull request #15988 from nextcloud/feature/shared-browserlist-configGeorg Ehrke2019-06-192-2/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Use shared browserslist config
| * | | | | | Use shared browserslist configChristoph Wurst2019-06-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>