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

47740 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Morris Jobke
355d69e60e
Merge pull request #13574 from alion300/master 
Fix app navigation flickering on hover
 2019-01-16 16:30:07 +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
Roeland Jago Douma
b58f3e7583
Merge pull request #13481 from nextcloud/omit_fetching_state 
Provide initial state for backupcodes in template
 2019-01-16 08:52:58 +01:00
Nextcloud bot
e35a5ef387
[tx-robot] updated from transifex 2019-01-16 01:12:34 +00:00
Roeland Jago Douma
90f8687cdc
Bump dependencies 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-15 20:48:58 +01:00
Roeland Jago Douma
64435e574e
Update the git attributes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-15 20:45:42 +01:00
Roeland Jago Douma
6014aaec88
Bump dependencies 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-15 20:45:42 +01:00
Roeland Jago Douma
0971232050
Provide initial state for backupcodes in template 
This saves a direct request to the server when loading the backup codes.
There is no need for this as the data is already known.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-15 20:45:42 +01:00
Roeland Jago Douma
a32577d048
Merge pull request #13595 from nextcloud/enh/do_not_leak_user_existence 
Generic message on password reset
 2019-01-15 20:14:56 +01:00
Roeland Jago Douma
f42115d6bb
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-15 15:53:44 +01:00
Roeland Jago Douma
d0397f9b53
Generic message on password reset 
There is no need to inform the user if the account existed or not.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-15 15:53:43 +01:00
Roeland Jago Douma
53c077afc9
Merge pull request #13607 from nextcloud/fix/backgroundjob-int-id 
Fix integer background job id type error
 2019-01-15 15:31:24 +01:00
Christoph Wurst
d5927e4d01
Fix integer background job id type error 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-15 14:36:03 +01:00
Morris Jobke
99dea46e25
Merge pull request #13456 from nextcloud/dependabot/npm_and_yarn/clipboard-2.0.4 
Bump clipboard from 1.7.1 to 2.0.4
 2019-01-15 14:07:27 +01:00
