summaryrefslogtreecommitdiffstats
path: root/.gitattributes
Commit message (Collapse)AuthorAgeFilesLines
* Mark compiled CSS as binaryChristopher Ng2023-01-251-0/+1
| | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
* Do not auto merge package-lock.json, but treat as text fileChristoph Wurst2022-11-171-1/+1
| | | | | | | | | | | 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>
* Move jsunit dependencies to main package.jsonLouis Chemineau2022-01-181-2/+1
| | | | Signed-off-by: Louis Chemineau <louis@chmn.me>
* Set package-lock.json as binariesLouis Chemineau2022-01-171-1/+2
| | | | | | + Remove build/package-lock.json from .gitignore Signed-off-by: Louis Chemineau <louis@chmn.me>
* Update .gitattribute fileLouis Chemineau2022-01-131-34/+2
| | | | Signed-off-by: Louis Chemineau <louis@chmn.me>
* Prevent duplicate CalDAV availability slots for recurring slotsChristoph Wurst2021-10-201-0/+2
| | | | | | | | | 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>
* Mark all compiled JS as binaryJoas Schilling2020-10-021-6/+12
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Add binary attributes for dashboard bundlesJulius Härtl2020-08-051-0/+2
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Add a transfer ownership background jobRoeland Jago Douma2019-12-021-0/+2
| | | | | | | | | | | | 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>
* Move settings to an appChristoph Wurst2019-09-281-2/+1
| | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* webpackify workflowengineArthur Schiwon2019-05-091-0/+2
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Adjust gitattributes to ignore all files_sharing scripts in diffJulius Härtl2019-03-191-2/+2
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Move comments to webpackRoeland Jago Douma2019-02-261-0/+2
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Move files_sharing additionalscripts over to webpackRoeland Jago Douma2019-02-151-0/+2
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Move systemtags to common webpackRoeland Jago Douma2019-02-141-0/+2
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Adjust Apps and User settings to new Vue componentsChristoph Wurst2019-02-141-6/+1
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Move of files_versions to webpackRoeland Jago Douma2019-02-131-0/+2
| | | | | | | | * 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>
* Update the git attributesRoeland Jago Douma2019-01-151-1/+2
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Bump other deps as well and rebuild assetsRoeland Jago Douma2019-01-131-0/+2
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Recompile assetsRoeland Jago Douma2019-01-131-8/+11
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Compile assetsRoeland Jago Douma2019-01-131-4/+6
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Bump js deps of settingsRoeland Jago Douma2019-01-121-0/+5
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Bump oauth2 js depsRoeland Jago Douma2019-01-121-0/+3
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Npmize (vendor) scriptsChristoph Wurst2019-01-091-0/+2
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 00:20:50 +0000