github.com/ActivityWatch/aw-webui commits | Ecosyste.ms: OpenCollective

removed no longer needed ./build/ and ./dist/ folders

205cb5138bc0269536dd10da17ba22629de42853 authored over 5 years ago

fixed bug and moved sunburst to same row as rest of category visualizations in the daily view

102f8f3366d7485d8b8688f20b9f6f4671e43190 authored over 5 years ago

fixed bug when clicking date in date browser in daily view (and cleaned up some css)

de892d229abda500e9144e0f832bba65f684cf17 authored over 5 years ago

finishing touches on category editor and other category stuff

3ac9190952336d12a00810d4160b3418a0de5876 authored over 5 years ago

added category sunburst

53b5792f27b16c1e3b2a562b5e7912fb05ac1add authored over 5 years ago

Merge branch 'master' into dev/classify

2b8bcbdae705135846213fb46501130f41206ca9 authored over 5 years ago

Merge pull request #148 from ActivityWatch/dependabot/npm_and_yarn/eslint-utils-1.4.2

Bump eslint-utils from 1.3.1 to 1.4.2

c51e5f43d460c446667b83542ba8ee67e24f68ec authored over 5 years ago

Merge pull request #149 from ActivityWatch/dependabot/npm_and_yarn/mixin-deep-1.3.2

Bump mixin-deep from 1.3.1 to 1.3.2

d9fd2590dbd30f91f9137a6bc8118c213f8800f7 authored over 5 years ago

Merge pull request #147 from ActivityWatch/dependabot/npm_and_yarn/lodash-4.17.13

Bump lodash from 4.17.11 to 4.17.13

0f2b60dde5e0504048e6478f445fc02436adc889 authored over 5 years ago

