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

52199 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
52e4ecd66e
Merge pull request #18644 from nextcloud/harden/csrf_endpoint 
Only allow requesting new CSRF tokens if it passes the SameSite Cooki…
 2020-01-07 13:43:46 +01:00
Maxence Lange
fc54df81d0 remove non-circles-generated shares only 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2020-01-07 09:40:41 -01:00
Roeland Jago Douma
33039a4c97
Merge pull request #18701 from nextcloud/fix/18632/show_info_when_no_others_with_access_found 
Show message if no other users with access are found
 2020-01-07 10:27:26 +01:00
blizzz
55fd157f15
Merge pull request #18535 from nextcloud/enh/flow/newDispatcher 
Use the new Events in Flow
 2020-01-07 09:58:40 +01:00
Roeland Jago Douma
fbed6a3416
A pending shares overview 
Now that we accept shares we should show an overview of shares that are
pending. This first part is the small API to get a list of the currently
pending shares.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-07 08:53:33 +01:00
Nextcloud bot
1b8f816170
[tx-robot] updated from transifex 2020-01-07 02:28:34 +00:00
Roeland Jago Douma
1fc39196bf
Show message if no other users with access are found 
Fixes #18632
Show a small subtitle if no other users with access are found.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-06 21:45:38 +01:00
Roeland Jago Douma
4c841559e1
Merge pull request #18692 from nextcloud/wiswedel/wording/login 
fix wording log in vs. login
 2020-01-06 20:02:52 +01:00
Roeland Jago Douma
7dfdf2c0a9
Merge pull request #18696 from nextcloud/fix/18380/auto_accept_on_mail_open 
Accept shares when you open mail
 2020-01-06 20:02:20 +01:00
Roeland Jago Douma
fb6b84b5c9
Accept shares when you open mail 
Fixes #18380

