-
-
Notifications
You must be signed in to change notification settings - Fork 71
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #36 from ActivityWatch/dev/jinja-fix
updated aw-server version
- Loading branch information
Showing
6 changed files
with
6 additions
and
6 deletions.
There are no files selected for viewing
Submodule aw-client
updated
6 files
+0 −2 | aw_client/__init__.py | |
+121 −71 | aw_client/client.py | |
+16 −0 | aw_client/config.py | |
+0 −47 | aw_client/generate_config.py | |
+40 −0 | tests/test_client.py | |
+48 −0 | tests/test_failqueue.py |
Submodule aw-core
updated
37 files
Submodule aw-server
updated
8 files
+2 −1 | .travis.yml | |
+253 −31 | aw_server/api.py | |
+14 −89 | aw_server/log.py | |
+15 −4 | aw_server/main.py | |
+8 −2 | aw_server/server.py | |
+0 −12 | aw_server/zeroknowledge.py | |
+7 −2 | setup.py | |
+2 −1 | tests/test_client.py |
Submodule aw-watcher-afk
updated
2 files
+15 −18 | aw_watcher_afk/afk.py | |
+18 −0 | aw_watcher_afk/config.py |
Submodule aw-watcher-window
updated
6 files
+1 −0 | .travis.yml | |
+2 −0 | aw_watcher_window/__init__.py | |
+12 −0 | aw_watcher_window/config.py | |
+49 −0 | aw_watcher_window/lib.py | |
+41 −100 | aw_watcher_window/main.py | |
+11 −2 | aw_watcher_window/xprop.py |
Submodule aw-webui
updated
19 files
+1 −3 | .editorconfig | |
+1 −0 | build/webpack.dev.conf.js | |
+1 −0 | build/webpack.prod.conf.js | |
+5 −3 | package.json | |
+76 −63 | src/App.vue | |
+0 −134 | src/components/Sidemenu.vue | |
+5 −2 | src/filters.js | |
+0 −18 | src/package.json | |
+29 −13 | src/resources.js | |
+11 −0 | src/route.js | |
+39 −0 | src/util/color.js | |
+155 −0 | src/util/event_parsing.js | |
+37 −0 | src/util/time.js | |
+67 −0 | src/views/Activities.vue | |
+218 −0 | src/views/Activity.vue | |
+2 −3 | src/views/Bucket.vue | |
+7 −3 | src/views/Buckets.vue | |
+73 −0 | src/visualizations/summary.js | |
+119 −0 | src/visualizations/timeline.js |