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

switched to lazy/dynamic import for component registration (reducing bundle size)

880e9f5c3a2d4592c0b14d1b79fb6419d9855196 authored almost 6 years ago by Erik Bjäreholt <[email protected]>

set testingAndroid variable to false

e812526858bcc9ed3723cecafa30157f5af29da7 authored almost 6 years ago by Erik Bjäreholt <[email protected]>

updated babel to v7, fixed import issues, and did an `npm audit fix`

a7c63e1c2a6c4157ba97da449884164644517467 authored almost 6 years ago by Erik Bjäreholt <[email protected]>

fixed issues with Android dashboard, now almost working

4b05544167b53174620521e7f2f37eef9d1fa994 authored almost 6 years ago by Erik Bjäreholt <[email protected]>

added routing and menu link to activityview for Android

ca94e260d6b7896d783dc3993fdbb7df1388b3d8 authored almost 6 years ago by Erik Bjäreholt <[email protected]>

started working on Android-specific Activity view

4d982297764be07324f8f0f4effbc3989cc36c20 authored almost 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #122 from ActivityWatch/dev/hideHeaderInWebview

Hide header when webview detected

3546c9676fd98dab5a2c848c7f3d810051f234d9 authored almost 6 years ago by Erik Bjäreholt <[email protected]>

fixed bug, removed excessive dependency

1405da1e890b508aed23c6d9497647bf0337ff50 authored almost 6 years ago by Erik Bjäreholt <[email protected]>

hid header when webview detected

3d41a539cd73c50fd475eaf82576e9af2b140423 authored almost 6 years ago by Erik Bjäreholt <[email protected]>

Update bootstrap to fix vulnerability

b9193f85fc01ff5fcbe78c6b614cab36c7c5398c authored almost 6 years ago by Johan Bjäreholt <[email protected]>

Update jsdom to fix vulnerability

4a2f6048a16c646e15288cff58fabf31262ae941 authored almost 6 years ago by Johan Bjäreholt <[email protected]>

Update sass to fix vulnerabilities

0af6d2a6ed8ff194e0b057904ffdcf36a8dfa0cd authored almost 6 years ago by Johan Bjäreholt <[email protected]>

Add vulnerabilities badge to README.md

3152af6d72f31d4a224f6c188aaee52f6081658a authored almost 6 years ago by Johan Bjäreholt <[email protected]>

Update aw-client-js

5db7fe6d8e4271bb2094c3933d00862d17020947 authored almost 6 years ago by Johan Bjäreholt <[email protected]>

Merge pull request #121 from punchagan/firefox-nightly-query-fix

Include Firefox Nightly in the Firefox app names

e9eda98e6eb99d3416047da59d08de1261f34c28 authored almost 6 years ago by Johan Bjäreholt <[email protected]>

Include Firefox Nightly in the Firefox app names

3ae42cccc3f0043f0aac9c48ad561a235dfe9d55 authored almost 6 years ago by Puneeth Chaganti <[email protected]>

added note about important missing feature of setting start/stop times

3d2d192428d3a69903ab6273096b5b03aab264c1 authored almost 6 years ago by Erik Bjäreholt <[email protected]>

moved delete bucket dialog to modal, changed export bucket button to proper export API endpoint

e4400526b17bb28771f8b9af086dca9fc05dc49e authored almost 6 years ago by Erik Bjäreholt <[email protected]>

moved stop/delete timer methods to TimerEntry, added resume

b170fa8607baef412a541963261ec7354f7078b0 authored almost 6 years ago by Erik Bjäreholt <[email protected]>

added EventEditor component and improved Timer view

aa45117a7284edf59a800d274e9c8bd07473f331 authored almost 6 years ago by Erik Bjäreholt <[email protected]>

fixed styling and stuff

eb482ccd5abd92f20580de9261dc87c0b3ee06db authored almost 6 years ago by Erik Bjäreholt <[email protected]>

added basic timer functionality

dab12d3631d7ad43b17a55e4361b1ff6b2a9f344 authored almost 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #118 from steventrouble/master

Fix git copypasta error.

8ab6f6512b115c9297a8be3cba40e0da43ad067b authored about 6 years ago by Erik Bjäreholt <[email protected]>

Fix git copypasta error.

I am very embarrassed. I committed and didn't amend it correctly, and it broke the build.

As ...

2f5e70429ffec43ca7cfd5c9454123a79283c3bf authored about 6 years ago by Steven Weiss <[email protected]>

Merge pull request #117 from steventrouble/master

Fix bug where activity view doesn't use timestamp.

