Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update main with latest develop #222

Merged
merged 16 commits into from
Dec 13, 2023
Merged

Update main with latest develop #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1a4379c
:green_heart: Update runner name (#192)
aaronleopold Nov 12, 2023
bc566ae
🌐 Update translations (#185)
aaronleopold Nov 12, 2023
2021664
♻️ Various UI refactors and fixes (#193)
aaronleopold Nov 22, 2023
7be07ec
:bug: Attempt to unset invalid or otherwise bad cookies (#200)
aaronleopold Nov 24, 2023
c0bfde7
✨ Add ability to clean library (#199)
aaronleopold Nov 26, 2023
cfee12f
:art: Session cleanup as queueable job (#201)
aaronleopold Nov 26, 2023
1764c36
🐛 Fix hotkey bug in image reader (#205)
aaronleopold Dec 2, 2023
684a893
✨ Book completed toggle button and fix read again button (#208)
aaronleopold Dec 6, 2023
7c33b12
🌐 Update translations (#198)
aaronleopold Dec 7, 2023
563313c
:hammer: Modify scripts to support building on windows (#211)
JMicheli Dec 8, 2023
e676cb6
:bug: Invalid query method for setting journal_mode (#212)
aaronleopold Dec 9, 2023
881b5cf
:bug: Only set journal_mode when explicitly set (#215)
aaronleopold Dec 9, 2023
58b25d9
:art: Refactor core config (#214)
JMicheli Dec 10, 2023
5c4bf87
:bug: Only initialize WAL once (#216)
aaronleopold Dec 10, 2023
c19f681
:bug: Add background to aside first child in SideBar (#221)
aaronleopold Dec 12, 2023
ce3194b
🐛 Fix page slice preloading and toolbar initial offset (#217)
aaronleopold Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
*.sql linguist-detectable=false

# I don't want docs website to be included in language stats
apps/docs/** linguist-vendored
docs/** linguist-vendored
2 changes: 1 addition & 1 deletion .github/actions/setup-cargo/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ runs:
steps:
- name: Configure environment
run: |
if [[ ${{ runner.name }} == 'manjaro-az' || ${{ runner.os }} == 'Windows' ]]; then
if [[ ${{ runner.name }} == 'oromei-ubuntu' || ${{ runner.os }} == 'Windows' ]]; then
echo "RUN_SETUP=false" >> $GITHUB_ENV
else
echo "RUN_SETUP=true" >> $GITHUB_ENV
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@ on:
pull_request:
branches:
- develop
- main
push:
branches:
- develop

# TODO: should I push nightly on main pushes? then on tag, an actual tagged release?

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand Down
1 change: 1 addition & 0 deletions .moon/workspace.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ projects:
- 'core'
- 'crates/*'
- '!crates/prisma-cli'
- 'docs'
- 'packages/*'
Loading
Loading