Skip to content

Commit

Permalink
Merge branch 'develop' into wip/hubert/engine-native
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Sep 22, 2022
2 parents a6ed396 + a2cae26 commit 7129540
Show file tree
Hide file tree
Showing 40 changed files with 1,893 additions and 112 deletions.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ Cargo.toml

# Engine (old)
# This section should be removed once the engine moves to /app/engine
/build.sbt @4e6
/build.sbt @4e6 @jaroslavtulach @hubertp
/distribution/ @4e6
/engine/ @4e6 @jaroslavtulach
/project/ @4e6
/project/ @4e6 @jaroslavtulach @hubertp
/test/ @jdunkerley @radeusgd
/tools/ @4e6

Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@
- [Added `databases`, `schemas`, `tables` support to database Connection.][3632]
- [Implemented `start_of` and `end_of` methods for date/time types allowing to
find start and end of a period of time containing the provided time.][3695]
- [Implemented `work_days_until` for counting work dys between dates and
`add_work_days` which allows to shift a date by a number of work days.][3726]

[debug-shortcuts]:
https://github.com/enso-org/enso/blob/develop/app/gui/docs/product/shortcuts.md#debug
Expand Down Expand Up @@ -316,6 +318,7 @@
[3684]: https://github.com/enso-org/enso/pull/3684
[3691]: https://github.com/enso-org/enso/pull/3691
[3695]: https://github.com/enso-org/enso/pull/3695
[3726]: https://github.com/enso-org/enso/pull/3726

#### Enso Compiler

Expand Down
20 changes: 20 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/gui/src/presenter/graph.rs
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ impl Model {
};
Some(result)
},
"update node position",
"update node visualization",
);
}

Expand Down
1 change: 1 addition & 0 deletions app/gui/view/component-browser/component-group/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ensogl-gui-component = { version = "0.1.0", path = "../../../../../lib/rust/enso
ensogl-shadow = { version = "0.1.0", path = "../../../../../lib/rust/ensogl/component/shadow" }
ensogl-hardcoded-theme = { version = "0.1.0", path = "../../../../../lib/rust/ensogl/app/theme/hardcoded" }
ensogl-list-view = { version = "0.1.0", path = "../../../../../lib/rust/ensogl/component/list-view" }
ensogl-grid-view = { version = "0.1.0", path = "../../../../../lib/rust/ensogl/component/grid-view" }
ensogl-text = { version = "0.1.0", path = "../../../../../lib/rust/ensogl/component/text" }
ensogl-label = { path = "../../../../../lib/rust/ensogl/component/label/" }
failure = { version = "0.1.6" }
82 changes: 43 additions & 39 deletions app/gui/view/component-browser/component-group/src/icon.rs

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions app/gui/view/component-browser/component-group/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ use ensogl_shadow as shadow;

pub mod entry;
pub mod icon;
pub mod new_entry;
pub mod set;
pub mod wide;

Expand Down
Loading

0 comments on commit 7129540

Please sign in to comment.