Skip to content
This repository has been archived by the owner on Nov 18, 2024. It is now read-only.

Commit

Permalink
Merge tag '2024.6.0' into nya
Browse files Browse the repository at this point in the history
  • Loading branch information
Candinya committed Jul 2, 2024
2 parents 6a0d69d + febafdd commit cf37fa6
Show file tree
Hide file tree
Showing 115 changed files with 4,855 additions and 8,343 deletions.
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ www/components/
www/bower_components/
www/common/onlyoffice/dist
www/common/onlyoffice/x2t
onlyoffice-dist/

www/scratch
www/accounts
Expand All @@ -15,6 +16,8 @@ www/accounts
www/worker
www/todo

#lib/plugins/

www/common/hyperscript.js

www/pad/wysiwygarea-plugin.js
Expand Down
3 changes: 0 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,10 @@ module.exports = {

// TODO remove these exceptions from the eslint defaults
'no-irregular-whitespace': ['off'],
'no-unused-vars': ['warn'],
'no-self-assign': ['off'],
'no-empty': ['off'],
'no-useless-escape': ['off'],
'no-redeclare': ['off'],
'no-extra-boolean-cast': ['off'],
'no-global-assign': ['off'],
'no-prototype-builtins': ['off'],
}
};
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_resolution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ body:
label: Version
description: What version of CryptPad are you running?
options:
- 2024.6.0
- 2024.3.1
- 2024.3.0
- 5.7.0
- 5.6.0
Expand All @@ -100,8 +102,6 @@ body:
- 5.2.0
- 5.1.0
- 5.0.0
- 4.14.1
- 4.14.0
- Other
validations:
required: true
60 changes: 0 additions & 60 deletions .lesshintrc

This file was deleted.

4 changes: 2 additions & 2 deletions .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Files: .jshintrc
Copyright: 2023 XWiki CryptPad Team <[email protected]> and contributors
License: AGPL-3.0-or-later

Files: .lesshintrc
Files: .stylelintrc.js
Copyright: 2023 XWiki CryptPad Team <[email protected]> and contributors
License: AGPL-3.0-or-later

Expand Down Expand Up @@ -156,4 +156,4 @@ License: AGPL-3.0-or-later

Files: www/common/onlyoffice/x2t/*
Copyright: Ascensio System Limited 2010-2022
License: AGPL-3.0-or-later
License: AGPL-3.0-or-later
43 changes: 43 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
module.exports = {
"extends": "stylelint-config-standard-less",
"rules": {
"no-descending-specificity": null,
"length-zero-no-unit": null,
"no-duplicate-selectors": null,
"declaration-block-no-duplicate-properties": null,

"comment-empty-line-before": null,
"rule-empty-line-before": null,
"declaration-empty-line-before": null,
"at-rule-empty-line-before": null,
"custom-property-empty-line-before": null,

"font-family-name-quotes": null,
"font-family-no-missing-generic-family-keyword": null,
"declaration-block-no-redundant-longhand-properties": null,
"shorthand-property-no-redundant-values": null,
"declaration-block-no-shorthand-property-overrides": null,

"comment-whitespace-inside": null,

"property-no-vendor-prefix": null,
"selector-no-vendor-prefix": null,
"function-name-case": null,
"selector-class-pattern": null,
"custom-property-pattern": null,
"selector-id-pattern": null,

"selector-pseudo-element-colon-notation": null,
"media-feature-range-notation": null,
"selector-not-notation": null,
"color-function-notation": null,
"alpha-value-notation": null,

"number-max-precision": null,

"at-rule-no-unknown": null, // FIXME

"less/no-duplicate-variables": null,
"less/color-no-invalid-hex": null
}
};
Loading

0 comments on commit cf37fa6

Please sign in to comment.