27d4b06be2bcb1afe1c404ebe90ee3cc6a752dfe authored about 6 years ago by Erik Bjäreholt <[email protected]>

Fix it for real.

4daae094eefb3a55799c032fb5e99131e84cbbdd authored about 6 years ago by Steven Weiss <[email protected]>

Fix bug where activity view doesn't use timestamp.

The date() function returns the date in the URL directly, which doesn't use a timestamp. This me...

8c23586c0ae0e7192db69c558286e5996bfee556 authored about 6 years ago by Steven Weiss <[email protected]>

Merge pull request #115 from ActivityWatch/dev/another-browser-appname

added Chromium-browser-chromium

a72493815801cf30cfddf00aa983057589590ae8 authored about 6 years ago by Erik Bjäreholt <[email protected]>

Merge branch 'master' into dev/another-browser-appname

b27c8de83ae4d1a9ddbf1f6706dd2d2d4c3e2000 authored about 6 years ago by Erik Bjäreholt <[email protected]>

added Chromium-browser-chromium

8a2d059c006564a517dd693f4ddcc863efeba194 authored about 6 years ago by Erik Bjäreholt <[email protected]>

Rename .github/ISSUE_TEMPLATE/ISSUE_TEMPLATE.md to .github/ISSUE_TEMPLATE.md

bf89c7e5c1ecce10acc5a9ec25ee374324e5874c authored over 6 years ago by Erik Bjäreholt <[email protected]>

Update ISSUE_TEMPLATE.md

de6988a21daed46ede94f838ea90cd93d0da1e5c authored over 6 years ago by Erik Bjäreholt <[email protected]>

Rename issue-organization-notice.md to ISSUE_TEMPLATE.md

2449b06b0dc6a4bf83b23f47b18bdeed05224c17 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #113 from ActivityWatch/ErikBjare-patch-1

Update issue templates

decb47524f9499460cfd12811d04c212105dc80b authored over 6 years ago by Erik Bjäreholt <[email protected]>

Update issue templates

1e4a85c694760c4935b6c4aab3f1eb255e14cffa authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #111 from nandryshak/master

Add support for Firefox Beta/Dev, and Chrome Beta/Unstable

d0a0015be7c86f8cff25e1b8a7949ca8bbc6febb authored over 6 years ago by Erik Bjäreholt <[email protected]>

Add support for Firefox Beta/Dev, and Chrome Beta/Unstable

769cb613f23554af720e45023c2d5abc254b6991 authored over 6 years ago by Nick Andryshak <[email protected]>

updating to latest aw-client-js commits

04eb304ea1c4e0ea6ef81ff8b25b09eb566326d9 authored over 6 years ago by Nicolae <[email protected]>

Merge pull request #110 from ActivityWatch/dev/npm-cache

Added npm cache to travis conf

af9a3beed5f346b0bac5d16d9152a2e25b7b6879 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Added npm cache to travis conf

Should speed up builds

926cf5990f050c9d6ef8697d20729e372f797767 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Added button 'All' in Browser Bucket to use, which lets you see combined data and set it as default

092ae6fec407e5ef0eb8f450a0945d7427ce8bf7 authored over 6 years ago by Nicolae <[email protected]>

fixed conflicts

d3dbda38eb8e15bce306ccd3424c20571b12128c authored over 6 years ago by Nicolae <[email protected]>

clean up of query

bc273fcc8898a09db364105d4dfa81c1ae591d08 authored over 6 years ago by Nicolae <[email protected]>

Merge pull request #107 from ActivityWatch/dev/cleanup

Cleanup

7221a4a75f463630349267a3e6864a9e3a1c5c77 authored over 6 years ago by Erik Bjäreholt <[email protected]>

cleaned up console.log

d83107134fa53746a930b7081e75d9fc4b879c2c authored over 6 years ago by Erik Bjäreholt <[email protected]>

cleanup/refactor

1f3a71761b6831ad5198ad6f662f0dcfd90fd065 authored over 6 years ago by Erik Bjäreholt <[email protected]>

moved ErrorBoundary into components subdir

6e2223700663c2fd03906e8dec8e04df24bfa4ad authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #106 from ActivityWatch/dev/input-daterange-component

Basic input component for time intervals

4ffee12120450dd975462b8a8d8b6db45c183f00 authored over 6 years ago by Erik Bjäreholt <[email protected]>

added queriedInterval prop to vis-timeline

f5fc6c6ab26c770b20bf3b7605e2fad52c67874f authored over 6 years ago by Erik Bjäreholt <[email protected]>

