nextcloud
/
server
mirror of https://github.com/nextcloud/server
0
0
Fork 0
Code Issues Releases Wiki Activity
74,135 Commits 372 Branches 984 Tags 3.4 GiB
Commit Graph

25 Commits

Author SHA1 Message Date
Robin Windey dfa8a8c946
Configure line ending to let shell scripts work in Windows ENV 
Signed-off-by: GitHub <noreply@github.com>
 2023-03-31 13:53:06 +00:00
Christopher Ng 045bc32b1d Mark compiled CSS as binary 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2023-01-25 18:29:11 -08:00
Christoph Wurst 5ae8f6326c
Do not auto merge package-lock.json, but treat as text file 
If package-lock is specified to be a binary file, it becomes impossible
to diff any changes. Since we only want to prevent git from merging
changes in the lockfile, we can be more specific and tell it that binary
handling is only required as merge strategy.

[skip ci]

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2022-11-17 12:32:03 +01:00
Louis Chemineau bca3ef60a3 Move jsunit dependencies to main package.json 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-01-18 11:29:51 +01:00
Louis Chemineau 3996256562 Set package-lock.json as binaries 
+ Remove build/package-lock.json from .gitignore

Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-01-17 10:47:31 +01:00
Louis Chemineau d5e4557859 Update .gitattribute file 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-01-13 15:15:39 +01:00
Christoph Wurst e23a38e486
Prevent duplicate CalDAV availability slots for recurring slots 
If there is the same time slot for more than one day, then we wrote two
recurring AVAILABILITY components before. With this patch equal blocks
are combined into one recurring component. This makes the generated
rules more compact and easier to work with.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-10-20 12:15:56 +02:00
Joas Schilling 94353362d7
Mark all compiled JS as binary 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-10-02 12:21:05 +02:00
Julius Härtl 5099a4fe74
Add binary attributes for dashboard bundles 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-08-05 17:01:29 +02:00
Roeland Jago Douma 5274c54268
Add a transfer ownership background job 
This job can be initiated by a user to transfer a file/folder to a
target user.

The target user will have to accept the job.
Once that is done the transfers is initiated in the background.

Both parties get notified when the job is done.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-02 15:28:47 +01:00
Christoph Wurst de6940352a Move settings to an app 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-09-28 09:39:28 +00:00
Arthur Schiwon e5fefd1338
webpackify workflowengine 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-05-09 18:42:52 +02:00
Julius Härtl ec63d4ba29
Adjust gitattributes to ignore all files_sharing scripts in diff 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-19 13:06:55 +01:00
Roeland Jago Douma 41ef3d860c
Move comments to webpack 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-26 09:10:23 +01:00
Roeland Jago Douma 0a4569dff7
Move files_sharing additionalscripts over to webpack 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-15 12:33:04 +01:00
Roeland Jago Douma 0357a30a58
Move systemtags to common webpack 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-14 12:17:57 +01:00
Christoph Wurst 280b50aa68
Adjust Apps and User settings to new Vue components 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-02-14 09:48:13 +01:00
Roeland Jago Douma 7f88654147
Move of files_versions to webpack 
* Move CSS into bundle
* Old merged.json no longer needed!
* No need to load the style still

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-13 22:20:07 +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 e7019a0448
Bump other deps as well and rebuild assets 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-13 13:17:07 +01:00
Roeland Jago Douma 2a456b18be
Recompile assets 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-13 09:47:24 +01:00
Roeland Jago Douma a7f029b35e
Compile assets 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-13 07:58:00 +01:00
Roeland Jago Douma 1447b3ba02
Bump js deps of settings 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-12 14:04:34 +01:00
Roeland Jago Douma ea2831c785
Bump oauth2 js deps 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-12 13:20:24 +01:00
Christoph Wurst 208788173d
Npmize (vendor) scripts 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-09 15:01:59 +01:00