upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 10:10:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 20
46655 commits 1040 branches 1221 tags 8.4 GiB
Commit graph

19239 commits

Author SHA1 Message Date
John Molakvoæ (skjnldsv)
b6d8c5ff2f
Add check for vCard uid 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-05 12:49:39 +01:00
Morris Jobke
cba3883410
Merge pull request #12185 from nextcloud/cleanup/dicontainer 
Cleanup the DIContainer
 2018-11-05 12:16:36 +01:00
John Molakvoæ
934d08b2e8
Merge pull request #12004 from nextcloud/dl-vcf-groups-plugin 
Multi vcf download plugin
 2018-11-05 10:16:30 +01:00
Roeland Jago Douma
765c576029
Merge pull request #12262 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.24.0 
Bump webpack from 4.23.1 to 4.24.0 in /apps/accessibility
 2018-11-05 09:28:38 +01:00
Roeland Jago Douma
d4b6a8739a
Merge pull request #12261 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/css-loader-1.0.1 
Bump css-loader from 1.0.0 to 1.0.1 in /apps/accessibility
 2018-11-05 09:24:44 +01:00
dependabot[bot]
f749ab0da8
Bump webpack from 4.23.1 to 4.24.0 in /apps/accessibility 
Bumps [webpack](https://github.com/webpack/webpack) from 4.23.1 to 4.24.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.23.1...v4.24.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-05 08:09:33 +00:00
Roeland Jago Douma
dcddccb004
Merge pull request #12265 from nextcloud/dav-bump 
bump dav version for migration
 2018-11-05 09:05:32 +01:00
John Molakvoæ
f85215e41c
Merge pull request #12244 from nextcloud/fix/3752/twofactorbutton-attempt2 
make twofactor .button inline-block
 2018-11-05 08:52:29 +01:00
Roeland Jago Douma
2528dc751a
Merge pull request #12252 from nextcloud/theming-advanced-h3 
Change "Advanced options" to h3
 2018-11-05 08:28:12 +01:00
Roeland Jago Douma
30b54cf287
Merge pull request #12263 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.24.0 
Bump webpack from 4.23.1 to 4.24.0 in /apps/oauth2
 2018-11-05 08:26:21 +01:00
Roeland Jago Douma
32f9a32352
Merge pull request #12264 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/css-loader-1.0.1 
Bump css-loader from 1.0.0 to 1.0.1 in /apps/oauth2
 2018-11-05 08:25:15 +01:00
Roeland Jago Douma
c3a877f7e9
Rebuild assets 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-05 08:22:10 +01:00
Roeland Jago Douma
4fa8dfb153
Merge pull request #12254 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/css-loader-1.0.1 
Bump css-loader from 1.0.0 to 1.0.1 in /apps/updatenotification
 2018-11-05 08:19:44 +01:00
Roeland Jago Douma
e81e11db46
Merge pull request #12255 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.24.0 
Bump webpack from 4.23.1 to 4.24.0 in /apps/updatenotification
 2018-11-05 08:18:57 +01:00
John Molakvoæ (skjnldsv)
a6c8fe099d
bump dav version for migration 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-05 08:11:31 +01:00
Roeland Jago Douma
4be625b128
Merge pull request #12231 from nextcloud/bugfix/10934/setmodel_before_render 
Set the filemodel before rending the detailsview
 2018-11-05 08:07:49 +01:00
dependabot[bot]
ead6ce8e97
Bump css-loader from 1.0.0 to 1.0.1 in /apps/oauth2 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 1.0.0 to 1.0.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/v1.0.0...v1.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-05 01:20:03 +00:00
dependabot[bot]
436ee94fe6
Bump webpack from 4.23.1 to 4.24.0 in /apps/oauth2 
Bumps [webpack](https://github.com/webpack/webpack) from 4.23.1 to 4.24.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.23.1...v4.24.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-05 01:19:45 +00:00
dependabot[bot]
834c7fef0f
Bump css-loader from 1.0.0 to 1.0.1 in /apps/accessibility 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 1.0.0 to 1.0.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/v1.0.0...v1.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-05 01:18:53 +00:00
dependabot[bot]
e81ff4ebcb
Bump webpack from 4.23.1 to 4.24.0 in /apps/updatenotification 
Bumps [webpack](https://github.com/webpack/webpack) from 4.23.1 to 4.24.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.23.1...v4.24.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-05 01:13:08 +00:00
dependabot[bot]
39b111d58d
Bump css-loader from 1.0.0 to 1.0.1 in /apps/updatenotification 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 1.0.0 to 1.0.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/v1.0.0...v1.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-05 01:12:42 +00:00
Nextcloud bot
c28ea52155
[tx-robot] updated from transifex 2018-11-05 01:12:32 +00:00
Marius Blüm
9340a6a0e4
Change "Advanced options" to h3 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2018-11-04 23:52:22 +01:00
Roeland Jago Douma
72b7c9ffa0
Merge pull request #12105 from nextcloud/using-resharing-right-to-display-shares 
Shares are displayed to users with resharing rights
 2018-11-04 21:08:11 +01:00
John Molakvoæ (skjnldsv)
60d8b56856
Added multi-get vcf download plugin 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-04 20:01:49 +01:00
Roeland Jago Douma
ab8c2b0719
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-04 13:55:49 +01:00
Roeland Jago Douma
5d3051ff62
Do not log FileLock as exception 
There is no reason to log FileLock errors as exceptions to the log file.
Locks happen for very legit reasons and it is actually a sign of the
code doing its job.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-04 13:55:49 +01:00
Jonas Sulzer
afd39c27af
make twofactor .button inlin-block 
fixes #3752

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
 2018-11-04 04:01:40 +01:00
Nextcloud bot
9d7f02ec47
[tx-robot] updated from transifex 2018-11-04 01:14:02 +00:00
Nextcloud bot
f196394c44
[tx-robot] updated from transifex 2018-11-03 01:12:38 +00:00
Roeland Jago Douma
b1fd72c1cf
Set the filemodel before rending the detailsview 
fixes #10934

Else it triggers the rendering two times. Resulting is weird state in
for example the comments. Because the comments for OLD_FILEID are
retrieved but then the model is changed to NEW_FILEID. But the old
comments still get in and get parsed.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 22:45:25 +01:00
Roeland Jago Douma
9d89f8bbac
Merge pull request #12071 from nextcloud/addressbook-uid-check-migration 
Addressbook uid check migration
 2018-11-02 19:37:48 +01:00
Roeland Jago Douma
c8cf986527
Fix files_sharing 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 19:20:37 +01:00
Roeland Jago Douma
2452a3ec73
Properly query the methodreflector 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 19:20:37 +01:00
Roeland Jago Douma
30a1237f81
Merge pull request #11875 from nextcloud/add-support-for-sending-the-password-for-a-link-share-by-nextcloud-talk 
Add support for sending the password for a link share by Nextcloud Talk
 2018-11-02 14:54:46 +01:00
John Molakvoæ (skjnldsv)
66624cfe0a
Phpunit fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-02 14:20:53 +01:00
Morris Jobke
f5728f2c14
Merge pull request #12190 from forsd/AddtestFiles_Trashbin 
Add test OCA\Files_Trashbin\Capabilities
 2018-11-02 14:01:25 +01:00
Roeland Jago Douma
7ba8700ba1
Merge pull request #12148 from nextcloud/suppress-wrong-audit-log-message 
suppress wrong audit log messages about failed login attempts
 2018-11-02 13:52:50 +01:00
Julius Härtl
166907afef
Merge pull request #12182 from nextcloud/3rdparty/sabre-3.2.3 
[3rdparty] Bump sabre/dav to 3.2.3
 2018-11-02 13:09:46 +01:00
Maxence Lange
77b95ccd12
revert tests 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:10:49 +01:00
Maxence Lange
0fc8a0f58e
user can have his resharing rights revoked, yet seeing created shares 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:10:49 +01:00
Maxence Lange
236a293f6a
check parents resharing rights 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:10:48 +01:00
Maxence Lange
275cea5d9c
limit to circles moderator 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:09:28 +01:00
Maxence Lange
72ad2d60b5
display shares to circles moderator 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:09:28 +01:00
Maxence Lange
68c44bb642
shares are displayed to users with resharing rights 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:09:26 +01:00
Nextcloud bot
3b5e031e6b
[tx-robot] updated from transifex 2018-11-02 01:13:34 +00:00
Daniel Calviño Sánchez
adf80aa8b3 Add sending the password by Talk for a link share to ShareAPIController 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-02 01:57:48 +01:00
Daniel Calviño Sánchez
52cada951b Check "note", "label" and "hide download" too in update share tests 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-02 01:56:07 +01:00
Morris Jobke
f28691c26e
Merge pull request #11844 from nextcloud/multiple-link-shares 
allow to create multiple link shares via share api
 2018-11-01 22:36:09 +01:00
Jan-Christoph Borchardt
9dea41f8fe Fix wording, sort 'Add another link' to bottom so it does not confuse 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-11-01 21:33:10 +01:00