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

47935 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christoph Wurst
da44c1480e
Merge pull request #13680 from nextcloud/dependabot/npm_and_yarn/dompurify-1.0.9 
Bump dompurify from 1.0.4 to 1.0.9
 2019-01-21 12:49:05 +01:00
dependabot[bot]
34de0e782d
Bump nextcloud-vue from 0.5.0 to 0.6.0 in /apps/updatenotification 
Bumps [nextcloud-vue](https://github.com/nextcloud/vue-components) from 0.5.0 to 0.6.0.
- [Release notes](https://github.com/nextcloud/vue-components/releases)
- [Commits](https://github.com/nextcloud/vue-components/compare/v0.5.0...v0.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-21 11:20:23 +01:00
dependabot[bot]
b3c4529c02
Bump dompurify from 1.0.4 to 1.0.9 
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 1.0.4 to 1.0.9.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](https://github.com/cure53/DOMPurify/compare/1.0.4...1.0.9)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-21 11:17:19 +01:00
dependabot[bot]
f31b82b8c9
Merge pull request #13676 from nextcloud/dependabot/npm_and_yarn/settings/vuex-3.1.0 2019-01-21 10:14:48 +00:00
dependabot[bot]
124b692305
Bump vuex from 3.0.1 to 3.1.0 in /settings 
Bumps [vuex](https://github.com/vuejs/vuex) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/vuejs/vuex/releases)
- [Commits](https://github.com/vuejs/vuex/compare/v3.0.1...v3.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-21 10:57:29 +01:00
Nextcloud bot
96567027da
[tx-robot] updated from transifex 2019-01-21 01:11:50 +00:00
Nextcloud bot
a73e19d741
[tx-robot] updated from transifex 2019-01-20 01:12:32 +00:00
Nextcloud bot
f12b589d40
[tx-robot] updated from transifex 2019-01-19 01:12:22 +00:00
Roeland Jago Douma
c1e839961e
Include static search template in JS 
There is no need to fetch this from the server if it is static anyway.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-18 22:06:54 +01:00
Morris Jobke
e28a18ab16
Merge pull request #13660 from nextcloud/fix/template_parameter 
Fix template paramter
 2019-01-18 17:21:51 +01:00
Morris Jobke
743323ee48
Merge pull request #12381 from rummatee/master 
Move/copy file picker: Remeber last destination and start in current folder
 2019-01-18 17:20:54 +01:00
Roeland Jago Douma
66367797df
Fix template paramter 
Else we get shown an error page instead of the correct 403.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-18 15:30:38 +01:00
Morris Jobke
10ab678aa5
Merge pull request #13664 from nextcloud/bugfix/noid/proper-warning-in-settings 
Use warning background color & primary text color for setting warnings
 2019-01-18 13:56:48 +01:00
Morris Jobke
9ee4433333
Use warning background color & primary text color for setting warnings 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-01-18 12:07:10 +01:00
Nextcloud bot
f8ce5ea6f3
[tx-robot] updated from transifex 2019-01-18 01:14:32 +00:00
John Molakvoæ
c352bb5416
Merge pull request #13650 from nextcloud/bugfix/noid/fix-colorizeSvg-with-transformations-containing-commas 
Fix colorizeSvg with transformations that contain a comma (,)
 2019-01-17 15:57:34 +01:00
Joas Schilling
adbeb42c2c
Fix colorizeSvg with transformations that contain a comma (,) 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-17 14:24:07 +01:00
Roeland Jago Douma
ecc37f5faf
Merge pull request #13407 from nextcloud/js-async-loading 
Plain javascript api to asynchronously load javascript or css files
 2019-01-17 14:05:31 +01:00
Jan-Christoph Borchardt
c42b72149c
Dark theme: Prevent slideshow icons from going dark 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-01-17 12:20:49 +01:00
Arthur Schiwon
4915d64de8
ignore non existing users when retrieving details of group members 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-01-17 11:59:15 +01:00
Jan-Christoph Borchardt
4c18cc34f3
Dark theme: Fix move/copy dialog icons 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-01-17 10:59:50 +01:00
Jan-Christoph Borchardt
e5922c6b8f
Dark theme: Fix search field 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-01-17 10:53:10 +01:00
Jan-Christoph Borchardt
092589f20c
Dark theme: Fix 'More apps' icon 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-01-17 10:52:44 +01:00
Jan-Christoph Borchardt
5e497edd74
Dark theme: Fix Contacts menu icons 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-01-17 10:44:13 +01:00
Julius Härtl
64b5c0c942
Bump bundled main.js 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-01-17 10:36:38 +01:00
Julius Härtl
a86ee002bc
Watch for changes with css variables polyfill 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-01-17 10:35:23 +01:00
Julius Härtl
a36604d2ec
Add public API for loading js files asynchronously 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-01-17 10:35:19 +01:00
Jan-Christoph Borchardt
a47784e8f6
Dark theme: Fix icons in 'More apps' menu 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-01-17 10:33:39 +01:00
Jan-Christoph Borchardt
f25fc2ea39
Dark theme: Fix app management icons and other elements 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-01-17 10:28:52 +01:00
Nextcloud bot
ac6ee0b8b7
[tx-robot] updated from transifex 2019-01-17 01:12:15 +00:00
Morris Jobke
cec72536de
Merge pull request #13511 from nextcloud/bugfix/noid/remove-orphan-event-and-contact-data 
Remove orphan event and contacts data
 2019-01-16 22:54:40 +01:00
Florian Schunk
332b4aee9d fix testing for undefined 
Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
 2019-01-16 22:54:16 +01:00
Florian Schunk
ecb936495f also remember folder for multiselect actions 
Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
 2019-01-16 22:54:16 +01:00
Florian Schunk
37270fc525 remember last copied to directory 
Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
 2019-01-16 22:54:16 +01:00
Florian Schunk
528964e0b7 copy Dialog starts in current directory 
Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
 2019-01-16 22:54:16 +01:00
blizzz
4e76b56497
Merge pull request #13634 from jospoortvliet/update-link 
update URL for federation
 2019-01-16 22:42:22 +01:00
Roeland Jago Douma
6e18a20c33
Merge pull request #13626 from nextcloud/fix/import_not_require_webpack_core 
Use import instead of require
 2019-01-16 20:02:48 +01:00
Roeland Jago Douma
d9b32726a0
Use import instead of require 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-16 17:03:40 +01:00
Jan-Christoph Borchardt
6bc8b78918
Fix federated cloud icon sizing and dark theme compatibility 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-01-16 16:56:36 +01:00
Morris Jobke
355d69e60e
Merge pull request #13574 from alion300/master 
Fix app navigation flickering on hover
 2019-01-16 16:30:07 +01:00
Jan-Christoph Borchardt
a081096d32
Fix password change toggle position and visibility in dark theme 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-01-16 14:49:03 +01:00
Jan-Christoph Borchardt
dd3ed98031
Dark theme: Fix select2 icons 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-01-16 14:34:19 +01:00
Thomas Citharel
3180ddd202
Handle moving calendar to an user who already has the share 
Extra:
    * Fix @ChristophWurst style remarks
    * Add a Note that share links have changed when calendars has user shares (see #13603)

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Fix forgotten test change

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-01-16 13:58:34 +01:00
Thomas Citharel
4864b1865b
Don't check group shares if shareWithGroupMembersOnly is false 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Remove the system user check

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-01-16 13:58:34 +01:00
Georg Ehrke
4a2238c75b
add list-calendars command 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>

Rebase and delete URI suggestion part

Invite to use occ dav:list-calendars instead

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Fix autoload

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Use injection & test everything

And rebase

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Add test for ListCalendars and refactoring

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Fix indentation

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-01-16 13:58:33 +01:00
Thomas Citharel
943d48cb3e
Add command to move a calendar from an user to another 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Add a basic check for displaynames in case we fail to get calendar from uri and put some sf console styles & refactor a bit

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

basic Tests

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

add forgotten createNamedParameter()

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-01-16 13:58:33 +01:00
Roeland Jago Douma
cff89c2a44
Merge pull request #13618 from nextcloud/enh/13608/move_bundlejs_towebpack 
Move from JSCombiner to webpack: merged-share-backend
 2019-01-16 12:21:04 +01:00
Roeland Jago Douma
dd48588862
Merge pull request #13462 from nextcloud/dependabot/npm_and_yarn/marked-0.6.0 
[Security] Bump marked from 0.3.6 to 0.6.0
 2019-01-16 11:50:40 +01:00
dependabot[bot]
ad620b5fa1
[Security] Bump marked from 0.3.6 to 0.6.0 
Bumps [marked](https://github.com/markedjs/marked) from 0.3.6 to 0.6.0. **This update includes security fixes.**
- [Release notes](https://github.com/markedjs/marked/releases)
- [Commits](https://github.com/markedjs/marked/compare/v0.3.6...v0.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-16 11:02:41 +01:00
Roeland Jago Douma
c77d7d6e79
Move merged-share-backend to webpack 
For #13608

Since we have webpack anyway it make sense to let webpack do the
bundling instead of ourselfs. This leads to minified code (so less
transfer). And the webserver can just handle the request.

As a bonus we get a map file so debugging is easier than with our
JSCombiner stuff.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-16 10:03:21 +01:00