Skip to content

Commit 91b512b

Browse files
Merge branch 'staging' into react-tour
2 parents d5513e9 + dca8d25 commit 91b512b

Some content is hidden

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

53 files changed

+3950
-2051
lines changed

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,15 @@
232232
"contributions": [
233233
"code"
234234
]
235+
},
236+
{
237+
"login": "1024mb",
238+
"name": "1024mb",
239+
"avatar_url": "https://avatars.githubusercontent.com/u/9301204?v=4",
240+
"profile": "https://github.com/1024mb",
241+
"contributions": [
242+
"translation"
243+
]
235244
}
236245
]
237246
}

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@ We would like to thank all our contributors and users for their support and feed
147147
<td align="center" valign="top" width="14.28%"><a href="https://github.com/VikramNagwal"><img src="https://avatars.githubusercontent.com/u/123088024?v=4?s=100" width="100px;" alt="Vikram"/><br /><sub><b>Vikram</b></sub></a><br /><a href="#code-VikramNagwal" title="Code">💻</a></td>
148148
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ugoconsonni"><img src="https://avatars.githubusercontent.com/u/13661702?v=4?s=100" width="100px;" alt="ugoconsonni"/><br /><sub><b>ugoconsonni</b></sub></a><br /><a href="#code-ugoconsonni" title="Code">💻</a></td>
149149
<td align="center" valign="top" width="14.28%"><a href="https://github.com/daniel-mutwiri"><img src="https://avatars.githubusercontent.com/u/8936960?v=4?s=100" width="100px;" alt="Daniel Mutwiri"/><br /><sub><b>Daniel Mutwiri</b></sub></a><br /><a href="#code-daniel-mutwiri" title="Code">💻</a></td>
150-
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Zathiel"><img src="https://avatars.githubusercontent.com/u/26553418?v=4?s=100" width="100px;" alt="Zathiel"/><br /><sub><b>Zathiel</b></sub></a><br /><a href="#code-Zathiel" title="Code">💻</a><a href="#security-Zathiel" title="Security">🛡️</a></td>
150+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Zathiel"><img src="https://avatars.githubusercontent.com/u/26553418?v=4?s=100" width="100px;" alt="Zathiel"/><br /><sub><b>Zathiel</b></sub></a><br /><a href="#code-Zathiel" title="Code">💻</a></td>
151+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/1024mb"><img src="https://avatars.githubusercontent.com/u/9301204?v=4?s=100" width="100px;" alt="1024mb"/><br /><sub><b>1024mb</b></sub></a><br /><a href="#translation-1024mb" title="Translation">🌍</a></td>
151152
</tr>
152153
</tbody>
153154
</table>

apps/OpenSign/package-lock.json

