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

Commit cf37fa6

Browse files
committed
Merge tag '2024.6.0' into nya
2 parents 6a0d69d + febafdd commit cf37fa6

File tree

115 files changed

+4855
-8343
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+4855
-8343
lines changed

.eslintignore

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ www/components/
77
www/bower_components/
88
www/common/onlyoffice/dist
99
www/common/onlyoffice/x2t
10+
onlyoffice-dist/
1011

1112
www/scratch
1213
www/accounts
@@ -15,6 +16,8 @@ www/accounts
1516
www/worker
1617
www/todo
1718

19+
#lib/plugins/
20+
1821
www/common/hyperscript.js
1922

2023
www/pad/wysiwygarea-plugin.js

.eslintrc.js

-3
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,10 @@ module.exports = {
4949

5050
// TODO remove these exceptions from the eslint defaults
5151
'no-irregular-whitespace': ['off'],
52-
'no-unused-vars': ['warn'],
5352
'no-self-assign': ['off'],
5453
'no-empty': ['off'],
5554
'no-useless-escape': ['off'],
56-
'no-redeclare': ['off'],
5755
'no-extra-boolean-cast': ['off'],
58-
'no-global-assign': ['off'],
5956
'no-prototype-builtins': ['off'],
6057
}
6158
};

.github/ISSUE_TEMPLATE/bug_resolution.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ body:
8989
label: Version
9090
description: What version of CryptPad are you running?
9191
options:
92+
- 2024.6.0
93+
- 2024.3.1
9294
- 2024.3.0
9395
- 5.7.0
9496
- 5.6.0
@@ -100,8 +102,6 @@ body:
100102
- 5.2.0
101103
- 5.1.0
102104
- 5.0.0
103-
- 4.14.1
104-
- 4.14.0
105105
- Other
106106
validations:
107107
required: true

.lesshintrc

-60
This file was deleted.

.reuse/dep5

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Files: .jshintrc
2525
Copyright: 2023 XWiki CryptPad Team <contact@cryptpad.org> and contributors
2626
License: AGPL-3.0-or-later
2727

28-
Files: .lesshintrc
28+
Files: .stylelintrc.js
2929
Copyright: 2023 XWiki CryptPad Team <contact@cryptpad.org> and contributors
3030
License: AGPL-3.0-or-later
3131

@@ -156,4 +156,4 @@ License: AGPL-3.0-or-later
156156

157157
Files: www/common/onlyoffice/x2t/*
158158
Copyright: Ascensio System Limited 2010-2022
159-
License: AGPL-3.0-or-later
159+
License: AGPL-3.0-or-later

.stylelintrc.js

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
module.exports = {
2+
"extends": "stylelint-config-standard-less",
3+
"rules": {
4+
"no-descending-specificity": null,
5+
"length-zero-no-unit": null,
6+
"no-duplicate-selectors": null,
7+
"declaration-block-no-duplicate-properties": null,
8+
9+
"comment-empty-line-before": null,
10+
"rule-empty-line-before": null,
11+
"declaration-empty-line-before": null,
12+
"at-rule-empty-line-before": null,
13+
"custom-property-empty-line-before": null,
14+
15+
"font-family-name-quotes": null,
16+
"font-family-no-missing-generic-family-keyword": null,
17+
"declaration-block-no-redundant-longhand-properties": null,
18+
"shorthand-property-no-redundant-values": null,
19+
"declaration-block-no-shorthand-property-overrides": null,
20+
21+
"comment-whitespace-inside": null,
22+
23+
"property-no-vendor-prefix": null,
24+
"selector-no-vendor-prefix": null,
25+
"function-name-case": null,
26+
"selector-class-pattern": null,
27+
"custom-property-pattern": null,
28+
"selector-id-pattern": null,
29+
30+
"selector-pseudo-element-colon-notation": null,
31+
"media-feature-range-notation": null,
32+
"selector-not-notation": null,
33+
"color-function-notation": null,
34+
"alpha-value-notation": null,
35+
36+
"number-max-precision": null,
37+
38+
"at-rule-no-unknown": null, // FIXME
39+
40+
"less/no-duplicate-variables": null,
41+
"less/color-no-invalid-hex": null
42+
}
43+
};

0 commit comments

Comments
 (0)