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

50171 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
650927a822
Properly return an int in the getId function of the cache 
fixes #16684

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-08-07 20:38:42 +02:00
Nextcloud bot
52f24b50f5
[tx-robot] updated from transifex 2019-08-07 02:14:38 +00:00
John Molakvoæ
9dbed95b4b
Fix ie app menu loading click (#16667) 
Fix ie app menu loading click
 2019-08-06 19:58:40 +02:00
John Molakvoæ (skjnldsv)
287393609d Fix ie app menu loading click 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-08-06 16:17:00 +00:00
John Molakvoæ
468c61653f
prevent the server's app-navigation's css to overrule the scop… (#16661) 
prevent the server's app-navigation's css to overrule the scoped css …
 2019-08-06 15:37:55 +02:00
Marco Ambrosini
70eeb9df4e prevent the server's app-navigation's css to overrule the scoped css in vue components 
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
 2019-08-06 08:45:19 +02:00
Nextcloud bot
effca30d10
[tx-robot] updated from transifex 2019-08-06 02:14:36 +00:00
Morris Jobke
1d72073e34
Merge pull request #16498 from nextcloud/feature/noid/room_metadata 
Allow calendar resources/rooms to provide metadata
 2019-08-05 14:52:45 +02:00
Roeland Jago Douma
7b0e11f709
Merge pull request #16639 from nextcloud/feature/noid/new-types 
Adding comparaison types: +regex +wildcard (fulltextsearch)
 2019-08-05 14:21:12 +02:00
Morris Jobke
2ca8ff83f2
Merge pull request #16643 from nextcloud/enh/moreDIUsage 
Lets use DI where we can
 2019-08-05 12:55:52 +02:00
Roeland Jago Douma
a6b1592bf0
Merge pull request #16649 from nextcloud/dependabot/npm_and_yarn/nextcloud-vue-collections-0.5.6 
Bump nextcloud-vue-collections from 0.5.4 to 0.5.6
 2019-08-05 08:48:25 +02:00
dependabot-preview[bot]
6f52ca2ab8 Bump nextcloud-vue-collections from 0.5.4 to 0.5.6 
Bumps [nextcloud-vue-collections](https://github.com/juliushaertl/nextcloud-vue-collections) from 0.5.4 to 0.5.6.
- [Release notes](https://github.com/juliushaertl/nextcloud-vue-collections/releases)
- [Commits](https://github.com/juliushaertl/nextcloud-vue-collections/compare/v0.5.4...v0.5.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-08-05 05:54:20 +00:00
Nextcloud bot
9cf2e84d13
[tx-robot] updated from transifex 2019-08-05 02:14:26 +00:00
Roeland Jago Douma
e4b7d02bef
Merge pull request #16651 from nextcloud/dependabot/npm_and_yarn/webpack-4.39.1 
Bump webpack from 4.38.0 to 4.39.1
 2019-08-04 22:48:37 +02:00
dependabot-preview[bot]
b84b78d203 Bump webpack from 4.38.0 to 4.39.1 
Bumps [webpack](https://github.com/webpack/webpack) from 4.38.0 to 4.39.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.38.0...v4.39.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-08-04 07:57:44 +00:00
Nextcloud bot
4327d275c1
[tx-robot] updated from transifex 2019-08-04 02:15:22 +00:00
Nextcloud bot
bfcc3acc9a
[tx-robot] updated from transifex 2019-08-03 02:14:32 +00:00
Roeland Jago Douma
2d9feca0a3
Lets use DI where we can 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-08-02 20:43:50 +02:00
Georg Ehrke
3e5946bd0d
Add standard metadata key for room-features 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-08-02 20:01:32 +02:00
Maxence Lange
f10e525e0c comparaison types: +regex +wildcard 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-08-02 12:24:32 -01:00
blizzz
bc409167f2
Merge pull request #16525 from nextcloud/bugfix/external-user-substitution 
files_external: proper user context for sharing
 2019-08-02 14:07:39 +02:00
Arthur Schiwon
ef237f8e36
fix check for null 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-08-02 13:09:38 +02:00
Julius Härtl
bd089021e6
Adjust tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-08-02 08:39:40 +02:00
Arthur Schiwon
02d6870735
fixes terminology and allows to request an IUser instance 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-08-02 08:39:39 +02:00
Arthur Schiwon
a2c5ab2f8b
adjusts LDAP's home handler to use the correct user object 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-08-02 08:39:39 +02:00
Arthur Schiwon
d577076457
do not send null value when string is expected 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-08-02 08:39:39 +02:00
Julius Härtl
30c44e1d24
Provide proper user context from initMountPoints 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-08-02 08:39:24 +02:00
Julius Härtl
72aaf2e5fb
files_external: Make sure the correct user context is used in substitution of variables 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-08-02 08:39:24 +02:00
Nextcloud bot
67f90cb682
[tx-robot] updated from transifex 2019-08-02 02:14:30 +00:00
Georg Ehrke
ab6add54c7
Allow to do a principal property search based on metadata keys 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-08-01 19:40:27 +02:00
Georg Ehrke
b246e58a1e
Provide standard metadata keys for contact person of a resource 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-08-01 15:26:11 +02:00
Georg Ehrke
475984ef19
Provide standard metadata keys for location of room 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-08-01 15:25:43 +02:00
Georg Ehrke
4b4292996f
Test resource and room principal backend to check that they provide metadata 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-08-01 15:05:53 +02:00
Roeland Jago Douma
8e59132255
Merge pull request #16624 from nextcloud/bugfix/noid/versions-fetch-owner-only 
Make sure we only fetch the file by id for the actual owner
 2019-08-01 15:00:24 +02:00
John Molakvoæ
a0a43de499
Merge pull request #16622 from nextcloud/design/scrollbar 
Standardize scrollbar color and width across Webkit and Firefox
 2019-08-01 14:57:14 +02:00
Georg Ehrke
31d6138f46
Test sync of resource and room metadata 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-08-01 14:05:47 +02:00
Roeland Jago Douma
edf9dee691
Merge pull request #16586 from nextcloud/feature/16585_adminAuditShareCirclesRemotel/wiswedel 
log circles and remote shares in admin_audit
 2019-08-01 12:35:26 +02:00
Sascha Wiswedel
07d2f68786
log circles and remote shares in admin_audit 
Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2019-08-01 10:56:35 +02:00
Roeland Jago Douma
2e2d1b6b5c
Merge pull request #16592 from nextcloud/bugfix/noid/federated-reshare 
Fix permission check on incoming federated shares
 2019-08-01 10:55:35 +02:00
Julius Härtl
e26187c7ff
Make sure we only fetch the file by id for the actual owner 
Otherwise this will fetch all mounts for the file id which is quite
expensive and causes long saving times in big sharing structures

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-08-01 10:10:49 +02:00
Georg Ehrke
ca060a2a83
sync metadata of rooms / resources with cache 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-08-01 10:08:56 +02:00
Georg Ehrke
54fb0f4f04
provide room / resource properties as principal properties 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-08-01 10:08:56 +02:00
Georg Ehrke
9f345bd786
add oc_calendar_resources_md and oc_calendar_rooms_md tables 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-08-01 10:08:55 +02:00
Georg Ehrke
2dc79e5839
Add \OCP\Calendar\IMetadataProvider interface and provider for common metadata keys 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-08-01 10:08:52 +02:00
Nextcloud bot
a1afdac31a
[tx-robot] updated from transifex 2019-08-01 02:15:27 +00:00
Roeland Jago Douma
5f6ac5a7b2
Merge pull request #16618 from nextcloud/enh/csp/form-action 
Add form-action CSP element
 2019-07-31 19:41:52 +02:00
Jan-Christoph Borchardt
c92e6192a5
Standardize scrollbar color and width across Webkit and Firefox 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-07-31 18:36:39 +02:00
Roeland Jago Douma
cf647451e5
Update CSP test cases to handle the new form-action 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-07-31 15:16:10 +02:00
Roeland Jago Douma
f94ee72507
Add form-action CSP element 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-07-31 15:16:10 +02:00
Julius Härtl
22b81ac1e4
Fix permission check on incoming federated shares 
Since federated shares have their permissions set on the node, we do not need
to check for parent share permissions. Otherwise reshares of incoming federated
have no permission variable defined and creating them will fail

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-07-31 12:59:51 +02:00