Skip to content

Commit

Permalink
feat: merge dev
Browse files Browse the repository at this point in the history
  • Loading branch information
he3als committed Dec 11, 2023
2 parents 936790e + 8d65a8d commit 5d9005d
Show file tree
Hide file tree
Showing 78 changed files with 707 additions and 443 deletions.
45 changes: 18 additions & 27 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
name: Bug report
description: Create a bug report to help us improve Atlas.
labels: bug
title: "[BUG REPORT] - "
title: "[BUG] - "
body:
- type: markdown
attributes:
value: |
A clear and brief description of what the bug is.
Before submitting an issue, please ensure you have completed the following steps:
- Searched our [documentation](https://docs.atlasos.net)
- Searched our [issue tracker](https://github.com/Atlas-OS/Atlas/issues?q=is%3Aissue) to verify that the issue hasn't been reported already
- Confirmed that you are on the latest version of Atlas
Please note, by submitting an issue, you acknowledge that if the above steps have not been followed, the maintainers reserve the right to close and lock your issue without further response.
- type: textarea
attributes:
label: Description
Expand All @@ -17,7 +21,8 @@ body:

- type: textarea
attributes:
label: Steps to reproduce (add screenshots if applicable)
label: Steps to reproduce
description: The steps required to reproduce this bug (add screenshots if applicable).
placeholder: |
1. [First step] (Screenshot 1)
2. [Second step] (Screenshot 2)
Expand All @@ -28,22 +33,23 @@ body:
- type: textarea
attributes:
label: Expected behavior
description: What you expected to happen.
description: What you expect to happen (add screenshots if applicable).
validations:
required: true

- type: textarea
attributes:
label: Actual behavior (add screenshots if applicable)
description: What happened.
label: Actual behavior
description: What actually happened (add screenshots if applicable).
validations:
required: true

- type: dropdown
attributes:
label: Atlas Version
label: Atlas Edition
options:
- Atlas 10 22H2
- Atlas for Windows 10 22H2
- Atlas for Windows 11 23H2
validations:
required: true

Expand All @@ -52,28 +58,13 @@ body:
label: Desktop information
description: Your hardware specification is needed for us to define the problem.
placeholder: |
- Processor [include brand and specifics]
- RAM amount
- Storage [include brand and type]
- Graphics card [include driver version]
- Processor [include brand and specs]
- RAM [include size and generation]
- Storage [include size, brand, and type]
- GPU [include brand, specs, driver version]
validations:
required: true

- type: checkboxes
attributes:
label: Requisites
description: |
To rule out invalid issues, confirm and check each one of the checkboxes.
options:
- label: This is not a support issue or a question. For any support, questions or help, join our [Discord server](https://discord.atlasos.net).
required: true
- label: I performed a [cursory search of the issue tracker](https://github.com/Atlas-OS/Atlas/issues?q=is%3Aissue) to avoid opening a duplicate issue.
required: true
- label: I checked the [documentation](https://docs.atlasos.net) to understand that the issue I am reporting is not normal behavior.
required: true
- label: I understand that not filling out this template correctly will lead to the issue being closed.
required: true

- type: textarea
attributes:
label: Additional content
Expand Down
16 changes: 5 additions & 11 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: General discussions
url: https://discord.atlasos.net
about: Please join our Discord server for general discussions.
- name: General discussions (if you do not use Discord)
url: https://forum.atlasos.net
about: Use our forum for general discussions.
- name: Contribute to Atlas Documentation
url: https://github.com/Atlas-OS/docs
about: Contribute to Atlas Documentation in this repository.
- name: Report Issue about Atlas Documentation
url: https://github.com/Atlas-OS/docs/issues/
about: Report all Documentation issues in our Documentation repository issue tracker.
- name: Report an issue (non-Atlas related issue)
url: https://forum.atlasos.net
about: Please report any non-Atlas related issue in our ``Bug Report`` section on our Forum (Website, Discord bot, etc.).
url: https://forum.atlasos.net/t/atlas-bug-report
about: Please report any non-Atlas Playbook related issue in the ``Bug Report`` section on our Forum (Website, Discord bot, etc.).
40 changes: 11 additions & 29 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -1,45 +1,40 @@
name: Feature request
description: Create a feature request to help us improve Atlas.
labels: enhancement
title: "[FEATURE REQUEST] - "
title: "[FEATURE] - "
body:
- type: markdown
attributes:
value: |
A clear and brief description of your feature request.
Before submitting an feature request, please ensure you have completed the following steps:
- The request you submit is related to the Atlas Playbook. If not, request it in our [forum](https://forum.atlasos.net/t/general)
- Searched our [issue tracker](https://github.com/Atlas-OS/Atlas/issues?q=is%3Aissue) to verify that the issue hasn't been reported already
- Confirmed that your issue is not a support request
- Confirmed that your idea is not already in the latest version of Atlas
Please note, by submitting an issue, you acknowledge that if the above steps have not been followed, the maintainers reserve the right to close and lock your issue without further response.
- type: dropdown
attributes:
label: What is your feature request regarding to?
options:
- AtlasOS
- README
- Documentation
- Other, specify below
- Atlas Playbook
- Other (submit it in https://forum.atlasos.net)
validations:
required: true

- type: input
attributes:
label: Other
description: Only enter if you chose "Other"
placeholder: |
e.g. the...
validations:

- type: textarea
attributes:
label: Is your feature request related to a problem? Please describe.
placeholder: |
A clear and brief description of what the problem is.
e.g. I always wanted Atlas to...
validations:
required: true

- type: textarea
attributes:
label: Describe the solution you would like.
placeholder: |
A clear and brief description of what you want to happen.
e.g. I would like Atlas to add...
validations:
required: true

Expand All @@ -50,19 +45,6 @@ body:
validations:
required: true

- type: checkboxes
attributes:
label: Requisites
description: |
To rule out invalid issues, confirm and check each one of the checkboxes.
options:
- label: This is not a support issue or a question. For any support, questions or help, join our [Discord server](https://discord.atlasos.net).
required: true
- label: I performed a [cursory search of the issue tracker](https://github.com/Atlas-OS/Atlas/issues?q=is%3Aissue) to avoid opening a duplicate issue.
required: true
- label: I understand that not filling out this template will lead to the issue being closed.
required: true

- type: textarea
attributes:
label: Additional context.
Expand Down
9 changes: 0 additions & 9 deletions .github/PULL_REQUEST_TEMPLATE/Bugfix.md

This file was deleted.

15 changes: 0 additions & 15 deletions .github/PULL_REQUEST_TEMPLATE/Enhancement.md

This file was deleted.

6 changes: 0 additions & 6 deletions .github/PULL_REQUEST_TEMPLATE/PULL_REQUEST_TEMPLATE.md

This file was deleted.

3 changes: 1 addition & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
- [ ] Did you read and follow the [Atlas Contribution Guidelines](https://docs.atlasos.net/contributions/)?
- [ ] Did you commit to the [`dev`](https://github.com/Atlas-OS/Atlas/tree/dev) branch and not [`main`](https://github.com/Atlas-OS/Atlas)?

**Note:** You should commit directly to `main` for translations of the `README.md`.

### Describe your pull request

1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Contribution Guidelines is on our [Documentation](https://docs.atlasos.net/contributions/).
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ Playbooks are renamed **.zip** archives (with the password [`malte`](https://doc
As Atlas doesn't redistrbute a modified Windows ISO, Atlas fully complies with [Microsoft's Terms of Service](https://www.microsoft.com/en-us/Useterms/Retail/Windows/10/UseTerms_Retail_Windows_10_English.htm). In addition, activation in Windows is not modified.

## 🎨 Brand kit
Want to create your own Atlas wallpaper with some original creative designs? Download our brand kit [here](https://github.com/Atlas-OS/branding/archive/refs/heads/main.zip) and share your creations on our [forum](https://forum.atlasos.net/t/art-showcase).
Want to create your own Atlas wallpaper with some original creative designs? Download our brand kit [here](https://github.com/Atlas-OS/branding/archive/refs/heads/main.zip) and share your creations on our [forum](https://forum.atlasos.net/t/art-showcase).
9 changes: 4 additions & 5 deletions src/playbook/Configuration/atlas/appx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ actions:
- !appx: {name: '*Global.IrisService*', type: app, unregister: true}
- !appx: {name: '*Global.ValueBanner*', type: app, unregister: true}

- !run:
exe: 'powershell.exe'
args: '-NoP -File CLIENTCBS.ps1'
- !powerShell:
command: '.\CLIENTCBS.ps1'
exeDir: true
wait: true

# Family App, Quick Assist
- !appx: {name: '*MicrosoftCorporationII.QuickAssist*', type: family}
Expand Down Expand Up @@ -126,8 +126,7 @@ actions:
command: '$a = """$env:windir\AtlasModules\AtlasPackagesOld.txt"""; (diff (gc $a) ((Get-AppxPackage).PackageFamilyName)).InputObject | Foreach-Object { New-Item -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned" -Name $_ -Force }; Remove-Item $a -Force'
runas: currentUserElevated

# Clear caches of Start menu and more
# Clear caches of Client.CBS and more
- !appx: {operation: clearCache, name: '*Client.CBS*'}
- !appx: {operation: clearCache, name: '*StartMenuExperienceHost*'}
- !appx: {operation: clearCache, name: '*Windows.Search*'}
- !appx: {operation: clearCache, name: '*Microsoft.Windows.SecHealthUI'}
30 changes: 14 additions & 16 deletions src/playbook/Configuration/atlas/components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ actions:

# Microsoft Edge
- !writeStatus: {status: 'Removing Microsoft Edge', option: 'uninstall-edge'}
- !cmd:
command: 'powershell.exe -NoP -EP Unrestricted -File "%windir%\AtlasDesktop\1. Software\Remove Edge.ps1" -UninstallEdge -KeepAppX -Exit'
wait: true
- !powerShell:
command: '& """.\AtlasModules\Scripts\ScriptWrappers\RemoveEdge.ps1""" -UninstallEdge -KeepAppX -Exit'
runas: currentUserElevated
option: 'uninstall-edge'
wait: true
exeDir: true
# AppX uninstallation in the script seems to fail, therefore it's not used and AME Wizard is used instead
- !appx: {name: '*Microsoft.MicrosoftEdge.Stable*', type: family, option: 'uninstall-edge'}
- !appx: {name: '*Microsoft.MicrosoftEdge*', type: family, option: 'uninstall-edge'}
Expand All @@ -35,26 +36,23 @@ actions:
- !run: {exeDir: true, exe: 'ONED.cmd'}

- !writeStatus: {status: 'Removing components'}
- !run:
exe: 'powershell'
args: '& """$env:windir\AtlasModules\PackagesEnvironment\centralScript.ps1""" -PlaybookInstall'
- !powerShell:
command: '& """.\AtlasModules\PackagesEnvironment\centralScript.ps1""" -PlaybookInstall'
option: 'defender-disable'
- !run:
exe: 'powershell'
args: '& """$env:windir\AtlasModules\PackagesEnvironment\centralScript.ps1""" -PlaybookInstall -EverythingButDefender'
wait: true
exeDir: true
- !powerShell:
command: '& """.\AtlasModules\PackagesEnvironment\centralScript.ps1""" -PlaybookInstall -EverythingButDefender'
option: 'defender-enable'
wait: true
exeDir: true

# Update Health Tools
- !writeStatus: {status: 'Removing Update Health'}
- !powerShell: {command: 'Import-Module -Name """$env:windir\AtlasModules\Scripts\Modules\Uninstall-MsiexecAppByName\Uninstall-MsiexecAppByName.psm1"""; Uninstall-MsiexecAppByName -Name ''Microsoft Update Health Tools'''}
- !powerShell: {command: 'Import-Module -Name """.\AtlasModules\Scripts\Modules\Uninstall-MsiexecAppByName\Uninstall-MsiexecAppByName.psm1"""; Uninstall-MsiexecAppByName -Name ''Microsoft Update Health Tools''', exeDir: true}

# PC Health Check
- !writeStatus: {status: 'Removing PC Health Check'}
- !powerShell: {command: 'Import-Module -Name """$env:windir\AtlasModules\Scripts\Modules\Uninstall-MsiexecAppByName\Uninstall-MsiexecAppByName.psm1"""; Uninstall-MsiexecAppByName -Name ''Windows PC Health Check'''}
- !powerShell: {command: 'Import-Module -Name """.\AtlasModules\Scripts\Modules\Uninstall-MsiexecAppByName\Uninstall-MsiexecAppByName.psm1"""; Uninstall-MsiexecAppByName -Name ''Windows PC Health Check''', exeDir: true}
# The Microsoft Update Health Service stays, which is a Windows bug
- !service: {name: 'uhssvc', deleteUsingRegistry: true}

# Converts all Microsoft user accounts to local accounts
- !run:
exeDir: true
exe: 'CONVERTUSERS.cmd'
Loading

0 comments on commit 5d9005d

Please sign in to comment.