wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
49787 commits 157 branches 562 tags 714 MiB
Commit graph

49787 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
e648c07335
Merge pull request #16122 from nextcloud/fix/apps/sidebar-close-icon 
Remove duplicate close-icon
 2019-06-27 22:11:43 +02:00
Christoph Wurst
aa6622ccef Decouple remote wipe notifcation channels with events 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-06-27 17:16:18 +02:00
Roeland Jago Douma
5312a07f55
Merge pull request #16107 from nextcloud/local-check-path 
verify that paths are valid for recursive local move
 2019-06-27 16:36:30 +02:00
Joas Schilling
bc6053eb21
Merge pull request #16097 from nextcloud/bugfix/noid/correctly-check-share-permissions-for-updating-reshare-permissions 
Better check reshare permissions
 2019-06-27 16:30:05 +02:00
Roeland Jago Douma
f7ea09a0ff
Merge pull request #16118 from nextcloud/fix-placement-of-icon-in-public-share-page-for-audio-files 
Fix placement of icon in public share page for audio files
 2019-06-27 16:28:41 +02:00
Greta Doci
32abff5e77 Remove duplicate close-icon 
Signed-off-by: Greta Doci <gretadoci@gmail.com>
 2019-06-27 15:37:44 +02:00
Roeland Jago Douma
f9f3e00d06
Fix sharing tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-06-27 15:27:31 +02:00
Daniel Calviño Sánchez
f01a772a1a
Add integration test for increasing sub reshare permissions 
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>
 2019-06-27 15:27:30 +02:00
Daniel Calviño Sánchez
3802174f06
Do not create folders with admin user 
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>
 2019-06-27 15:27:30 +02:00
Joas Schilling
7aa26b28a8
Correctly check share permissions when updating a re-sub-share 
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>
 2019-06-27 15:27:30 +02:00
Joas Schilling
8c73c1ea5e
Don't allow to disable encryption via the API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-06-27 14:54:28 +02:00
Roeland Jago Douma
c63f1d8d39
Merge pull request #16117 from nextcloud/fix/avatar_tests 
Use correct test avatar
 2019-06-27 14:47:05 +02:00
