Skip to content

Commit 5de422d

Browse files
Merge pull request #2157 from OneCommunityGlobal/development
Backend Release to Main [2.97]
2 parents 5bfb2bc + 0562cfa commit 5de422d

57 files changed

Lines changed: 3217 additions & 17287 deletions

Some content is hidden

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

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/bower_components
1010

1111
# misc
12-
/scripts
12+
# /scripts
1313
/.sass-cache
1414
/connect.lock
1515
/coverage/*
@@ -35,4 +35,4 @@ patch-mongo.js
3535
skip-db.js
3636
stub-db.js
3737
stub-db-strong.js
38-
scripts/
38+
# scripts/

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
lts/iron
1+
20

BuildingUnits.json

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,118 @@
11
[
2-
{
3-
"unit":"Micrograms",
4-
"category":"Material"
5-
},
6-
{
2+
{
3+
"unit": "Micrograms",
4+
"category": "Material"
5+
},
6+
{
77
"unit": "Milligrams (mg)",
88
"category": "Material"
9-
},
10-
{
11-
"unit": "Centigrams (cg)",
12-
"category": "Material"
13-
},
14-
{
15-
"unit": "Decigrams (dg)",
16-
"category": "Material"
17-
},
18-
{
9+
},
10+
{
11+
"unit": "Centigrams (cg)",
12+
"category": "Material"
13+
},
14+
{
15+
"unit": "Decigrams (dg)",
16+
"category": "Material"
17+
},
18+
{
1919
"unit": "Grams (g)",
2020
"category": "Material"
21-
},
22-
{
23-
"unit": "Dekagram (dag)",
24-
"category": "Material"
25-
},
26-
{
27-
"unit": "Hectogram (hg)",
28-
"category": "Material"
29-
},
30-
{
21+
},
22+
{
23+
"unit": "Dekagram (dag)",
24+
"category": "Material"
25+
},
26+
{
27+
"unit": "Hectogram (hg)",
28+
"category": "Material"
29+
},
30+
{
3131
"unit": "Kilograms",
3232
"category": "Material"
33-
},
34-
{
35-
"unit": "Cubic Centimeter (cm³)",
36-
"category": "Material"
37-
},
38-
{
39-
"unit": "Cubic Millimeter (mm³)",
40-
"category": "Material"
41-
},
42-
{
43-
"unit": "Cubic Yard (yd³)",
44-
"category": "Material"
45-
},
46-
{
47-
"unit": "Square Meter (m²)",
48-
"category": "Material"
49-
},
50-
{
33+
},
34+
{
35+
"unit": "Cubic Centimeter (cm³)",
36+
"category": "Material"
37+
},
38+
{
39+
"unit": "Cubic Millimeter (mm³)",
40+
"category": "Material"
41+
},
42+
{
43+
"unit": "Cubic Yard (yd³)",
44+
"category": "Material"
45+
},
46+
{
47+
"unit": "Square Meter (m²)",
48+
"category": "Material"
49+
},
50+
{
5151
"unit": "Metric ton (t)",
5252
"category": "Material"
53-
},
54-
{
53+
},
54+
{
5555
"unit": "Pounds",
5656
"category": "Material"
57-
},
58-
{
57+
},
58+
{
5959
"unit": "Ounces",
6060
"category": "Material"
61-
},
62-
{
61+
},
62+
{
6363
"unit": "Carats",
6464
"category": "Material"
65-
},
66-
{
65+
},
66+
{
6767
"unit": "Stone",
6868
"category": "Material"
69-
},
70-
{
69+
},
70+
{
7171
"unit": "Bags",
7272
"category": "Material"
73-
},
74-
{
73+
},
74+
{
7575
"unit": "Numbers",
7676
"category": "Material"
77-
},
78-
{
77+
},
78+
{
7979
"unit": "Board Feet (BDFT)",
8080
"category": "Material"
81-
},
82-
{
81+
},
82+
{
8383
"unit": "Cords",
8484
"category": "Material"
85-
},
86-
{
85+
},
86+
{
8787
"unit": "Pieces",
8888
"category": "Material"
89-
},
90-
{
89+
},
90+
{
9191
"unit": "Roll (for rolled insulation)",
9292
"category": "Material"
93-
},
94-
{
93+
},
94+
{
9595
"unit": "Bundle (for shingles)",
9696
"category": "Material"
97-
},
98-
{
97+
},
98+
{
9999
"unit": "Meter (for wiring,pipes)",
100100
"category": "Material"
101-
},
102-
{
101+
},
102+
{
103103
"unit": "Tubes (for caulking)",
104104
"category": "Material"
105-
},
106-
{
105+
},
106+
{
107107
"unit": "Tons",
108108
"category": "Material"
109-
},
110-
{
109+
},
110+
{
111111
"unit": "Cubic Meter",
112112
"category": "Material"
113-
},
114-
{
113+
},
114+
{
115115
"unit": "Sand",
116116
"category": "Material"
117-
}
117+
}
118118
]

git

Whitespace-only changes.

0 commit comments

Comments
 (0)