Skip to content

Commit 0701b9a

Browse files
weswallaweswalla
authored
Merge pull request #376 from weswalla/bump/11.2.1
Bump/11.2.1
2 parents 22da6f7 + 013d4bc commit 0701b9a

File tree

8 files changed

+17
-51
lines changed

8 files changed

+17
-51
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Acorn is currently in **Alpha** testing phase.
66

77
## Things you can do
88

9-
- [**Download & install the latest Acorn release**](https://github.com/lightningrodlabs/acorn/releases/tag/v11.2.0).
9+
- [**Download & install the latest Acorn release**](https://github.com/lightningrodlabs/acorn/releases/tag/v11.2.1).
1010

1111
- Check out the [Acorn Knowledge Base](https://docs.acorn.software) to learn more about Acorn, its methodology and features.
1212

‎happs/happ/workdir/acorn-desktop.webhapp‎

16.9 KB
Binary file not shown.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "acorn-workspace",
33
"packageManager": "[email protected]",
4-
"version": "11.2.0",
4+
"version": "11.2.1",
55
"private": true,
66
"workspaces": {
77
"packages": [

‎web/dist/splashscreen.html‎

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,4 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<title>Acorn</title>
5-
<script defer="defer" src="./splash.js"></script>
6-
</head>
7-
<body>
8-
<div class="splash-wrapper">
9-
<div class="splash-image-wrapper">
10-
<div class="splash-image-caption">Photograph by Valeriia Miller</div>
11-
</div>
12-
<div class="splash-content-wrapper">
13-
<div>
14-
<div class="splash-logo">acorn</div>
15-
<div class="splash-version">version 11.2.0</div>
16-
</div>
17-
<div class="splash-loading-message" id="activity">
18-
Setting up Holochain...
19-
</div>
20-
<div class="splash-description">
21-
Acorn is an open-source, peer-to-peer project management application
22-
designed and built for distributed software development teams. Acorn
23-
functions through defining Intended Outcomes for a project in a
24-
Dependency Tree structure.<br /><br />Acorn is built as a Holochain
25-
application, meaning it runs on decentralized peer-to-peer computing
26-
and can be used without server infrastructure or a hosting service.
27-
The users of a particular Acorn instance are its hosting power.
28-
</div>
29-
<div class="splash-license">
30-
© 2020-2023 Harris-Braun Enterprises, LLC.<br />Licensed under the
31-
Cryptographic Autonomy License v1.0.
32-
</div>
33-
</div>
34-
</div>
35-
<script>
36-
const el = document.getElementById('activity')
1+
<!doctype html><html><head><title>Acorn</title><script defer="defer" src="./splash.js"></script></head><body><div class="splash-wrapper"><div class="splash-image-wrapper"><div class="splash-image-caption">Photograph by Valeriia Miller</div></div><div class="splash-content-wrapper"><div><div class="splash-logo">acorn</div><div class="splash-version">version 11.2.1</div></div><div class="splash-loading-message" id="activity">Setting up Holochain...</div><div class="splash-description">Acorn is an open-source, peer-to-peer project management application designed and built for distributed software development teams. Acorn functions through defining Intended Outcomes for a project in a Dependency Tree structure.<br/><br/>Acorn is built as a Holochain application, meaning it runs on decentralized peer-to-peer computing and can be used without server infrastructure or a hosting service. The users of a particular Acorn instance are its hosting power.</div><div class="splash-license">© 2020-2023 Harris-Braun Enterprises, LLC.<br/>Licensed under the Cryptographic Autonomy License v1.0.</div></div></div><script>const el = document.getElementById('activity')
372
require('electron').ipcRenderer.on('status', (event, message) => {
383
el.innerHTML = message
39-
})
40-
</script>
41-
</body>
42-
</html>
4+
})</script></body></html>

‎web/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "acorn-ui",
3-
"version": "11.2.0",
3+
"version": "11.2.1",
44
"browser": {
55
"child_process": false
66
},

‎web/src/components/ExpandedViewMode/EVMiddleColumn/TabContent/EvDetails/EvDetails.component.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ export type EvDetailsOwnProps = {
4545
updateOutcome: (outcome: Outcome, actionHash: ActionHashB64) => Promise<void>
4646
updateOutcomeWithLatest: () => Promise<void>
4747
cleanOutcome: () => Outcome
48+
rightColumn: React.ReactNode
4849
}
4950

5051
export type EvDetailsConnectorStateProps = {
@@ -122,6 +123,7 @@ const EvDetails: React.FC<EvDetailsProps> = ({
122123
startDescriptionEdit,
123124
endDescriptionEdit,
124125
editingPeers,
126+
rightColumn,
125127
// Destructure rightColumn prop
126128
}) => {
127129
// reset
@@ -487,6 +489,7 @@ const EvDetails: React.FC<EvDetailsProps> = ({
487489
{/* End of ev-details-main-content */}
488490

489491
{/* Render the right column alongside the main content */}
492+
{rightColumn}
490493
</div>
491494
)
492495
}

‎web/src/components/ExpandedViewMode/ExpandedViewMode.connector.tsx‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,13 @@ const ConnectedExpandedViewMode: React.FC<ConnectedExpandedViewModeProps> = ({
298298
/>
299299
) : null
300300

301+
const rightColumn = outcome ? ( // Only render if outcome exists
302+
<ConnectedEVRightColumn
303+
projectId={projectId}
304+
onClose={onClose}
305+
outcome={outcome}
306+
/>
307+
) : null
301308
// redux connected expanded view components
302309
const details = (
303310
<ConnectedEvDetails
@@ -313,6 +320,7 @@ const ConnectedExpandedViewMode: React.FC<ConnectedExpandedViewModeProps> = ({
313320
setDescription,
314321
githubInputLinkText,
315322
setGithubInputLinkText,
323+
rightColumn,
316324
}}
317325
/>
318326
)
@@ -323,13 +331,6 @@ const ConnectedExpandedViewMode: React.FC<ConnectedExpandedViewModeProps> = ({
323331
appWebsocket={appWebsocket}
324332
/>
325333
)
326-
const rightColumn = outcome ? ( // Only render if outcome exists
327-
<ConnectedEVRightColumn
328-
projectId={projectId}
329-
onClose={onClose}
330-
outcome={outcome}
331-
/>
332-
) : null
333334

334335
// Ensure all necessary props are passed to the component,
335336
// which will then distribute them to the wrapper or inner component.

‎web/src/splashscreen.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<div class="splash-content-wrapper">
1313
<div>
1414
<div class="splash-logo">acorn</div>
15-
<div class="splash-version">version 11.2.0</div>
15+
<div class="splash-version">version 11.2.1</div>
1616
</div>
1717
<div class="splash-loading-message" id="activity">
1818
Setting up Holochain...

0 commit comments

Comments
 (0)