When you open a direct share to yourself. We should autoaccept the
share.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-06 16:48:21 +01:00
Sascha Wiswedel
e24c7a8900
fix wording log in vs. login 
"log in" is used as verb, while "login" is a noun.
In this case, what's supposed to be cancelled is the login process - therefore the noun must be used.

Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2020-01-06 14:44:31 +01:00
John Molakvoæ
e5d3efb99e
fix overlapping (#18473) 
fix overlapping
 2020-01-06 13:55:29 +01:00
Roeland Jago Douma
ad699682cb
Merge pull request #18672 from nextcloud/fix/17799/if_disabled_dont_show_link_shares 
Don't show link shares in sidebar if disabled
 2020-01-06 12:53:48 +01:00
Roeland Jago Douma
d4ce8c9427
Don't show link shares in sidebar if disabled 
Fixes #17799

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-06 12:23:06 +01:00
Roeland Jago Douma
d4d44c8fa1
Merge pull request #18675 from nextcloud/fix/17774/no_email_suggestions_when_linkshare_disabled 
Do not show e-mail suggestions if link shares are disabled
 2020-01-06 12:15:50 +01:00
Roeland Jago Douma
9a8b361911
Do not show e-mail suggestions if link shares are disabled 
For #17774

This removes the e-mail suggestions from the share input if link shares
are disabled. As e-mail shares use just link shares.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-06 10:22:22 +01:00
Roeland Jago Douma
a7b3ed32ad
Merge pull request #18687 from nextcloud/td/phpunit8/loggerTest 
Fix the LoggerTests for phpunit
 2020-01-06 10:20:01 +01:00
John Molakvoæ
0e3392665f
[#18645] Have custom login images cover the whole page (#18660) 
[#18645] Have custom login images cover the whole page
 2020-01-06 10:19:19 +01:00
Roeland Jago Douma
a673c597ed
Fix the LoggerTests for phpunit 
Less deprecation warnings. YAY.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-06 09:06:52 +01:00
Roeland Jago Douma
03cdff0da4
Merge pull request #18674 from nextcloud/enh/no_global_GET 
Do not use $_GET
 2020-01-06 08:06:27 +01:00
Nextcloud bot
32f79c9f0c
[tx-robot] updated from transifex 2020-01-06 02:27:21 +00:00
Roeland Jago Douma
1672ff3bef
Do not use $_GET 
The appframework is more than capable of handling this properly.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-05 20:13:11 +01:00
Roeland Jago Douma
e170fa7478
Merge pull request #18669 from nextcloud/dependabot/npm_and_yarn/css-loader-3.4.1 
Bump css-loader from 3.4.0 to 3.4.1
 2020-01-05 19:12:10 +01:00
dependabot-preview[bot]
c282435c42
Bump css-loader from 3.4.0 to 3.4.1 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.4.0 to 3.4.1.
- [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/v3.4.0...v3.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-05 14:52:35 +01:00
Roeland Jago Douma
d7fdab0c01
Merge pull request #18641 from HarHarLinks/patch-1 
Fix typo in occ
 2020-01-05 13:48:13 +01:00
Roeland Jago Douma
9b7c8cac37
Merge pull request #18668 from nextcloud/dependabot/npm_and_yarn/p-limit-2.2.2 
Bump p-limit from 2.2.1 to 2.2.2
 2020-01-05 13:39:58 +01:00
Roeland Jago Douma
290bf859db
Merge pull request #18667 from nextcloud/dependabot/npm_and_yarn/eslint-config-nextcloud-0.1.1 
Bump eslint-config-nextcloud from 0.1.0 to 0.1.1
 2020-01-05 13:39:30 +01:00
Roeland Jago Douma
8ab60a0b3f
Merge pull request #18665 from nextcloud/dependabot/npm_and_yarn/toastify-js-1.6.2 
Bump toastify-js from 1.6.1 to 1.6.2
 2020-01-05 13:38:41 +01:00
dependabot-preview[bot]
d27d48213e
Bump toastify-js from 1.6.1 to 1.6.2 
Bumps [toastify-js](https://github.com/apvarun/toastify-js) from 1.6.1 to 1.6.2.
- [Release notes](https://github.com/apvarun/toastify-js/releases)
- [Changelog](https://github.com/apvarun/toastify-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apvarun/toastify-js/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-05 13:08:59 +01:00
Nextcloud bot
46706d01e0
[tx-robot] updated from transifex 2020-01-05 02:30:34 +00:00
dependabot-preview[bot]
3eb1760930
Bump p-limit from 2.2.1 to 2.2.2 
Bumps [p-limit](https://github.com/sindresorhus/p-limit) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/sindresorhus/p-limit/releases)
- [Commits](https://github.com/sindresorhus/p-limit/compare/v2.2.1...v2.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-05 02:16:56 +00:00
dependabot-preview[bot]
38d1ed8640
Bump eslint-config-nextcloud from 0.1.0 to 0.1.1 
Bumps [eslint-config-nextcloud](https://github.com/nextcloud/eslint-config-nextcloud) from 0.1.0 to 0.1.1.
- [Release notes](https://github.com/nextcloud/eslint-config-nextcloud/releases)
- [Commits](https://github.com/nextcloud/eslint-config-nextcloud/compare/v0.1.0...v0.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-05 02:16:05 +00:00
Marius David Wieschollek
eec921ca78
[#18645] Have custom login images cover the whole page 
Signed-off-by: Marius David Wieschollek <git.public@mdns.eu>
 2020-01-05 00:14:28 +01:00
Nextcloud bot
797b603a1f
[tx-robot] updated from transifex 2020-01-04 02:27:44 +00:00
Kim Brose
9c5fe8fca4
Fix CI 
Signed-off-by: Kim Brose <kim.brose@rwth-aachen.de>
 2020-01-03 18:06:59 +01:00
Roeland Jago Douma
da81b71f93
Only allow requesting new CSRF tokens if it passes the SameSite Cookie test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-03 13:12:03 +01:00
Roeland Jago Douma
7976cb7e94
Merge pull request #18642 from nextcloud/design/settings-section 
Settings: More spacing for development notice
 2020-01-03 12:24:56 +01:00
Jan-Christoph Borchardt
d9fea183d6
Settings: More spacing for development notice 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2020-01-03 16:04:52 +07:00
Kim Brose
04aa4cf339
Fix typo in occ 
Signed-off-by: Kim Brose <kim.brose@rwth-aachen.de>
 2020-01-03 04:17:11 +01:00
Nextcloud bot
7ad3c2f228
[tx-robot] updated from transifex 2020-01-03 02:27:41 +00:00
Roeland Jago Douma
c1a012ba6f
Merge pull request #18578 from nextcloud/version/18/rc1 
18 RC 1
 2020-01-02 20:31:29 +01:00
Roeland Jago Douma
e2593bf3f3
Bump ca-bundle 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-02 20:01:14 +01:00
Roeland Jago Douma
91397d56ef
18 RC 1 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-02 19:34:04 +01:00
Roeland Jago Douma
25d4f3230d
Use the new Events in Flow 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-02 16:40:49 +01:00
Roeland Jago Douma
c347b7cc14
Merge pull request #18583 from nextcloud/enh/18579/chrome-regex-brave-vivaldi-opera 
Modify regex to match some other chromium browsers
 2020-01-02 16:16:50 +01:00
Roeland Jago Douma
dbbe687456
Merge pull request #18612 from nextcloud/bugfix/flow-style 
Workflow validity checks
 2020-01-02 15:05:23 +01:00
John Molakvoæ
a08e69a005
confirm resharing rights if viewer is current owner (#18630) 
confirm resharing rights if viewer is current owner
 2020-01-02 14:11:34 +01:00
Maxence Lange
441b81a3af confirm resharing rights if viewer is current owner 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2020-01-02 11:34:20 -01:00
Roeland Jago Douma
768de086ea
Merge pull request #18598 from nextcloud/dependabot/npm_and_yarn/nextcloud/logger-1.0.0 
Bump @nextcloud/logger from 0.1.0 to 1.0.0
 2020-01-02 11:16:40 +01:00
Julius Härtl
492ca95f23
Bump bundles 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-01-02 11:16:36 +01:00