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

51209 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
b7803665c1
Merge pull request #17429 from nextcloud/db/add-index-on-calendar-object-props-calendar-id 
Add index on calendarid for calendarobject_props table
 2019-10-08 10:09:48 +02:00
Roeland Jago Douma
093b25bfe1
Merge pull request #17454 from nextcloud/ci/kill/ui-regression 
Kill ui-regression ci job
 2019-10-08 09:35:13 +02:00
Roeland Jago Douma
075a0b24d5
Merge pull request #17431 from johkoenig/bugfix/17377/trusted_domain_helper_case_insensitive 
make TrustedDomainHelper case insensitive
 2019-10-08 08:51:11 +02:00
Roeland Jago Douma
d9b87123a2
Kill ui-regression ci job 
Since we do not use it at the moment anyway it seems like a waste of
resources to actually run it.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-08 08:49:55 +02:00
Roeland Jago Douma
f2d44b87bb
Merge pull request #17440 from nextcloud/enh/noid/log-json-escape 
Do not escape slashes in log json
 2019-10-08 08:48:52 +02:00
John Molakvoæ
76bdced6e3
Remove duplicate code (#17451) 
Remove duplicate code
 2019-10-08 08:21:30 +02:00
Roeland Jago Douma
e4948f5d86
Merge pull request #17414 from gary-kim/enh/15155/delete-icon-in-trashbin 
Show Delete Icon in Breadcrumb in Trashbin
 2019-10-08 08:08:02 +02:00
Nextcloud bot
85dbde060d
[tx-robot] updated from transifex 2019-10-08 02:15:01 +00:00
Daniel Kesselberg
fdf4e1ebb2
Remove duplicate code 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-10-08 00:46:50 +02:00
Thomas Citharel
90e5850cc4
Add index on calendarid for calendarobject_props table 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-07 22:03:15 +02:00
Roeland Jago Douma
bea5bbde31
Merge pull request #17449 from nextcloud/fix/joas-should-know-you-have-to-increaste-the-server-version-for-new-migrations 
Increase server version to trigger latest migration
 2019-10-07 19:46:31 +02:00
John Molakvoæ
f8d1990eb8
Do not follow symlinks with webpack (#17448) 
Do not follow symlinks with webpack
 2019-10-07 18:26:35 +02:00
Christoph Wurst
79db678075
Increase server version to trigger all migrations 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-10-07 16:37:15 +02:00
John Molakvoæ (skjnldsv)
8d87312d9a
Do not follow symlinks with webpack 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-07 16:28:10 +02:00
Julius Härtl
29a6f2d830
Do not escape slashes in log json 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-10-07 13:39:40 +02:00
Gary Kim
11d01319c6
Show Delete Icon in Breadcrumb in Trashbin 
Signed-off-by: Gary Kim <gary@garykim.dev>
 2019-10-07 19:35:23 +08:00
Roeland Jago Douma
a02a626606
Merge pull request #17411 from kinolaev/fix-oauth2-redirect 
Fix oauth client redirect
 2019-10-07 12:03:52 +02:00
Nextcloud bot
049628a3f5
[tx-robot] updated from transifex 2019-10-07 02:14:42 +00:00
Johannes Koenig
2df8d646c1 make TrustedDomainHelper case insensitive 
Signed-off-by: Johannes Koenig <mail@jokoenig.de>
 2019-10-06 20:43:55 +02:00
Roeland Jago Douma
1843ff60fd
Merge pull request #17421 from nextcloud/dependabot/npm_and_yarn/build/handlebars-4.4.2 
Bump handlebars from 4.4.0 to 4.4.2 in /build
 2019-10-06 12:42:28 +02:00
John Molakvoæ
9939005853
Use @nextcloud/paths and deprecate OC helpers (#17392) 
Use @nextcloud/paths and deprecate OC helpers
 2019-10-06 10:01:45 +02:00
Nextcloud bot
e20dbc04ba
[tx-robot] updated from transifex 2019-10-06 02:15:13 +00:00
dependabot-preview[bot]
a0acb4b5d5
Bump handlebars from 4.4.0 to 4.4.2 in /build 
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.4.0 to 4.4.2.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/v4.4.2/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.4.0...v4.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-06 01:13:11 +00:00
Christoph Wurst
a27a4f757d
Use @nextcloud/paths and deprecate OC helpers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-10-05 23:44:20 +02:00
John Molakvoæ
5c21d11207
Fix Axios CSRF token update (#17404) 
Fix Axios CSRF token update
 2019-10-05 23:37:10 +02:00
Christoph Wurst
81613d2246
Switch to @nextcloud/axios for the CSRF update fix 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-10-05 19:06:00 +02:00
John Molakvoæ
62399c76e8
Allow group displaynames in the database backend (#17221) 
Allow group displaynames in the database backend
 2019-10-05 18:34:14 +02:00
Roeland Jago Douma
637c50e647
Merge pull request #17387 from nextcloud/fix/remove/federated_share 
Allow removing federated shares of locally reshared files
 2019-10-05 15:18:37 +02:00
Roeland Jago Douma
a32c9cc260
Merge pull request #17370 from nextcloud/jospoortvliet-patch-1 
Update README.md
 2019-10-05 15:16:32 +02:00
Jos Poortvliet
355f479a07
Update README.md 
some minor readme updates
 2019-10-05 15:16:17 +02:00
John Molakvoæ
37dbe821e3
Fix updating and deleting authtokens (#17397) 
Fix updating and deleting authtokens
 2019-10-05 12:34:57 +02:00
John Molakvoæ
79c59fb2b9
allow trash backends to overwrite the tooltip for trash items (#17374) 
allow trash backends to overwrite the tooltip for trash items
 2019-10-05 11:17:07 +02:00
Sergej Nikolaev
9aa992e60b
fix updating and deleting authtokens 
Signed-off-by: Sergej Nikolaev <kinolaev@gmail.com>
 2019-10-05 10:28:47 +02:00
Christoph Wurst
8c023eeabd
Emit an event when the CSRF token changes 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-10-05 10:25:45 +02:00
John Molakvoæ
87ad219daf
Merge pull request #17405 from nextcloud/enh/switch/escapeHTML 
Move to escape-html
 2019-10-05 10:25:12 +02:00
Robin Appelman
ce433637da
allow trash backends to overwrite the tooltip for trash items 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-10-05 10:23:30 +02:00
Nextcloud bot
e9cef938ea
[tx-robot] updated from transifex 2019-10-05 02:15:04 +00:00
John Molakvoæ
2169c26195
Fix shares read permissions (#16761) 
Fix shares read permissions
 2019-10-04 22:54:04 +02:00
John Molakvoæ (skjnldsv)
ff895abac0
Fix shares read permissions 
A user with reshare permissions on a file is now able to get any share
of that file (just like the owner).

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 21:40:30 +02:00
Sergej Nikolaev
1b5d85a4ca fix oauth client redirect 
Signed-off-by: Sergej Nikolaev <kinolaev@gmail.com>
 2019-10-04 21:09:13 +03:00
Roeland Jago Douma
32587d7007
Remove the tests since the library is tested 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-04 19:32:12 +02:00
John Molakvoæ (skjnldsv)
b1069b29fa
Add checks for whether a user with access to a share can delete it 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 19:25:11 +02:00
John Molakvoæ (skjnldsv)
f02cff1304
Extract check for whether a user with access to a share can edit it 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 19:25:11 +02:00
Daniel Calviño Sánchez
6d4f4c1c70
Add assorted integration tests for shares 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-10-04 19:25:11 +02:00
Daniel Calviño Sánchez
a7526d74ae
Do not expect a 200 HTTP status code when updating a share 
This will be needed to test scenarios in which updating a share return a
different HTTP status code, like 401.

The assertion for the 200 HTTP status code was added in those scenarios
that tested updating a share (that is, those that were also checking the
OCS status code), but not in those in which updating a share was just a
preparatory step for the actual test (in the same way that the HTTP
status code is not checked in those tests when creating a share).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-10-04 19:25:10 +02:00
John Molakvoæ (skjnldsv)
99404bdfb3
Move sharing integration tests to their own directory 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 19:25:10 +02:00
John Molakvoæ (skjnldsv)
ba1ba1a55e
Add helper script to run integration tests on a Docker container 
Copied and adjusted from "tests/integration/run-docker.sh" in Talk; see
its commit history for further reference.

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 19:25:10 +02:00
Roeland Jago Douma
6c489a6d40
Move to escape-html 
* If there is a package that does exactly the same then lets us use that
* Import it properly in the internals (less deprecation warnings)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-04 13:23:32 +02:00
Roeland Jago Douma
2507f26428
Merge pull request #17357 from nextcloud/enh/oauth/no_oc_binding 
Import router in oauth js
 2019-10-04 11:33:40 +02:00
Roeland Jago Douma
7b729c581d
Merge pull request #17359 from nextcloud/bugfix/noid/dont-call-basename-on-null 
Don't call basename on null
 2019-10-04 11:29:14 +02:00