dependabot[bot]
cdccf906bb
Bump clipboard from 1.7.1 to 2.0.4 
Bumps [clipboard](https://github.com/zenorocha/clipboard.js) from 1.7.1 to 2.0.4.
- [Release notes](https://github.com/zenorocha/clipboard.js/releases)
- [Commits](https://github.com/zenorocha/clipboard.js/compare/v1.7.1...v2.0.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-15 10:20:10 +01:00
Morris Jobke
271c6427f2
Merge pull request #13592 from nextcloud/3rdparty/pear/archive_tar-1.4.5 
[3rdparty] Bump pear/archive_tar to 1.4.5
 2019-01-15 10:10:39 +01:00
Roeland Jago Douma
5146b992c4
[3rdparty] Bump pear/archive_tar to 1.4.5 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-15 09:34:42 +01:00
Morris Jobke
6ac66ea0a3
Merge pull request #12173 from nextcloud/filename-center 
Ensure filename is possibly centered below file icons in grid view
 2019-01-15 08:47:46 +01:00
Nextcloud bot
56ad07b85e
[tx-robot] updated from transifex 2019-01-15 01:12:14 +00:00
Julius Härtl
e5c1049d04
Properly center text inside of the grid container 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-01-14 22:03:40 +01:00
Roeland Jago Douma
170995b213
Merge pull request #13586 from nextcloud/enh/2fa_backup_codes_improvements 
Some twofactor_backupcodes cleanup
 2019-01-14 21:07:35 +01:00
Jan-Christoph Borchardt
4d103f8b97
Ensure filename is possibly centered below file icons in grid view 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-01-14 20:19:10 +01:00
Roeland Jago Douma
da7dd24378
Switch to OCP background jobs 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-14 20:09:12 +01:00
Roeland Jago Douma
bbec0f0605
Merge pull request #13524 from nextcloud/dependabot/npm_and_yarn/build/karma-viewport-1.0.4 
Bump karma-viewport from 1.0.3 to 1.0.4 in /build
 2019-01-14 19:47:43 +01:00
Morris Jobke
8c23785c29
Merge pull request #13572 from nextcloud/3rdparty/symfony/process-4.2.2 
[3rdparty] Bump symfony/process to 4.2.2
 2019-01-14 16:24:10 +01:00
Morris Jobke
c3b22f05bb
Merge pull request #13468 from rummatee/issue13276 
don't close input stream when writing in encrypted file
 2019-01-14 16:21:08 +01:00
Roeland Jago Douma
49a4f2fd61
Switch to QBMapper 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-14 15:50:04 +01:00
Morris Jobke
86d30835af
Merge pull request #13581 from nextcloud/bugfix/13576/correctly-escape-html 
Correctly handle displaynames returned from the sharee API
 2019-01-14 15:18:47 +01:00
John Molakvoæ
36b8c9aaef
Merge pull request #13492 from nextcloud/refactor/es6-shim-babel-polyfill 
Use @babel/polyfill instead of es6-shim
 2019-01-14 14:59:59 +01:00
Morris Jobke
c6cf8715ac
Merge pull request #13573 from nextcloud/bugfix/noid/one-last-time 
Principals can be principal/user/<name> or principal/<name> from lega…
 2019-01-14 14:18:51 +01:00
Joas Schilling
86e6cebc18
Correctly handle displaynames returned from the sharee API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-14 14:09:12 +01:00
Morris Jobke
eeec3c7e86
Merge pull request #13566 from nextcloud/fix/13519/click-app-names 
Fix click app names
 2019-01-14 12:24:47 +01:00
Christoph Wurst
07760b83fc
Use @babel/polyfill instead of es6-shim 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-14 12:08:46 +01:00
Roeland Jago Douma
2e03cb01f0
Merge pull request #13539 from nextcloud/dependabot/npm_and_yarn/css-vars-ponyfill-1.16.2 
Bump css-vars-ponyfill from 1.7.2 to 1.16.2
 2019-01-14 11:55:24 +01:00
Alaa Shmalih
6ad1a8f132 the bug number #13263 fixed by the xavierando user 
i change the file by xaviterando done and fix
and i will do pull request to the solution becouse xavirando did pull request to him self
 2019-01-14 10:41:29 +00:00
dependabot[bot]
1269d1440b
Bump css-vars-ponyfill from 1.7.2 to 1.16.2 
Bumps [css-vars-ponyfill](https://github.com/jhildenbiddle/css-vars-ponyfill) from 1.7.2 to 1.16.2.
- [Release notes](https://github.com/jhildenbiddle/css-vars-ponyfill/releases)
- [Changelog](https://github.com/jhildenbiddle/css-vars-ponyfill/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jhildenbiddle/css-vars-ponyfill/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-14 11:28:26 +01:00
Morris Jobke
5a27e54f4b
Merge pull request #13032 from nextcloud/objectstore-write-exists 
upload new files in objectstore to a .part path first
 2019-01-14 11:26:29 +01:00
Roeland Jago Douma
8113dfd4e7
Merge pull request #13537 from nextcloud/dependabot/npm_and_yarn/css-loader-2.1.0 
Bump css-loader from 2.0.1 to 2.1.0
 2019-01-14 11:24:38 +01:00
Joas Schilling
4149d428d3
Principals can be principal/user/<name> or principal/<name> from legacy installs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-14 11:21:41 +01:00
Roeland Jago Douma
27737ecc9f
Merge pull request #13571 from nextcloud/fix/select2-package-json-duplication 
Fix duplicate select2 dep in package.json
 2019-01-14 11:11:02 +01:00
Roeland Jago Douma
4269dd3c9a
[3rdparty] Bump symfony/process to 4.2.2 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-14 10:59:23 +01:00
dependabot[bot]
9345aff957
Bump css-loader from 2.0.1 to 2.1.0 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 2.0.1 to 2.1.0.
- [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/v2.0.1...v2.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-14 10:31:16 +01:00
Roeland Jago Douma
9adaa299a5
Merge pull request #13518 from nextcloud/enhancement/handlebars-runtime 
Bundle only the Handlebars runtime
 2019-01-14 10:29:34 +01:00
Morris Jobke
6a0e8a739d
Merge pull request #13512 from nextcloud/3rdpart/symfony/routing-4.2.2 
[3rdparty] Bump symfony/routing to 4.2.2
 2019-01-14 09:53:41 +01:00