fixed incorrect handling of timestamp timezone in tooltip

f4f64c19d3abf4daef8d174a1f88feb02fb6bf60 authored over 6 years ago by Erik Bjäreholt <[email protected]>

added daterange support for input-timeinterval

133929f5b46c5f403239d6c8a6b959ecd50e7697 authored over 6 years ago by Erik Bjäreholt <[email protected]>

improved styling in input-timeinterval slightly

f6652a268a1d96d1dc9c2f3a56c8fe3b99f0737d authored over 6 years ago by Erik Bjäreholt <[email protected]>

renamed input-daterange to input-timeinterval

7ec56e79a0abc25465e08368240dd155353d49a7 authored over 6 years ago by Erik Bjäreholt <[email protected]>

input-timeperiod now working properly

2b5ccb6c02e4e7fbcc6930a886363bcd75634658 authored over 6 years ago by Erik Bjäreholt <[email protected]>

working version of a query for two browsers

432061d308beaf1ca962c6de4f86a561b57c3780 authored over 6 years ago by Nicolae <[email protected]>

implemented very basic daterange component

643cfe0c7cd952d9dd582b65012b81cd2249d1de authored over 6 years ago by Erik Bjäreholt <[email protected]>

First attempt at merging browser buckets

a781144f4ae9a2e4a27172f9044ea3aa181298a8 authored over 6 years ago by Nicolae <[email protected]>

Merge branch 'master' of github.com:ActivityWatch/aw-webui

12e8054173017297308ba71fb2892c46dd8a24f4 authored over 6 years ago by Erik Bjäreholt <[email protected]>

moved timeline to seperate route/view

474817039b24d9c2352f74bc8e3a6028dee06def authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #55 from ActivityWatch/dev/content-security-policy

Started working on Content-Security-Policy

3bccf8e850a48000ffdafb37ea91591972c4e2d0 authored over 6 years ago by Erik Bjäreholt <[email protected]>

removed Node 6 from Travis conf

212c004dc5f2fb0963e0c3aa82d44baf3d101b41 authored over 6 years ago by Erik Bjäreholt <[email protected]>

fixed CSP policy

b245ef7ee0230ec0675b9566dd03d2322802926f authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge branch 'master' into dev/content-security-policy

61eb22d26d8e384ffd8505ef9177e6a51c0fdb3d authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #99 from ActivityWatch/dev/errorCaptured

Implemented ErrorBoundary component for cleaner error handling

73c783a76ab2dd53416843de0aae794dde68a1ec authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #105 from ActivityWatch/dev/timeline-editor-support

Added proper support for editor buckets to timeline

410b5597c8e381011f54efcc30e51edc41c681d3 authored over 6 years ago by Erik Bjäreholt <[email protected]>

fixed handling of errors without errorBoundary until it's properly fixed

4bf783947f2f45d578b3ba0f94f9a6e8d79110a5 authored over 6 years ago by Erik Bjäreholt <[email protected]>

added proper support for editor buckets to timeline

bf4739c53ef83ad673aade0baa2b6e0f19f14224 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge branch 'master' into dev/errorCaptured

0491ae32121cdc75d01b725882a499fafcb07273 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #104 from ActivityWatch/dev/v-on-bind-shorthands

Switched to using v-on/v-bind shorthands @/:

ea6c350e11a2e3e70e1fa32488250b3141638142 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #103 from ActivityWatch/dev/editor-summary-fix

Fixed editor activity

30b4358c1a96889896623c2fbc6146e903975e9b authored over 6 years ago by Erik Bjäreholt <[email protected]>

$ find src -type f -print0 | xargs -0 sed -i -e 's/v-on:/@/' -e 's/v-bind:/:/'

43904748181ab981dea45019c05681469089cbb3 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Fixed #101

5b61d856303b5f27bf3d907bf24bab07d3968673 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #100 from ActivityWatch/nicolae-stroncea-master

Highlight menu items when clicked

5edfc64d6ff5105349f39e4dcf368f997e648f2a authored over 6 years ago by Erik Bjäreholt <[email protected]>

Revert "'Show less' Button once there's no more data"

This reverts commit 4ded344e8e30972181ea428031886918ddd64b34.

55be8ebd823dc4a171dc2c63bea6eed307f062fc authored over 6 years ago by Erik Bjäreholt <[email protected]>

simplified active view highlight

6e992122c3f6b8bf87f34511cbc3b08c172c5a7c authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge branch 'master' of https://github.com/nicolae-stroncea/aw-webui into nicolae-stroncea-master

