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

updated submodule

9a5ec8243f45f155a8c393f27826a7d77a1e9073 authored over 5 years ago

updated aw-webui

c01ffd939b718c55152ffb81da55217ab8d799e6 authored over 5 years ago

updated aw-webui

1265420f76d9157ad1affa4eaac594d4831863be authored almost 6 years ago

removed Python 3.5 from travis config

39026b3718483657960f472488a4fd8e3b27c352 authored almost 6 years ago

requirements.txt: Set jsonschema to 2.6.0

8c8a26f3a4a92042c2b68f0dcefe0d5e223cd910 authored almost 6 years ago

Removed --upgrade from pipargs

04e8281dac5a9def2b93c097475f462325606f69 authored almost 6 years ago

Pipfile.lock: Set jsonschema version to 2.6.0

c5ab0d78bf8108d410bf03286311e2c2a1ad1a94 authored almost 6 years ago

removed rebuild from `make package`

1da396f89892c2c5b05770a2289a3896e54aabca authored almost 6 years ago

another test fix

ae1a741bd1cd67b20d2b47ad62365badb22b7bfd authored almost 6 years ago

more test fixing

1e0997983ffd5729c39a5ea5def26d401d5c2b6a authored almost 6 years ago

another shot at fixing the tests

7a903b802e0978e9dc7596c85bbc270089fad02b authored almost 6 years ago

cleaned up tests

c1ba0da2a579a0a0a63a3b319508910a037e868f authored almost 6 years ago

fixed removal of cache files in Makefile

ad6015731ea5fd41ee9180e88e5b32932ec98eba authored almost 6 years ago

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

8bc758cd37da4fc50d25fef279121b99e89dcaf7 authored almost 6 years ago

added workaround for https://github.com/ActivityWatch/activitywatch/pull/274

edb7730eeec574480f424691e9a62a13d2de0f84 authored almost 6 years ago

Merge pull request #51 from ActivityWatch/dev/better-tests-and-pipenv

Improvements to testing, benchmarking, and tooling

c86f4c407ac1770e7e25dd554092f0c6d84ad008 authored almost 6 years ago

added ignore flag for vulnerability in numpy that for some reason is installed in travis

b93db4dcad600bca70714bf0d61065bba4b77a90 authored almost 6 years ago

cleaned up testing code

69bd277ebecc866667a994a1d5cd183424faa36e authored almost 6 years ago

added pipenv check to Travis, updated dependency locks

b81615e9497596f9b2d49e6afdeedb353d39b2ae authored almost 6 years ago

removed debug-print

eb4a229917c0ad2349431f79173435d2bb0505b8 authored almost 6 years ago

moved unecessary use of `pipenv run ...` out of Makefile

f86f54f34f684cfdfa6ba8a093ba4e7fb3cbacbe authored almost 6 years ago

disabled test

0ab7b83c7c72f1ebcdef7e90b1ce723ef1f6607f authored almost 6 years ago

[travis] commented out unecessary env variable

dd7d22fc1086fe48964ca6427f02c892019e1721 authored almost 6 years ago

skip building webui in Travis

e650ab75a9e8743f8cc1b87141f27833c3786bf2 authored almost 6 years ago

removed pymongo as a dependency and updated dependency locks

5dd623b2f3cc5a4ac21563b67335fb9b5aaec706 authored almost 6 years ago

Merge branch 'master' into dev/better-tests-and-pipenv

44c6b8764f6a338c47beb17b796a456ed4c49db1 authored almost 6 years ago

Merge pull request #41 from ActivityWatch/dev/import

Implemented import API endpoint

f7b510311507819b215063e61c1313cf028e6198 authored almost 6 years ago

Add HTTP header to export so it's downloaded as file from browsers

daa9e0b672eb0999874463360cd10c81163623af authored almost 6 years ago

Allow bucket import from browser forms

e35fda282af220a48e521e325546caf580b35dbc authored almost 6 years ago

Fixed mypy issues

a42dc6a14e9b50117a5f7f0313b632f0332c09cc authored almost 6 years ago

Made exports/import consistents, no longer following aw-core schema

09519eefa102c7ab06465f8a0d8ae29e9ac39977 authored almost 6 years ago

Fix mypy typecheck

d7bd78105d1e13f27eb7f68f1440ab05549daab5 authored almost 6 years ago

Made import/export data consistent as defined in aw-core schema

f98ed55415776974d101b1cdfdcaa8233a1be7d7 authored almost 6 years ago

Update aw-webui

1ab2ed4346eacc86f39de60635a1a34b2e4c6f21 authored almost 6 years ago

Merge pull request #54 from ActivityWatch/no-threading

Disable threading in flask

