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-server-rust
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f0e71a8
Choose a base ref
...
head repository: ActivityWatch/aw-server-rust
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a144746
Choose a head ref
  • 13 commits
  • 27 files changed
  • 4 contributors

Commits on Oct 25, 2023

  1. chore: added dist to gitignore

    @ErikBjare
    ErikBjare committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    9b8df05 View commit details
    Browse the repository at this point in the history

  2. build: include aw-sync and remove aw-webui dist folder from built pac… 

    …kage
    @ErikBjare
    ErikBjare committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    98487bb View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2023

  1. fix(datastore): fixed deprecations in chrono (timestamp_nanos and fro… 

    …m_utc)
    @ErikBjare
    ErikBjare committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    88464b5 View commit details
    Browse the repository at this point in the history

  2. build: use stable rust, and criterion.rs for benching (#429) 

    * build against stable rust

* ci: build against stable

* minor change

* build(deps): switched to plex 0.3.0

---------

Co-authored-by: Erik Bjäreholt <[email protected]>
    @cjc7373 @ErikBjare
    cjc7373 and ErikBjare authored Oct 29, 2023
    Configuration menu
    Copy the full SHA
    e1cd761 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2023

  1. feat(sync): moved logic in sync-test scripts into rust, enabling sync… 

    … with a single command (#430)

* feat(sync): moved logic in `test-sync-pull/push.sh` scripts into rust code, enabling easy sync with a single command

* fix: fixes to sync dirs

* fix: moved --sync-dir arg into sync-advanced subcommand, fixed warnings

* fix: pass around client instead of port/testing

* fix: fixed log dir for aw-sync, misc sync fixes and refactor
    @ErikBjare
    ErikBjare authored Oct 30, 2023
    Configuration menu
    Copy the full SHA
    3ab8291 View commit details
    Browse the repository at this point in the history

  2. build(deps): bump toml from 0.7.8 to 0.8.6 (#431) 

    Bumps [toml](https://github.com/toml-rs/toml) from 0.7.8 to 0.8.6.
- [Commits](toml-rs/toml@toml-v0.7.8...toml-v0.8.6)

---
updated-dependencies:
- dependency-name: toml
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

  3. docs: removed old mention of caveats

    @ErikBjare
    ErikBjare authored Oct 30, 2023
    Configuration menu
    Copy the full SHA
    0240dc0 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2023

  1. build(deps): bump dirs from 3.0.2 to 4.0.0 (#433) 

    Bumps [dirs](https://github.com/soc/dirs-rs) from 3.0.2 to 4.0.0.
- [Commits](https://github.com/soc/dirs-rs/commits)

---
updated-dependencies:
- dependency-name: dirs
  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 2, 2023
    Configuration menu
    Copy the full SHA
    b6dac17 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2023

  1. perf: improve performance of filter_period_intersect (#436) 

    * perf: improve performance of filter_period_intersect

* forgot some files

* fix lint errors
    @cjc7373
    cjc7373 authored Nov 11, 2023
    Configuration menu
    Copy the full SHA
    55cad4a View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2023

  1. Remove references to nightly rust release 

    We now support rust stable.
    @johan-bjareholt
    johan-bjareholt authored Nov 12, 2023
    Configuration menu
    Copy the full SHA
    01107b6 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. build(deps): updated aw-webui

    @ErikBjare
    ErikBjare committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    52e5214 View commit details
    Browse the repository at this point in the history

  2. fix: set rocket_cors log level to Warn (fixes ActivityWatch/activityw… 

    …atch#975)
    @ErikBjare
    ErikBjare committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    59ee035 View commit details
    Browse the repository at this point in the history

  3. build(deps): updated aw-webui

    @ErikBjare
    ErikBjare committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    a144746 View commit details
    Browse the repository at this point in the history
Loading