Bump mixin-deep from 1.3.1 to 1.3.2

Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2.
- [Release ...

f66fa2947af55ab0804ac42cde20a226954bf42e authored over 5 years ago

Bump eslint-utils from 1.3.1 to 1.4.2

Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.3.1 to 1.4.2.
- [Release...

6e420f4d279c0171063403635cc14418eade3bc7 authored over 5 years ago

Bump lodash from 4.17.11 to 4.17.13

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13.
- [Release notes](http...

91ef13b933d66052c57a27bd3698e54dc33a9ee7 authored over 5 years ago

Merge pull request #146 from Matt-Soft/master

Update queries.js, added Brave and Vivaldi browser

5f5e067939832b4784a3aaf4c7de61975f39eba9 authored over 5 years ago

Update queries.js

Added support for Vivaldi, Brave on Archlinux.

dadd5e8494c0edbb12ea22188a5344ae16c83c86 authored over 5 years ago

improved vue cli support

3a5a5c627422098ef6c8eb3b7c012a7d49b46016 authored over 5 years ago

config fixes

b95115d1f999ce5b5f4b95563c538b4a89cb98e3 authored over 5 years ago

switched to using vue cli for easier config and tooling

a60ed2bc056b9f806b8d80e07ab68d73c1957c70 authored over 5 years ago

added basic ability to edit categories

663f61ce1556d6b0656e0a9fcc2b97181735b499 authored over 5 years ago

updated aw-client-js

3e5aebe89fa0370b9e385d4b7b0e31f0bd977f0d authored over 5 years ago

fixed a few bugs

1aa56bbc8d68824e981d8a2999a2eb105f9ca1dd authored over 5 years ago

major refactoring (more vuex)

49ad8c94b46765c2fa72dc9f330602e17d8ca96b authored over 5 years ago

fixed categorization stuff to be up-to-date with latest changes to aw-server-rust and aw-server-python

e746643d5322c2ef2a7824836dc804fa37f6e7e0 authored over 5 years ago

fixed bugs, renamed aw-sunburst to aw-sunburst-clock

5d1ac53c23c2c052f5013cdf34b446a75da21d44 authored over 5 years ago

moved daily queries into vuex

9a53d886610166133c3629306566fc04b056ddd4 authored over 5 years ago

type annotated classes.ts

44d17708ba837d282ad691553d75e3bffaf725c8 authored over 5 years ago

improved eslint setup (now with typescript support!)

fc950e70192ddea9f6ae583458b5116909768578 authored over 5 years ago

lots of changes: improved look of settings for categories (WIP), more vuex, added support for typescript, added tests with jest, and more I probably forgot about

5f2a26f8f9bf4e6deec8275fa6c962fbef304e11 authored over 5 years ago

fixed Summary view

3031ecd1716f630937edf69481631ed1df79e62c authored over 5 years ago

improved classifier settings

ba7ba2664a20bdcfaef2f17cacac1d994179d2a3 authored over 5 years ago

added basic settings for editing classification rules

314da269264c36cdcf233ddbe52b1f8cd2c49a93 authored over 5 years ago

fixed ErrorBoundary component

3e51020dc7f11f401dd29fd08d906c32ed4c45d8 authored over 5 years ago

created basic vuex store

199950dc1b2e7b1ca69653ef53e0e8ffb707ca2f authored over 5 years ago

refactoring

8aa24630d8ce53a126b278e52dcc4c4b1c9230a7 authored over 5 years ago

cleanup & refactoring

8ae6cd5c1125a8db43520202b5923720fa434899 authored over 5 years ago

massive refactor, split up ActivityDaily into subroutes/views

7effc781b5e3390105e44c072401a411c7482c74 authored over 5 years ago

Merge branch 'master' into dev/classify

9e400b56f4c1b7de00c6963e88e1205a24defd7d authored over 5 years ago

comments and changed default classes

05f89db2b8bda46b56b555b44481bd9b66ed41d3 authored over 5 years ago

fixed category hierarchy bug

a4952cea962fb63f8d709c7e3bb3198c2384cf59 authored over 5 years ago

added prettierrc and ran it through some files

9536e638700431c162a7df76ebf178534e6e2d44 authored over 5 years ago

implemented basic classification visualization

5d89067f79899a9da9307e4fbc6a01ed0ba35f86 authored over 5 years ago

fixed excessive semicolon at end of query (breaking recent version of aw-server-rust)

c29c1cc22c8fa837dbe68b124566d60ece2b8d82 authored over 5 years ago

added more duration options to dropdown

282f727eb73aba1b38edf6f5d11276a2ac38bac7 authored over 5 years ago

Add brave and opera to browser appnames (#131)

Add brave and opera to browser appnames

aa49bfc870d0bcdc8d869152325b90dc4a14170c authored over 5 years ago

Merge pull request #144 from ActivityWatch/dev/dependency-update

Dependency update

7f41197d70263e81f3ff9558567bcd35ac4c014e authored over 5 years ago

Update more packages with npm update

d0e4eef13bb96fb989c03c070b620951c7078b93 authored over 5 years ago

Update aw-client-js

82ee56764ec97d0ba645ba5885c3a928705b701a authored over 5 years ago

Updated dependencies with vulnerabilities with minor version bumps

55e4b37cec2877f5888523b1d3ea0bcb56623fd2 authored over 5 years ago

Update dependencies with vulnerability which only need patch version bumps

f2e045399538b5f9973ce047ea590c6bbbec1a61 authored over 5 years ago

query: Add brave and opera to browser appnames

7646729793b451e349b7b3e223884a9e5837e1b0 authored over 5 years ago

Merge pull request #142 from ActivityWatch/dev/android-total-time-fix

Fixed 'Active time' and aw-periodusage on Android

92078f4eb318f2fd74988dbe90070f5afa294b47 authored over 5 years ago

fixed 'Active time' and aw-periodusage on Android

5e27387fcc3b285bc3e20365e87a9b7b78cb5882 authored over 5 years ago

Combine data from multiple browsers in Activity view (#141)

Combine data from multiple browsers in Activity view

403f3907419de0bc7ed2183ca7d6716fd0cdc621 authored over 5 years ago

logging/warnings cleanup

860301f6c9383abea8a48efcc1fd76707c9738c2 authored over 5 years ago

removed redundant query if filterAFK is set to false for browser query

327648261c253bb7ad314a765a50e9f39e956666 authored over 5 years ago

minor fixes to browser query

8b301f53fd7855772440d272ccc49534522560db authored over 5 years ago

move appQuery to old location in file

926304edf9ec7ce5b93d6db4e6a14d0c125eef52 authored over 5 years ago

improved browser query

e7d8e357c894153daea4aad8320690e14dd8bd17 authored over 5 years ago

fixed support for multiple browser buckets

c58e94d9367ac6ae22069649e6f747b1f6af6655 authored over 5 years ago

Merge branch 'master' into dev/combineBrowserData

33853919f12d461f01208d770f3f93539a8b9a3e authored over 5 years ago

Summary view with Weekly, Monthly, Yearly (#139)

Summary view with Weekly, Monthly, Yearly

b72831ec54cacee5a9f633669d16c1511aa32aa7 authored over 5 years ago

updated package-lock.json

c642b00ea7a212c66c196e40cbf65a02d87058fb authored over 5 years ago

improved icons in header

5c5a8a7be1c9ccd4220cfb760c40d424caf0a13f authored over 5 years ago

improved styling of Settings page to look better on mobile

29edde2b9567a2aad2d08d154a6b9cd963a1fd8a authored over 5 years ago

updated aw-client-js with increased timeout

34666330a84eb6493f3b967da151b4789bb80797 authored over 5 years ago

Merge branch 'master' into dev/weekly-activity

078c4dbd81c01ae3104a743ed923313609b285e3 authored over 5 years ago

Merge pull request #140 from ActivityWatch/dev/android-fixes

Added fixes for Android

af4441b68fc1607c54b19552a16139d1aa0bc57d authored almost 6 years ago

added fixes for Android

d2657891fe3d318c7d96f3f7d05d2616dc3b1d6b authored almost 6 years ago

Added Summary view

925c1d5e8603e548fcb5a7961fa4fef65904d4cd authored almost 6 years ago

Merge pull request #138 from ActivityWatch/dev/new-header

Redesign header

9367cc5d05280fc64fefb9d3583fac9dbd08554c authored almost 6 years ago

Redesign header

382dd840ee421f07c0e3241ae400ca8c9557d001 authored almost 6 years ago

fixed new header to work on mobile/small screens

cf8cb7945c2ab59bcdd02b6af3a0172e4c88ba37 authored almost 6 years ago

further improved styling

cf52daa134b65e806deadeb22bea6c5b811428d3 authored almost 6 years ago

Move header to seperate component

5ad8133e5e4cc89afbb16e58564319d6ce7b4110 authored almost 6 years ago

Merge pull request #137 from ActivityWatch/dev/startofday

Settings view and startofday setting

c1201092efdb174a7ec120ad0af8e736821bd1ab authored almost 6 years ago

Add settings view and startofday setting

4e3dab9670fbac05a70adbaf044fa987e53b65e1 authored almost 6 years ago

Fix broken query

f64b92fae9f9e1d1f4522b0a827d47167b381605 authored almost 6 years ago

Merge pull request #135 from ActivityWatch/dev/timeline-plus

Switched from (unmaintained) vis.js to timeline-plus

402c8679c0041cf19ee770d226f80df366e34831 authored almost 6 years ago

Merge pull request #134 from ActivityWatch/dev/query_string_escaping

Escape bucketname strings

8bf7ae350d89c5ed3d100b110b5710f0ee71df0d authored almost 6 years ago

moved timeline short-duration event filter step to earlier in the process

28d3b375e938101f66854d60efb40e1ee730ccfe authored almost 6 years ago

switched from (unmaintained) vis.js to timeline-plus

8b8e21c5bd4f3065e92bdcd218b1af3fa83cca24 authored almost 6 years ago

Escape bucketname strings

334320419408efb5d484b57968d56ff20ae5e505 authored almost 6 years ago

fixed issues in activity view for android

55ec58713b99f08f62e3c745eef4d2f4ffdfe57f authored almost 6 years ago

Merge pull request #132 from ActivityWatch/dev/better-footer

Improved footer with more links to the forum

9dbb20f831e0dd2bd4f217844abd9a68eddd12fd authored almost 6 years ago

improved footer with more links to the forum

c9491be907ca5c04ea4acca837cebfb93eabe809 authored almost 6 years ago

Merge pull request #130 from ActivityWatch/dev/stopwatch

Renamed Timer to Stopwatch

3a4be5b1054663a388c4dbe4f6364eaf8c441ca7 authored almost 6 years ago

better suggestion/placeholder for label when starting new stopwatch

227670e27a2e785877cf51657c1a088ea6c0de14 authored almost 6 years ago

renamed Timer to Stopwatch

1822fc41a83ac0f9a298b0d4d78d44b2673f4afb authored almost 6 years ago

Merge pull request #129 from ActivityWatch/dev/odd-bug

WIP: Sunburst view fix

aaf9af9299592bd992f72bb4a0d0a11969114ad7 authored almost 6 years ago

Fix broken sunburst visualization

Hovering on items created a error as it failed to call time.seconds_to_duration

2c9658db9be6e5264c3a3a9a7fe5ca48c9464fcc authored almost 6 years ago

Merge pull request #119 from ActivityWatch/dev/timer

Added basic timer functionality

791f46d55b8d5b1f1f7bef4600e45596f443676a authored almost 6 years ago

Merge branch 'master' into dev/timer

f3a6d5878d9ce5d5e8e0c2180cbfa505ce990fdb authored almost 6 years ago

Merge branch 'master' into dev/timer

0e3c750b7a5d3cf1e4fb4b4cd2162fd968bbc631 authored almost 6 years ago

changed stopped timer 'resume' to 'start new'

74a02721ab5ff8083078cb6ba1b988bb8da9794a authored almost 6 years ago

Merge pull request #128 from ActivityWatch/dev/export

Import and export buckets

0a48eeefe0c413b4bedc71ebd098b8b42fce404b authored almost 6 years ago

Crude UI for importing and exporting

f562879347e32ac8179c1c0e08b8a8235aa19766 authored almost 6 years ago

Fixed so buckets properly exports with metadata

5edb06135e2add4d6eabb6a8eb047e4b6fc0b87d authored almost 6 years ago

Merge pull request #127 from ActivityWatch/dev/android-activity

Replaced vue-html-loader with html-loader

64bcd7d14b957a2e81b9fd689f5478de01d0b47e authored almost 6 years ago

replaced vue-html-loader with html-loader

f686d31508b135808a8ac4f03db2ca019701d79d authored almost 6 years ago

Merge pull request #123 from ActivityWatch/dev/android-activity

Added Activity view for Android, upgraded Babel

eb56c6194e65ce73ab29b868ea8121d936ba5144 authored almost 6 years ago

added webpack plugin to remove log spam

8b926ae4568b4caca2ae031f83b18e8782490ce2 authored almost 6 years ago