Skip to content

Commit 225c7a8

Browse files
authored
Merge pull request #64 from contentstack/bug/security
Bug/security
2 parents 1018369 + 3810f83 commit 225c7a8

23 files changed

+242
-144
lines changed

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ typescript-html-report
1313
webpack
1414
jest.config.js
1515
coverage
16+
CODEOWNERS

.talismanrc

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
fileignoreconfig:
2-
- filename: dist/react-native/contentstack.js
3-
checksum: 6ec0482ba61056b8d079e776719164924e3ecd6c8123f03fd6dc01a727013d95
4-
- filename: dist/node/contentstack.js
5-
checksum: 31877d4663fa195f8dd581279dbf4784567b5ed0a1923487ef1851cecbd5254f
6-
- filename: dist/nativescript/contentstack.js
7-
checksum: 8acfc161d1a7fdaec02fc378e00cdd381d89dd19dedc25e7ee2b32be9a40f2a1
8-
- filename: dist/web/contentstack.js
9-
checksum: 50454530e51fd6235680fe980cd411091ec052fb8d94b151c40dd9e1ed8c0e3f
2+
- filename: test/automation-script.js
3+
checksum: dd31ccc9f78dbcfb48eafa5d7ab80d480776c70bc36d6a10eb86229fb79443af

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
## Change log
2+
### Version: 3.15.0
3+
#### Date: Oct-29-2021
4+
##### New Features:
5+
- Content branching feature support added
6+
7+
28
### Version: 3.14.0
39
#### Date: Oct-19-2021
410
##### New Features:

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The MIT License (MIT)
22

33

4-
Copyright (c) 2016-2020 Contentstack
4+
Copyright (c) 2016-2021 Contentstack
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

config.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ const config = {
99
entries: "/entries/",
1010
assets: "/assets/",
1111
environments: "/environments/"
12+
},
13+
live_preview: {
14+
enable: false,
15+
host: 'api.contentstack.io'
1216
}
1317
};
1418

contentstack-templates/publish.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ var util = require('util');
1313
var htmlsafe = helper.htmlsafe;
1414
var linkto = helper.linkto;
1515
var resolveAuthorLinks = helper.resolveAuthorLinks;
16-
var scopeToPunc = helper.scopeToPunc;
1716
var hasOwnProp = Object.prototype.hasOwnProperty;
1817

1918
var data;
@@ -295,7 +294,6 @@ function buildMemberNav(items, itemHeading, itemsSeen, linktoFn) {
295294

296295
items.forEach(function(item) {
297296
var methods = find({kind:'function', memberof: item.longname});
298-
var members = find({kind:'member', memberof: item.longname});
299297

300298
if ( !hasOwnProp.call(item, 'longname') ) {
301299
itemsNav += '<li>' + linktoFn('', item.name);

contentstack-templates/static/styles/jsdoc-default.css

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ p, ul, ol, blockquote {
3636

3737
h1, h2, h3, h4, h5, h6 {
3838
font-family: 'Montserrat', sans-serif;
39-
}
40-
41-
h1, h2, h3, h4, h5, h6 {
4239
color: #000;
4340
font-weight: 400;
4441
margin: 0;
@@ -140,7 +137,6 @@ nav {
140137
}
141138

142139
nav h3 {
143-
margin-top: 12px;
144140
font-size: 13px;
145141
text-transform: uppercase;
146142
letter-spacing: 1px;
@@ -265,11 +261,8 @@ footer {
265261
}
266262

267263
.details ul {
268-
margin: 0
269-
}
270-
271-
.details ul {
272-
list-style-type: none
264+
margin: 0;
265+
list-style-type: none;
273266
}
274267

275268
.details li {

contentstack-templates/static/styles/prettify-tomorrow.css

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,14 @@ li.L6,
121121
li.L7,
122122
li.L8,
123123
li.L9 {
124-
/* */ }
124+
125+
}
125126

126127
/* Alternate shading for lines */
127128
li.L1,
128129
li.L3,
129130
li.L5,
130131
li.L7,
131132
li.L9 {
132-
/* */ }
133+
134+
}

contentstack-templates/tmpl/params.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,19 @@
5050
});
5151
?>
5252

53-
<table class="params">
53+
<table class="params" aria-describedby="params">
5454
<thead>
5555
<tr>
5656
<?js if (params.hasName) {?>
57-
<th>Name</th>
57+
<th id="name">Name</th>
5858
<?js } ?>
5959

6060
<?js if (params.hasAttributes) {?>
61-
<th>Attributes</th>
61+
<th id="attributes">Attributes</th>
6262
<?js } ?>
6363

6464
<?js if (params.hasDefault) {?>
65-
<th>Default</th>
65+
<th id="default">Default</th>
6666
<?js } ?>
6767

6868
<th class="last">Description</th>

contentstack-templates/tmpl/properties.tmpl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,21 @@
3939
});
4040
?>
4141

42-
<table class="props">
42+
<table class="props" aria-describedby="props">
4343
<thead>
4444
<tr>
4545
<?js if (props.hasName) {?>
46-
<th>Name</th>
46+
<th id="name">Name</th>
4747
<?js } ?>
4848

49-
<th>Type</th>
49+
<th id="type">Type</th>
5050

5151
<?js if (props.hasAttributes) {?>
52-
<th>Attributes</th>
52+
<th id="attributes">Attributes</th>
5353
<?js } ?>
5454

5555
<?js if (props.hasDefault) {?>
56-
<th>Default</th>
56+
<th id="default">Default</th>
5757
<?js } ?>
5858

5959
<th class="last">Description</th>

0 commit comments

Comments
 (0)