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

47760 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nextcloud bot
f12b589d40
[tx-robot] updated from transifex 2019-01-19 01:12:22 +00: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
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
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
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