Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ActivityWatch/aw-webui
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e05e805
Choose a base ref
...
head repository: ActivityWatch/aw-webui
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f38648c
Choose a head ref
  • 11 commits
  • 10 files changed
  • 3 contributors

Commits on Nov 19, 2023

  1. feat: filtering clients and hosts on timeline (#502) 

    * Filtering clients and hosts on timeline

* minor default values fixes, code styling

* some code styling to pass lint
    @skaparis
    skaparis authored Nov 19, 2023
    1 Configuration menu
    Copy the full SHA
    d7c70b4 View commit details
    Browse the repository at this point in the history

  2. fix: made CSP stricter in prod (#503) 

    * fix: made CSP stricter in prod

* fix: apparently you can't refactor things out as globals in vue.config.js? strange

* fix: fixed CSP in dev

* fix: simplified CSP template param
    @ErikBjare
    ErikBjare authored Nov 19, 2023
    1 Configuration menu
    Copy the full SHA
    35ad0ae View commit details
    Browse the repository at this point in the history

  3. feat: redesigned timeline filter settings, hid inside <details>

    @ErikBjare
    ErikBjare committed Nov 19, 2023
    1 Configuration menu
    Copy the full SHA
    609a7cc View commit details
    Browse the repository at this point in the history

  4. feat: improved timeline tooltip, including better time formatting (hi… 

    …de date if same day), fixes #494
    @ErikBjare
    ErikBjare committed Nov 19, 2023
    1 Configuration menu
    Copy the full SHA
    54be44d View commit details
    Browse the repository at this point in the history

  5. fix: sort hosts by last_updated in buckets store, so that the first h… 

    …ost is probably the primary one
    @ErikBjare
    ErikBjare committed Nov 19, 2023
    1 Configuration menu
    Copy the full SHA
    fcbd586 View commit details
    Browse the repository at this point in the history

  6. fix: never choose 'unknown' host as default for category builder

    @ErikBjare
    ErikBjare committed Nov 19, 2023
    1 Configuration menu
    Copy the full SHA
    819c4e3 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. build(deps-dev): bump babel-loader from 8.3.0 to 9.1.3 (#508) 

    Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.3.0 to 9.1.3.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md)
- [Commits](babel/babel-loader@v8.3.0...v9.1.3)

---
updated-dependencies:
- dependency-name: babel-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot
    dependabot[bot] authored Nov 20, 2023
    1 Configuration menu
    Copy the full SHA
    476c453 View commit details
    Browse the repository at this point in the history

  2. build(deps): bump exports-loader from 0.7.0 to 4.0.0 (#507) 

    Bumps [exports-loader](https://github.com/webpack-contrib/exports-loader) from 0.7.0 to 4.0.0.
- [Release notes](https://github.com/webpack-contrib/exports-loader/releases)
- [Changelog](https://github.com/webpack-contrib/exports-loader/blob/master/CHANGELOG.md)
- [Commits](webpack/exports-loader@v0.7.0...v4.0.0)

---
updated-dependencies:
- dependency-name: exports-loader
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot
    dependabot[bot] authored Nov 20, 2023
    1 Configuration menu
    Copy the full SHA
    66d20a0 View commit details
    Browse the repository at this point in the history

  3. ci: updated node to v20 for lint workflow

    @ErikBjare
    ErikBjare committed Nov 20, 2023
    1 Configuration menu
    Copy the full SHA
    fdb63ff View commit details
    Browse the repository at this point in the history

  4. build(deps): bump actions/github-script from 6.4.1 to 7 (#509) 

    * build(deps): bump actions/github-script from 6.4.1 to 7.0.1

Bumps [actions/github-script](https://github.com/actions/github-script) from 6.4.1 to 7.0.1.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](actions/github-script@v6.4.1...v7.0.1)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update .github/workflows/comment.yml

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Erik Bjäreholt <[email protected]>
    @dependabot @ErikBjare
    dependabot[bot] and ErikBjare authored Nov 20, 2023
    1 Configuration menu
    Copy the full SHA
    e5f455f View commit details
    Browse the repository at this point in the history

  5. build(deps-dev): bump typescript from 4.9.5 to 5.2.2 (#506) 

    Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.9.5 to 5.2.2.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](microsoft/TypeScript@v4.9.5...v5.2.2)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot
    dependabot[bot] authored Nov 20, 2023
    1 Configuration menu
    Copy the full SHA
    f38648c View commit details
    Browse the repository at this point in the history
Loading