Lines changed: 568 additions & 573 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/OpenSign/package.json

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
"@formkit/auto-animate": "^0.8.2",
77
"@lottiefiles/dotlottie-react": "^0.9.0",
88
"@pdf-lib/fontkit": "^1.1.1",
9-
"@radix-ui/themes": "^3.1.3",
9+
"@radix-ui/themes": "^3.1.4",
1010
"@react-pdf/renderer": "^4.0.0",
1111
"@reduxjs/toolkit": "^2.2.7",
1212
"axios": "^1.7.7",
1313
"file-saver": "^2.0.5",
1414
"i18next": "^23.15.1",
1515
"i18next-browser-languagedetector": "^8.0.0",
16-
"i18next-http-backend": "^2.6.1",
16+
"i18next-http-backend": "^2.6.2",
1717
"jszip": "^3.10.1",
1818
"jwt-decode": "^4.0.0",
1919
"moment": "^2.30.1",
@@ -23,7 +23,7 @@
2323
"print-js": "^1.6.0",
2424
"radix-ui": "^1.0.1",
2525
"react": "^18.2.0",
26-
"react-bootstrap": "^2.10.4",
26+
"react-bootstrap": "^2.10.5",
2727
"react-confetti": "^6.1.0",
2828
"react-cookie": "^7.2.0",
2929
"react-datepicker": "^7.4.0",
@@ -95,22 +95,22 @@
9595
}
9696
},
9797
"devDependencies": {
98-
"@babel/core": "^7.25.2",
99-
"@babel/preset-env": "^7.25.4",
100-
"@babel/preset-react": "^7.24.7",
101-
"@babel/runtime-corejs2": "^7.25.6",
98+
"@babel/core": "^7.25.7",
99+
"@babel/preset-env": "^7.25.7",
100+
"@babel/preset-react": "^7.25.7",
101+
"@babel/runtime-corejs2": "^7.25.7",
102102
"autoprefixer": "^10.4.20",
103103
"babel-loader": "^9.2.1",
104104
"clean-webpack-plugin": "^4.0.0",
105-
"commitizen": "^4.3.0",
105+
"commitizen": "^4.3.1",
106106
"concurrently": "^9.0.1",
107107
"css-loader": "^7.1.2",
108-
"daisyui": "^4.12.10",
108+
"daisyui": "^4.12.11",
109109
"dotenv": "^16.4.5",
110110
"dotenv-webpack": "^8.1.0",
111111
"eslint": "^9.11.1",
112112
"eslint-plugin-prettier": "^5.2.1",
113-
"eslint-plugin-react": "^7.36.1",
113+
"eslint-plugin-react": "^7.37.1",
114114
"lint-staged": "^15.2.10",
115115
"mini-css-extract-plugin": "^2.9.1",
116116
"postcss": "^8.4.47",
@@ -123,5 +123,8 @@
123123
"overrides": {
124124
"nth-check": "$nth-check",
125125
"ws": "$ws"
126+
},
127+
"engines": {
128+
"node": "18 || 20 || 22"
126129
}
127130
}

apps/OpenSign/public/locales/en/translation.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,10 @@
265265
"make-template-public-alert": "Are you sure you want to make this template public?",
266266
"make-template-private-alert": "Are you sure you want to make this template private? This will remove it from your public profile.",
267267
"public-role": "Public role",
268-
"public-url": "Public URL",
268+
"public-url": "Public profile needed",
269269
"public-url-copy": "Here’s your public URL: ",
270270
"public-url-copy-mssg":"Copy it or share it with the signer, and you will be able to see all your publicly set templates.",
271-
"add-public-url-alert": "Please add your public URL, and you will be able to make a public template.",
271+
"add-public-url-alert": "Please complete your OpenSign public profile setup. Once done, you’ll be able to make templates public. This process only needs to be completed once.",
272272
"share-with-alert": "You cannot share a template if any roles already have contacts assigned. Please remove all contact assignments from the roles before sharing the template.",
273273
"share-with": "Share with",
274274
"team-not-found": "Team not found",
@@ -672,7 +672,6 @@
672672
"document-logs":"Document logs",
673673
"server-down": "Unable to connect to the OpenSign server. If you are self-hosting OpenSign, please ensure that all the steps in the documentation have been followed correctly. If you're running OpenSign locally, you might be accessing it through an incorrect port number.",
674674
"admin-exists": "Admin already exists. Please login to the application using admin credentials in order to manage users.",
675-
"public-tour-message":"Please make template public to copy public URL",
676675
"enable-tour":"Enable Tour",
677676
"istourenabled-help":{
678677
"p1":"This will enable a guided tour for signers, providing instructions during the signing process.",
@@ -681,5 +680,8 @@
681680
},
682681
"form-title-1":"Document Flow Setting",
683682
"form-title-2":"Security Setting"
683+
"public-tour-message":"The template needs to be public before you can generate a shareable link.",
684+
"add-user-template": "You need to add a role before you can add fields for it.",
685+
"pdf-uncompatible": "This pdf is not compatible with opensign, please contact <[email protected]>"
684686

685687
}

0 commit comments

Comments
 (0)