John Molakvoæ
26d3a2d48c
Show contacts app mgmt link in contacts menu (#16104) 
Show contacts app mgmt link in contacts menu
 2019-06-27 14:11:23 +02:00
Daniel Calviño Sánchez
a8323bbc05 Fix placement of icon in public share page for audio files 
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>
 2019-06-27 13:33:22 +02:00
Roeland Jago Douma
dd79eda8a0
Use correct test avatar 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-06-27 13:27:03 +02:00
Daniel Calviño Sánchez
443c1db3a3 Fix download link included in public share page with hidden download 
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>
 2019-06-27 12:21:34 +02:00
blizzz
690406db41
Merge pull request #16101 from nextcloud/fix/ldap/invaliate-user-after-delete-by-plugin 
invalidates user when plugin reported deletion success
 2019-06-27 12:21:02 +02:00
Robin Appelman
f39605dabc
verify that paths are valid for recursive local move 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-06-27 11:10:08 +02:00
Christoph Wurst
20afe94297 Do not show a internet connectivity warning if internet access is disabled 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-06-27 10:51:59 +02:00
Arthur Schiwon
d0f31c590d
Also invalidate groups after deletion 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-06-27 10:33:40 +02:00
Joas Schilling
0d3f9be56e
Merge pull request #16088 from nextcloud/bugfix/noid/allow-longer-comments-to-be-stored-in-the-comments-api 
Allow apps to store longer messages in the comments API
 2019-06-27 10:04:19 +02:00
Christoph Wurst
e9860c89ca
Show contacts app mgmt link in contacts menu 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-06-27 09:33:27 +02:00
Nextcloud bot
afb86ef4f5
[tx-robot] updated from transifex 2019-06-27 02:14:09 +00:00
Roeland Jago Douma
7ddc5bc540
Merge pull request #15829 from nextcloud/fix/js-l10n-registration 
Fix js l10n registration to also work with more than one bundle
 2019-06-26 18:41:13 +02:00
Jan-Christoph Borchardt
810e5f4864
Merge pull request #16095 from nextcloud/bugfix/theming-filetypes 
Only return link to themed icon if file exists
 2019-06-26 14:58:43 +02:00
Jan-Christoph Borchardt
0e0801391e
Merge pull request #16093 from nextcloud/design/comments-icon 
Update comments icon to use updated core one
 2019-06-26 14:53:11 +02:00
Jan-Christoph Borchardt
665362b354
Merge pull request #16084 from nextcloud/design/fix-files-checkboxes 
Fix file checkbox margin causing layout issues in file list
 2019-06-26 14:52:37 +02:00
Arthur Schiwon
108227ca6c
invalidates user when plugin reported deletion success 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-06-26 14:18:28 +02:00
Julius Härtl
ec6ce43053
Only return link to themed icon if file exists 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-06-26 10:53:49 +02:00
Jan-Christoph Borchardt
14af581164
Update comments icon to use updated core one 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-06-26 10:24:20 +02:00
Joas Schilling
d2c8a11c07
Allow apps to store longer messages in the comments API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-06-26 10:14:24 +02:00
Christoph Wurst
409acf1131
Fix js l10n registration to also work with more than one bundle 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-06-26 10:07:21 +02:00
Roeland Jago Douma
bc276cdd83
Merge pull request #15859 from nextcloud/deprecate/oc-redirect-reload 
Deprecate window.location wrappers for redirect and reload
 2019-06-26 10:00:31 +02:00
Nextcloud bot
9bd2b11ce7
[tx-robot] updated from transifex 2019-06-26 02:13:59 +00:00
Jan-Christoph Borchardt
2832c0d8a2
Fix file checkbox margin causing layout issues in file list 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-06-26 00:48:11 +02:00
Jan-Christoph Borchardt
b466127b1f
Merge pull request #16055 from nextcloud/design/native-fonts 
Use native font stack
 2019-06-26 00:08:16 +02:00
Roeland Jago Douma
a47403d5f8
Merge pull request #16021 from nextcloud/bugfix/noid/fall-back-to-black-for-non-color-values 
Fall back to black for non-color values
 2019-06-25 22:04:12 +02:00
Roeland Jago Douma
da025d4867
Merge pull request #16027 from nextcloud/bugfix/noid/check-if-uploading-is-enabled-before-verifying 
Check if uploading to lookup server is enabled before verifying
 2019-06-25 22:02:55 +02:00
Roeland Jago Douma
2f5810f26e
Merge pull request #15832 from nextcloud/bugfix/noid/fulltext-search-groupfolders 
Fix full text search for groupfolders
 2019-06-25 21:43:37 +02:00
Christoph Wurst
ac0e414a18
Deprecate window.location wrappers for redirect and reload 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-06-25 21:39:37 +02:00
Roeland Jago Douma
0f0dfc837e
Merge pull request #15956 from nextcloud/bugfix/noid/fix_checkapp_occ 
Fix appid argument for integrity:check-app
 2019-06-25 21:36:33 +02:00
Roeland Jago Douma
ce642fb0e2
Merge pull request #15970 from nextcloud/dependabot/npm_and_yarn/css-loader-3.0.0 
Bump css-loader from 2.1.1 to 3.0.0
 2019-06-25 21:35:47 +02:00
dependabot-preview[bot]
4a401865f2
Bump css-loader from 2.1.1 to 3.0.0 
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>
 2019-06-25 21:33:38 +02:00
Roeland Jago Douma
11b71a143e
Merge pull request #16013 from nextcloud/versions-preview-string-id 
fix previews of versions with non numeric version ids
 2019-06-25 21:21:50 +02:00
Roeland Jago Douma
d4a44d9b78
Merge pull request #15870 from nextcloud/preview-provider-v2 
Add new Provider interface for preview providers
 2019-06-25 15:05:54 +02:00
Georg Ehrke
d814089c6a
Fix appid argument for integrity:check-app 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-06-25 14:53:12 +02:00
Roeland Jago Douma
335af0c46c
Merge pull request #15971 from nextcloud/dependabot/npm_and_yarn/tests/ui-regression/pixelmatch-tw-5.0.2 
Update pixelmatch requirement from ^4.0.2 to ^5.0.2 in /tests/ui-regression
 2019-06-25 14:25:29 +02:00
Roeland Jago Douma
98244b5d6d
Merge pull request #16024 from nextcloud/bugfix/15944/fix-return-code-user-provision 
Forward OCSException to initiator
 2019-06-25 13:32:10 +02:00
Roeland Jago Douma
5fbf304c2a
Merge pull request #15777 from nextcloud/feature/ocp-event-dispatcher 
Add event dispatcher to OCP
 2019-06-25 11:48:16 +02:00
Christoph Wurst
3174012adf Add event dispatcher to OCP 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-06-25 10:02:27 +02:00