fortressia
/
echidna
1
1
Fork 0
Code Issues 15 Pull Requests 2 Projects Releases Wiki Activity

WIP: feat: implement workspaces support #12

Draft
fortressia wants to merge 12 commits from feat/workspaces into main
pull from: feat/workspaces
merge into: fortressia:main
Conversation 6 Commits 12 Files Changed 12
fortressia commented 2021-11-11 00:50:35 +00:00 (Migrated from gitlab.com)

Closes #39.

Closes #39.
fortressia commented 2021-11-11 00:50:36 +00:00 (Migrated from gitlab.com)

assigned to @fortressia

assigned to @fortressia
fortressia commented 2021-11-16 07:58:21 +00:00 (Migrated from gitlab.com)

added 6 commits

  • 044414fa - 1 commit from branch main
  • fb0a4e73 - refactor: reexport components in components/mod.rs
  • 0c43be61 - style: change the /lib prelude to import everything in closeable_tab
  • 8a9c414a - refactor: reexport component preludes
  • 64b63cf4 - refactor: reexport all preludes to the crate
  • 9fa1915b - Merge branch 'refactor/exports' into feat/workspaces

Compare with previous version

added 6 commits <ul><li>044414fa - 1 commit from branch <code>main</code></li><li>fb0a4e73 - refactor: reexport components in components/mod.rs</li><li>0c43be61 - style: change the /lib prelude to import everything in closeable_tab</li><li>8a9c414a - refactor: reexport component preludes</li><li>64b63cf4 - refactor: reexport all preludes to the crate</li><li>9fa1915b - Merge branch &#39;refactor/exports&#39; into feat/workspaces</li></ul> [Compare with previous version](/EchidnaHQ/Echidna/-/merge_requests/12/diffs?diff_id=279152751&start_sha=8afa897776c8c8c42a254ebf8c5d9e11a1c3f28d)
fortressia commented 2021-11-16 07:59:06 +00:00 (Migrated from gitlab.com)

added 2 commits

  • bd429a2b - 1 commit from branch main
  • e3e3b6f1 - Merge branch 'main' into feat/workspaces

Compare with previous version

added 2 commits <ul><li>bd429a2b - 1 commit from branch <code>main</code></li><li>e3e3b6f1 - Merge branch &#39;main&#39; into feat/workspaces</li></ul> [Compare with previous version](/EchidnaHQ/Echidna/-/merge_requests/12/diffs?diff_id=279153250&start_sha=9fa1915be2268cba7ddd03f613b2c2a605df480a)
fortressia commented 2021-12-18 04:12:07 +00:00 (Migrated from gitlab.com)

added 18 commits

  • e3e3b6f1...e3b330a5 - 17 commits from branch main
  • 40dad9e2 - Merge branch 'main' into feat/workspaces

Compare with previous version

added 18 commits <ul><li>e3e3b6f1...e3b330a5 - 17 commits from branch <code>main</code></li><li>40dad9e2 - Merge branch &#39;main&#39; into feat/workspaces</li></ul> [Compare with previous version](/EchidnaHQ/Echidna/-/merge_requests/12/diffs?diff_id=298650377&start_sha=e3e3b6f1b8867d4b4f7c5712d8b48dd26ed98d77)
fortressia commented 2021-12-18 04:46:23 +00:00 (Migrated from gitlab.com)

added 3 commits

  • b65788f3 - feat: implement EchidnaSidebar.to_imp()
  • 4edeeaf0 - feat: add a GtkStackPage in EchidnaSidebar
  • 6b3b45a1 - feat: partially implement workspace opening

Compare with previous version

added 3 commits <ul><li>b65788f3 - feat: implement EchidnaSidebar.to_imp()</li><li>4edeeaf0 - feat: add a GtkStackPage in EchidnaSidebar</li><li>6b3b45a1 - feat: partially implement workspace opening</li></ul> [Compare with previous version](/EchidnaHQ/Echidna/-/merge_requests/12/diffs?diff_id=298655124&start_sha=40dad9e212863554ed88dec12c0671c70d72e4e7)
fortressia commented 2021-12-18 07:27:48 +00:00 (Migrated from gitlab.com)

added 1 commit

  • 7bb8a5ee - refactor: split workspace.rs into different files

Compare with previous version

added 1 commit <ul><li>7bb8a5ee - refactor: split workspace.rs into different files</li></ul> [Compare with previous version](/EchidnaHQ/Echidna/-/merge_requests/12/diffs?diff_id=298672703&start_sha=6b3b45a1bcb90076e0f7c0fd237635b3f9273699)
fortressia changed title from Draft: feat: implement workspaces support to WIP: feat: implement workspaces support 2021-12-27 14:02:30 +00:00
This pull request has changes conflicting with the target branch.
  • src/components/window/menubar.rs
  • src/components/window/mod.rs
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b feat/workspaces main
git pull origin feat/workspaces

Step 2:

Merge the changes and update on Gitea.
git checkout main
git merge --no-ff feat/workspaces
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug
   
documentation
   
duplicate
   
feat

Stands for 'feature', this label for new features.   
good first issue
   
help wanted
   
in-progress
   
invalid
   
question
   
refactor

This label for issues and MRs that rewrites code.   
wontfix
No Label
bug
documentation
duplicate
feat
good first issue
help wanted
in-progress
invalid
question
refactor
wontfix
Milestone
Clear milestone
No items
No Milestone
MVP
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: fortressia/echidna#12
There is no content yet.
Delete Branch "feat/workspaces"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?