Skip to content

Sync changes accrued in develop #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JimKerslake merged 20 commits into from
Aug 21, 2025
Merged

Sync changes accrued in develop #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2b9e6a4
Adding css to restore Summernote to it's default colours regardless o…
markidox Aug 6, 2025
5f78841
#1125 setting cookie status to Lax by default
markidox Aug 6, 2025
1ad0eec
resx improvement - jk
JimKerslake Aug 8, 2025
579b4d2
Merge pull request #137 from cloudscribe/feature/resx-improvement
JimKerslake Aug 8, 2025
0d31a35
Delete new2FAentries.ps1
JimKerslake Aug 8, 2025
d41f97c
Merge pull request #138 from cloudscribe/feature/resx-improvement
JimKerslake Aug 8, 2025
b6d917f
Merge pull request #136 from cloudscribe/feature/1125
JimKerslake Aug 8, 2025
00ce987
Merge branch 'develop' into feature/summernote-override
JimKerslake Aug 8, 2025
466f269
Merge pull request #135 from cloudscribe/feature/summernote-override
JimKerslake Aug 8, 2025
3baa67e
minified css
markidox Aug 8, 2025
782febf
Merge branch 'feature/summernote-override' of https://github.com/clou…
markidox Aug 8, 2025
506cb39
Merge branch 'develop' into feature/summernote-override
JimKerslake Aug 8, 2025
7f88528
Merge pull request #139 from cloudscribe/feature/summernote-override
JimKerslake Aug 8, 2025
8c0faf1
cookie consent view changes - jk
JimKerslake Aug 12, 2025
6d491a9
Merge pull request #140 from cloudscribe/feature/cookieconsent
JimKerslake Aug 12, 2025
3471521
resx tweak - jk
JimKerslake Aug 13, 2025
fafa19f
Merge pull request #141 from cloudscribe/feature/cookieconsent
JimKerslake Aug 13, 2025
2652689
resx improvement for simplecontent
JimKerslake Aug 19, 2025
d71402c
resx again - jk
JimKerslake Aug 19, 2025
de59fd3
Merge pull request #142 from cloudscribe/feature/cookieconsent
JimKerslake Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,155 changes: 2,155 additions & 0 deletions Content/WebApp/GlobalResources/CloudscribeCore.cy.resx
View file
Open in desktop

Large diffs are not rendered by default.

624 changes: 622 additions & 2 deletions Content/WebApp/GlobalResources/CloudscribeCore.en-GB.resx
View file
Open in desktop

Large diffs are not rendered by default.

624 changes: 608 additions & 16 deletions Content/WebApp/GlobalResources/CloudscribeCore.en-US.resx
View file
Open in desktop

Large diffs are not rendered by default.

1,858 changes: 1,858 additions & 0 deletions Content/WebApp/GlobalResources/CloudscribeCore.resx
View file
Open in desktop

Large diffs are not rendered by default.

111 changes: 111 additions & 0 deletions Content/WebApp/GlobalResources/SimpleContent.en-US.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,4 +540,115 @@
<data name="Recent Posts" xml:space="preserve">
<value>Recent Posts</value>
</data>
<data name="If checked will show the blog categories in the side bar" xml:space="preserve">
<value>If checked will show the blog categories in the side bar</value>
</data>
<data name="If checked will show the blog archives in the side bar" xml:space="preserve">
<value>If checked will show the blog archives in the side bar</value>
</data>
<data name="Show the blog categories in the side bar" xml:space="preserve">
<value>Show the blog categories in the side bar</value>
</data>
<data name="Show the blog archives in the side bar" xml:space="preserve">
<value>Show the blog archives in the side bar</value>
</data>
<data name="Created" xml:space="preserve">
<value>Created</value>
</data>
<data name="Created By" xml:space="preserve">
<value>Created By</value>
</data>
<data name="Last Updated" xml:space="preserve">
<value>Last Updated</value>
</data>
<data name="Updated" xml:space="preserve">
<value>Updated</value>
</data>
<data name="Updated By" xml:space="preserve">
<value>Updated By</value>
</data>
<data name="Show Created By" xml:space="preserve">
<value>Show Created By</value>
</data>
<data name="Show Created Date" xml:space="preserve">
<value>Show Created Date</value>
</data>
<data name="Show Last Modified By" xml:space="preserve">
<value>Show Last Modified By</value>
</data>
<data name="Show Last Modified Date" xml:space="preserve">
<value>Show Last Modified Date</value>
</data>
<data name="Show / hide the following information below the main content of the page." xml:space="preserve">
<value>Show / hide the following information below the main content of the page.</value>
</data>
<data name="Show / hide the following information below the main content of pages (site default)." xml:space="preserve">
<value>Show / hide the following information below the main content of pages (site default).</value>
</data>
<data name="You have unsaved changes in the editor. Are you sure you want to navigate to Developer Tools? Your changes will be lost." xml:space="preserve">
<value>You have unsaved changes in the editor. Are you sure you want to navigate to Developer Tools? Your changes will be lost.</value>
</data>
<data name="Raw JavaScript" xml:space="preserve">
<value>Raw JavaScript</value>
</data>
<data name="Enter your JavaScript below. Do not include script tags." xml:space="preserve">
<value>Enter your JavaScript below. Do not include script tags.</value>
</data>
<data name="Scripts are automatically validated for security - only safe DOM manipulation and event handling are permitted." xml:space="preserve">
<value>Scripts are automatically validated for security - only safe DOM manipulation and event handling are permitted.</value>
</data>
<data name="Enter custom Javascript to run on your page. Do not include script tags." xml:space="preserve">
<value>Enter custom Javascript to run on your page. Do not include script tags.</value>
</data>
<data name="Save JavaScript" xml:space="preserve">
<value>Save JavaScript</value>
</data>
<data name="JavaScript URLs" xml:space="preserve">
<value>JavaScript URLs</value>
</data>
<data name="CSS URLs" xml:space="preserve">
<value>CSS URLs</value>
</data>
<data name="Return to Page Editing" xml:space="preserve">
<value>Return to Page Editing</value>
</data>
<data name="Creator Twitter Handle" xml:space="preserve">
<value>Creator Twitter Handle</value>
</data>
<data name="Date Required" xml:space="preserve">
<value>Date Required</value>
</data>
<data name="Description" xml:space="preserve">
<value>Description</value>
</data>
<data name="Disable HTML Editor" xml:space="preserve">
<value>Disable HTML Editor</value>
</data>
<data name="Publish Later:" xml:space="preserve">
<value>Publish Later:</value>
</data>
<data name="Publish Now" xml:space="preserve">
<value>Publish Now</value>
</data>
<data name="Publisher Twitter Handle" xml:space="preserve">
<value>Publisher Twitter Handle</value>
</data>
<data name="Save Draft" xml:space="preserve">
<value>Save Draft</value>
</data>
<data name="Site Name" xml:space="preserve">
<value>Site Name</value>
</data>
<data name="To publish later you must enter a date." xml:space="preserve">
<value>To publish later you must enter a date.</value>
</data>
<data name="Version History" xml:space="preserve">
<value>Version History</value>
</data>
<data name="Script saved successfully" xml:space="preserve">
<value>Script saved successfully</value>
</data>
<data name="Script cleared successfully" xml:space="preserve">
<value>Script cleared successfully</value>
</data>
</root>
Loading