49d0e4240e43381e243dd4fa1b5c7d784fadf355 authored almost 6 years ago

Disable threading in flask

56ef2d728850852cf2c46dec32f036627095b424 authored almost 6 years ago

Merge pull request #52 from jamesa/patch-1

Fix broken link to documentation

a6e6e5fffba817bdd9199dcd6b78d9d8ce5792de authored about 6 years ago

Fix broken link to documentation

04dd466e2636c7e48ac2af3a5ffe8286419d39ba authored about 6 years ago

updated aw-webui submodule

564d1dc3055f113307b21bc4f506d33f4a927e3d authored about 6 years ago

improved tests and added installation of dev dependencies

a886b7dbbcbc75ad79f9a1de7f017560c9e8b788 authored over 6 years ago

added installation of pipenv to travis conf

821cd3bed6b6a229c98ebfea38bf9901fb321e17 authored over 6 years ago

added Pipfile, started working on pytest-flask tests and pytest-benchmark benchmarks, better requirements.txt locks

8aea905bd59f7b9a691a56a5e4e0aea04197488c authored over 6 years ago

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

b723b3b74237fa9ee3703a0a3f5fd1811d9b0524 authored over 6 years ago

fixed versioning, updated submodule

9dc1a33522798b35561811b0a19e788ca0c9c822 authored over 6 years ago

fixed bug in import

f348488a2403c36c256ce29f1158f77de4ebcae6 authored over 6 years ago

fixed unsupported use of f-string

d1198a9a70ef26782c0c9434176c622a1927c67e authored over 6 years ago

Make aw_webui re-build even if already built

68b77d50ca5a8c28e4d205862727fbba9f0a2c4a authored over 6 years ago

implemented (untested) import REST endpoint, fixed API spec

ba4f83306d4ad5cb50388b096a47e397b7b944f0 authored over 6 years ago

Merge branch 'master' into dev/import

4f7aac3e221de98901b6916db10f48edcbb0558d authored over 6 years ago

updated aw-webui

c6433ea9536298c01b1e9f1693d29bca4b2676fb authored over 6 years ago

Merge pull request #47 from ActivityWatch/dev/version-fixing

Version fixing

84f0f969b99d6a8f48bed6d8a1cd28d13e8515db authored over 6 years ago

fixed Python 3.5 compat

5e36cb79e370a303c484d8f3a1bf906fc30a6eb2 authored over 6 years ago

fixed clean target

7c26485bbeb10eb9c5fbd2f383fbcbed76ec0cb6 authored over 6 years ago

fixed version stuff

69b3b8308d95cffa6283422f0afd652e81901b9f authored over 6 years ago

updated submodules, manually set encoding when loading files in setup.py, solves: https://github.com/ActivityWatch/activitywatch/issues/209

3cc75a507f122bad0cde53fb441468c95b9f70fc authored over 6 years ago

fixed version detection in CI builds

c0cdf57f3f3b3007e81c16668369b08edc2ec06b authored over 6 years ago

switched to node v8, updated submodule

ae7d3d8159e9229befcbc29232355409f55effaf authored over 6 years ago

fixed test

48563d7a89b3eec8e99554947e78ff1bbe4b01c5 authored over 6 years ago

added autodetection of version

416705d82595076aed395fdfda296a8389dd935a authored over 6 years ago

Makefile now only builds aw-webui if not already built, updated submodule

1e33aa3d63039f616147581b5c14419555f6dc6c authored over 6 years ago

Merge pull request #46 from ActivityWatch/dev/heartbeat_cache

Attempt at heartbeat cache

8c186ef4dda083aa98dd249c51e0846bdbb3b3ad authored over 6 years ago

Type fix

9f18623b1202fe421a2c982e4085a235ee96bdc1 authored over 6 years ago

Attempt at heartbeat cache

1b445a00da5a1e8025c16ad5110a497854cbadc8 authored over 6 years ago

updated aw-webui

87eaa21b2964d9fdee2c21185cb201ada9b7ac36 authored over 6 years ago

fixed CORS origin for aw-webui allowed in testing

6c2ca43655fb2913b157ee079037e3a6fb788975 authored over 6 years ago

Merge pull request #45 from ActivityWatch/dev/requirements-fix-and-versioning

Added versioning and fixed issue introduced by pip 10.0

9e6473ddca66108c4617d986b702efcfa02fff46 authored over 6 years ago

added pip upgrade to CI

ddc07e60ca7ac0c734aa6c9281b316f14f81c559 authored over 6 years ago

added `make package` to CI

3a5f8ca14f36e6a45ab86a97fe6e5cd234e169bf authored over 6 years ago

exposed version through REST API

