From e49dcd665911ddad7b41c8b8cec7ab0967ba0629 Mon Sep 17 00:00:00 2001 From: mathilde-cryptpad <156299270+mathilde-cryptpad@users.noreply.github.com> Date: Mon, 18 Mar 2024 11:19:29 +0100 Subject: [PATCH 1/7] implement a more complete .gitignore file --- .gitignore | 267 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 243 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index d5767ab7e..1ce6fe769 100644 --- a/.gitignore +++ b/.gitignore @@ -2,31 +2,250 @@ # # SPDX-License-Identifier: AGPL-3.0-or-later -datastore -tasks -www/components/* -www/bower_components/* -www/accounts -node_modules -/config.js -customization -.*.swp -*.db -/customize/ -customize -messages.log -.DS_Store -www/scratch -data -npm-debug.log -pins/ -blob/ -block/ -blobstage/ -block/ -logs/ -privileged.conf +# ----> SOURCE CODE +# ---> CryptPad +blob config/config.js config/sso.js +customize +data +datastore +www/components/* lib/plugins/* !lib/plugins/README.md + +# ---> Node +# Logs +logs +*.log +npm-debug.log* + +# Diagnostic reports (https://nodejs.org/api/report.html) +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Dependency directories +node_modules/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# dotenv environment variable files +.env +.env.development.local +.env.test.local +.env.production.local +.env.local + +# Stores VSCode versions used for testing VSCode extensions +.vscode-test + +# ----> EDITORS +# ---> Vim +# Swap +[._]*.s[a-v][a-z] +!*.svg # comment out if you don't need vector files +[._]*.sw[a-p] +[._]s[a-rt-v][a-z] +[._]ss[a-gi-z] +[._]sw[a-p] + +# Session +Session.vim +Sessionx.vim + +# Temporary +.netrwhist +*~ +# Auto-generated tag files +tags +# Persistent undo +[._]*.un~ + +# ---> VisualStudioCode +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +!.vscode/*.code-snippets + +# Local History for Visual Studio Code +.history/ + +# Built Visual Studio Code Extensions +*.vsix + +# ---> SublimeText +# Cache files for Sublime Text +*.tmlanguage.cache +*.tmPreferences.cache +*.stTheme.cache + +# Workspace files are user-specific +*.sublime-workspace + +# Project files should be checked into the repository, unless a significant +# proportion of contributors will probably not be using Sublime Text +# *.sublime-project + +# SFTP configuration file +sftp-config.json +sftp-config-alt*.json + +# Package control specific files +Package Control.last-run +Package Control.ca-list +Package Control.ca-bundle +Package Control.system-ca-bundle +Package Control.cache/ +Package Control.ca-certs/ +Package Control.merged-ca-bundle +Package Control.user-ca-bundle +oscrypto-ca-bundle.crt +bh_unicode_properties.cache + +# Sublime-github package stores a github token in this file +# https://packagecontrol.io/packages/sublime-github +GitHub.sublime-settings + +# ---> TextMate +*.tmproj +*.tmproject +tmtags + +# ---> Emacs +# -*- mode: gitignore; -*- +*~ +\#*\# +/.emacs.desktop +/.emacs.desktop.lock +*.elc +auto-save-list +tramp +.\#* + +# Org-mode +.org-id-locations +*_archive + +# flymake-mode +*_flymake.* + +# eshell files +/eshell/history +/eshell/lastdir + +# elpa packages +/elpa/ + +# reftex files +*.rel + +# AUCTeX auto folder +/auto/ + +# cask packages +.cask/ +dist/ + +# Flycheck +flycheck_*.el + +# server auth directory +/server/ + +# projectiles files +.projectile + +# directory configuration +.dir-locals.el + +# network security +/network-security.data + +# ---> Xcode +## User settings +xcuserdata/ + +## Xcode 8 and earlier +*.xcscmblueprint +*.xccheckout + +# ----> OPERATING SYSTEMS +# ---> Linux +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# ---> macOS +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# ---> Windows +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk From 756a12225154438eef57e86d974c6f73c082a6a9 Mon Sep 17 00:00:00 2001 From: Wolfgang Ginolas Date: Wed, 20 Mar 2024 10:43:01 +0100 Subject: [PATCH 2/7] Add editorconfig, so we get similar code styles across editors --- .editorconfig | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..a52495a8c --- /dev/null +++ b/.editorconfig @@ -0,0 +1,18 @@ +# Config for our editors. +# See: https://EditorConfig.org + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true +charset = utf-8 +indent_style = space +indent_size = 4 + +# Matches package.json +[package.json] +indent_size = 2 + From 77c651f563f5da2572ad1bb2bfda8c6677100eb3 Mon Sep 17 00:00:00 2001 From: David Benque Date: Wed, 20 Mar 2024 10:15:31 +0000 Subject: [PATCH 3/7] Add forgotten CryptPad elements --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 1ce6fe769..b405f9a41 100644 --- a/.gitignore +++ b/.gitignore @@ -5,11 +5,13 @@ # ----> SOURCE CODE # ---> CryptPad blob +block config/config.js config/sso.js customize data datastore +www/accounts www/components/* lib/plugins/* !lib/plugins/README.md From 12424f430c6d552e6f74f04770762075013e5175 Mon Sep 17 00:00:00 2001 From: David Benque Date: Wed, 20 Mar 2024 10:15:54 +0000 Subject: [PATCH 4/7] Fully ignore VSCode settings --- .gitignore | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitignore b/.gitignore index b405f9a41..0e0a5d640 100644 --- a/.gitignore +++ b/.gitignore @@ -74,11 +74,6 @@ tags # ---> VisualStudioCode .vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json -!.vscode/*.code-snippets # Local History for Visual Studio Code .history/ From 45f4575e176ea5c069d5254648cf530fd3fd9cb0 Mon Sep 17 00:00:00 2001 From: mathilde-cryptpad <156299270+mathilde-cryptpad@users.noreply.github.com> Date: Wed, 20 Mar 2024 14:30:20 +0100 Subject: [PATCH 5/7] restore the previous version of the .gitignore for backward compatibility --- .gitignore | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 0e0a5d640..e9d069688 100644 --- a/.gitignore +++ b/.gitignore @@ -4,17 +4,26 @@ # ----> SOURCE CODE # ---> CryptPad -blob -block -config/config.js -config/sso.js -customize -data datastore -www/accounts +tasks www/components/* -lib/plugins/* -!lib/plugins/README.md +www/bower_components/* +www/accounts +/config.js +customization +*.db +/customize/ +customize +messages.log +www/scratch +data +pins/ +blob/ +block/ +blobstage/ +block/ +logs/ +privileged.conf # ---> Node # Logs From f67350da76d2ca8108303f226a4f80fbc1d2d179 Mon Sep 17 00:00:00 2001 From: mathilde-cryptpad <156299270+mathilde-cryptpad@users.noreply.github.com> Date: Wed, 20 Mar 2024 14:35:13 +0100 Subject: [PATCH 6/7] fix two forgotten entries for new plugins --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index e9d069688..336bcda04 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,8 @@ blobstage/ block/ logs/ privileged.conf +lib/plugins/* +!lib/plugins/README.md # ---> Node # Logs From 7bfe01eca1c49b440fc791110c525f4144f8a969 Mon Sep 17 00:00:00 2001 From: mathilde-cryptpad <156299270+mathilde-cryptpad@users.noreply.github.com> Date: Wed, 20 Mar 2024 14:37:14 +0100 Subject: [PATCH 7/7] fix two forgotten entries for new configs --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 336bcda04..5b8493044 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,8 @@ blobstage/ block/ logs/ privileged.conf +config/config.js +config/sso.js lib/plugins/* !lib/plugins/README.md