Skip to content

Commit

Permalink
chore: Merge branch dev to main (#21)
Browse files Browse the repository at this point in the history
  • Loading branch information
PocketMiner82 committed Apr 9, 2024
2 parents 1e35efe + d850971 commit 706ee94
Show file tree
Hide file tree
Showing 17 changed files with 237 additions and 891 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build app on PR
on:
workflow_dispatch:
pull_request:
branches: [ main, dev ]
branches: [ dev ]


jobs:
Expand Down
2 changes: 1 addition & 1 deletion .releaserc
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"pseudocodeIde/pseudocodeIde.csproj"
],
"from": "<version>.*</version>",
"to": "<version>${nextRelease.version.split('-')[0]}</version>",
"to": "<version>${nextRelease.version.replace('-dev', '')}</version>",
"countMatches": true
}
]
Expand Down
4 changes: 2 additions & 2 deletions AutoUpdater.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.7</version>
<version>1.3.0.4</version>
<url>https://github.com/PocketMiner82/pseudocode-ide/releases/latest/download/pseudocode-ide.zip</url>
<changelog>https://github.com/PocketMiner82/pseudocode-ide/releases</changelog>
<changelog>https://github.com/PocketMiner82/pseudocode-ide/blob/main/CHANGELOG.md</changelog>
<mandatory>false</mandatory>
</item>
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
# [1.3.0-dev.4](https://github.com/PocketMiner82/pseudocode-ide/compare/1.3.0-dev.3...1.3.0-dev.4) (2024-04-09)

# [1.3.0-dev.3](https://github.com/PocketMiner82/pseudocode-ide/compare/1.3.0-dev.2...1.3.0-dev.3) (2024-04-09)


### Features

* add update to beta button ([a85f2f1](https://github.com/PocketMiner82/pseudocode-ide/commit/a85f2f18edcf1e6e592c42e560a539a28f39dc81))

# [1.3.0-dev.2](https://github.com/PocketMiner82/pseudocode-ide/compare/1.3.0-dev.1...1.3.0-dev.2) (2024-04-09)


### Bug Fixes

* point changelog to actual changelog file ([df9c1ba](https://github.com/PocketMiner82/pseudocode-ide/commit/df9c1ba52b7e0a2b2fe7335d16d9f462b2f79c99))

# [1.3.0-dev.1](https://github.com/PocketMiner82/pseudocode-ide/compare/1.2.7...1.3.0-dev.1) (2024-04-09)


### Features

* add autocomplete menu using AutoCompleteMenu-ScintillaNET library ([38b2909](https://github.com/PocketMiner82/pseudocode-ide/commit/38b2909a09149cc3e8c79002ee15a796b6dc7699))
* add word highlighting on select + use Scintilla5.NET ([b9ec14c](https://github.com/PocketMiner82/pseudocode-ide/commit/b9ec14cb6f5ac1f5651b8cad25c3978bb70914f1))
* use ScintillaNET-FindReplaceDialog for find/replace ([efac5dc](https://github.com/PocketMiner82/pseudocode-ide/commit/efac5dc811e7188fe2b5f07438a552dbb3529e40))

## [1.2.7](https://github.com/PocketMiner82/pseudocode-ide/compare/1.2.6...1.2.7) (2024-04-03)


Expand Down
69 changes: 58 additions & 11 deletions pseudocodeIde/PseudocodeIDEForm.Designer.cs

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

Loading

0 comments on commit 706ee94

Please sign in to comment.