93a11c5fff444b41d54375128bb0bf7d6dcb2add authored over 6 years ago by Erik Bjäreholt <[email protected]>

added link to ErrorBoundary source

9534ab882c729bb1ebf85ea2a4bdc5060502f678 authored over 6 years ago by Erik Bjäreholt <[email protected]>

added ErrorBoundary component and wrapped Activity view in it

7ca3442c4745f0d258c6535ddd958f7f890ef6c1 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #97 from ActivityWatch/dev/new-awclient-and-async-and-timeline

Fixed new aw-client-js, timeline visualization, babel preset update (async/await)

3e4fefc6ab6fa2f24e7b83c7ca15bb832234ad88 authored over 6 years ago by Erik Bjäreholt <[email protected]>

updated aw-client-js to master branch

1ce25834f9faeb19608ae710ca60c9fcda43a3c0 authored over 6 years ago by Erik Bjäreholt <[email protected]>

refactored and sanitized strings to prevent XSS attack

0657e1af3fbaaabfe656e4a2c483cea76be14041 authored over 6 years ago by Erik Bjäreholt <[email protected]>

linted vue files

11c1d068f09cf6d2de2e08769d2c968044dffe32 authored over 6 years ago by Erik Bjäreholt <[email protected]>

added eslint and fixed eslint errors

797624756bc3d7982c853d74042f5ea99299b39e authored over 6 years ago by Erik Bjäreholt <[email protected]>

fixed some colors and overflow in timeline vis

269e18b6730f07d96f5fee677fa8b2526350052b authored over 6 years ago by Erik Bjäreholt <[email protected]>

switched to using typeface-varela-round package for varela font

a21a7b8e15ddaf0191d84340a20ec548efc43149 authored over 6 years ago by Erik Bjäreholt <[email protected]>

fixed build when using git version of vis

27ddb44c8d7c72e66a715c7974918c507a46eb53 authored over 6 years ago by Erik Bjäreholt <[email protected]>

rewrote one of the queries as a multiline string

bd5deab86b03d2f9ed75ebc4af114ad622100674 authored over 6 years ago by Erik Bjäreholt <[email protected]>

completed implementation of vis-timeline, refactoring

96c4c7c82b8c9b9cf668eecf926caa0a272786bf authored over 6 years ago by Erik Bjäreholt <[email protected]>

added WIP vis.js timeline

5b32bf547ebb7669152a868d8d1fcaeb9a83d7c5 authored over 6 years ago by Erik Bjäreholt <[email protected]>

fixed bug when URL wasn't parsable

6d603854495af96080c4cc56b4d6cb1d4672418d authored over 6 years ago by Erik Bjäreholt <[email protected]>

updated aw-client-js

1e189479dea6103bcd840ecf5e292be0c790601f authored over 6 years ago by Erik Bjäreholt <[email protected]>

sometimes show row labels in timeline visualization

d9d22fc80aa17e42dee5bcf61d6cad13c8fd3462 authored over 6 years ago by Erik Bjäreholt <[email protected]>

added timeline to buckets listing, refactored, registered components globally

376c56e750497b7f2c42891f85e00c5d49d7851d authored over 6 years ago by Erik Bjäreholt <[email protected]>

fixed timeline colors, added option to specify how many events to show

fbc4df1a77ba2f8c0c2809cf3bb95f4a589c74ce authored over 6 years ago by Erik Bjäreholt <[email protected]>

improved tooltips of timeline

0b142825e38aae24b907c65d827d3099a243f18b authored over 6 years ago by Erik Bjäreholt <[email protected]>

several changes: new version of aw-client-js required change in calls, started using async/await, trying out Google Charts's Timeline visualization

619ff49595119726c9fd3dd4f9d85acde5cb21aa authored over 6 years ago by Erik Bjäreholt <[email protected]>

Merge pull request #96 from ActivityWatch/dev/periodusage-datefix

Fixed wrong date on periodusage hover

f70c9558ce664fa7bc848885dd7153e5cdaa9c9b authored over 6 years ago by Erik Bjäreholt <[email protected]>

fixed wrong date on hover

97285f6a17f06f19f171bb89969083128bacdc33 authored over 6 years ago by Erik Bjäreholt <[email protected]>

Go back to first 5, Show 5 less, Show 5 more buttons implemented in Summary

317521d6caff41e54564962f8338d76d06059421 authored over 6 years ago by Nicolae <[email protected]>

'Show less' Button once there's no more data

4ded344e8e30972181ea428031886918ddd64b34 authored over 6 years ago by Nicolae <[email protected]>