e1a64be1dae8bf86988c9ff910ad73da8a490489 authored over 6 years ago

added proper package versioning and fixed issue introduced by pip 10.0

2a1f2c4f4f3a35792ad6b2995c6da914e304558c authored over 6 years ago

Merge pull request #44 from ActivityWatch/dev/cors-origins-arg

Added cors-origins CLI argument

52a13b2408663ac3877eb8ed8acda1e4ba7a40c2 authored over 6 years ago

made testing CORS much stricter and added configfile support for the cors_origins setting

081b2f2c3a4340207e266f6d0be797856b1496e5 authored over 6 years ago

added cors-origins CLI argument

81f53d2f5bbe1ffb45cf17984004a698db4a965e authored over 6 years ago

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

6cee40f9073bdbf77f24e06ee88cd220f5291613 authored almost 7 years ago

updated aw-webui submodule

90dca5aeaf4cb4992c35039d020d2dc782e58009 authored almost 7 years ago

Merge pull request #40 from sacline/filter-future-events

Filter out events from the future

160b5deb78683cb2f04408bf1790daf241e1ecd7 authored almost 7 years ago

reduce debug message generation during tests

By changing the start times of event generation, there are now less
warning messages generated b...

35f11d2d7207ae1f219c170f43f4bfaf377beabf authored almost 7 years ago

remove exception raising for events in the future

9c27da0c3734a1f5fc2d6aca19dcfab11c6afce4 authored almost 7 years ago

query2: print handled QueryException

5a6b1c62fb5b898eca4289a60b783e1c1f5e1a72 authored almost 7 years ago

Merge pull request #42 from ActivityWatch/dev/query2_errormsg

Added errormsg from query2 exceptions to payload

38b31c615b14e1feb99dda29e8cc4db777dd005f authored almost 7 years ago

Added errormsg from query2 exceptions to payload

6abfbb019db7b053828d49bbc784b43678f848d9 authored almost 7 years ago

started working on an import API endpoint

3126644d98bb0c680c370d51125cb98801cb83d1 authored almost 7 years ago

updated tests to work with future events filter

ceb08e8c786440b07ffd5a103efcebfbd373f4e6 authored almost 7 years ago

added check for events that reach into the future

Events that have a timestamp + duration greater than the value of
datetime.now() will be removed...

ff2843eca1c0dc9df2df327668378f9c7f019242 authored almost 7 years ago

Test that future events are filtered

This test is written for a future update that will prevent Events sent to
aw-server from being s...

df991270198e7d02c4f1869df125d2b62bcf00b3 authored almost 7 years ago

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

6665f0fb126c65eec8f188c8fb46f0d21c9c1a34 authored almost 7 years ago

Merge branch 'dev/delete-event'

3d7f515dec8b1def40ba97dd2f70a2af620f9677 authored almost 7 years ago

Merge pull request #34 from ActivityWatch/dev/export

Added basic export API endpoint

8dc4c878e0b5711d9f9661208436827b0d01e4a2 authored almost 7 years ago

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

02da5d4f3880456ddf304cb68dba61389ca5c7fa authored almost 7 years ago

increased available time before failure for time-sensitive test

7e78be2d6ea079de5a32a06db99f67eee8ec6996 authored almost 7 years ago

query2 new timeperiod api

eb2cf7749f647b6ba69aa4e7141dc7c6700657fc authored almost 7 years ago

disabled JSON logging and added log error for 'address already in use'

9182eafc926d847971d746d9b7ac380b58a2f851 authored almost 7 years ago

Merge pull request #35 from ActivityWatch/dev/transform-next

WIP: transform-next

076afaa51fb962558e1c618f09770147949b8674 authored almost 7 years ago

fixed imports, updated aw-webui submodule

ffa73198127fd378308bef5582eed0c392b34231 authored almost 7 years ago

import fixes

0ce4c728b0793526462e05dea74fd0f18fa35484 authored almost 7 years ago

Added eventcount endpoint

babeb6062f22a7e7028abd0fc149910808b237ce authored almost 7 years ago

Merge branch 'master' into dev/export

da85bbe1119eec31d36b1076019393c57817b22e authored about 7 years ago

implemented delete event endpoint

80c6f0b96cd3cf4918287643e36a2d4c20fde72a authored about 7 years ago

Merge pull request #38 from ActivityWatch/dev/no-pretty-and-costly-json

disabled JSON pretty printing when not in testing mode

3d0ec9cf548cded5770fefe5b170bec17faaee77 authored about 7 years ago

Merge branch 'dev/transform-next' of github.com:ActivityWatch/aw-server into dev/transform-next

4373327459010d429dc0cf8a0163855d3c11b957 authored about 7 years ago