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

Merge branch 'dev/heartbeat' of github.com:ActivityWatch/actwa-server into dev/heartbeat

2bea0d6070315504a5659c7cf19514b83f8c979e authored about 8 years ago

Fixed spelling error

aaf70b61ff57815e4464045a8ba8b5b5f2f0e19b authored about 8 years ago

Updated test_client.py to use new aw-client api

4079f06fe7c490777f494ce07214e2058999c9cb authored about 8 years ago

Replaced checkBucketExists with checks that returns 400 if doesn't exist

90b402f8f086f723003eea40a5d3f7440292306f authored about 8 years ago

removed support for count in heartbeats

4925374da50006d896c8459840cb4d04df50847a authored about 8 years ago

first working version of the heartbeat API

77119c8574b75b9c3faf1f6dab395537cc780b63 authored about 8 years ago

added boilerplate code for Heartbeat API

87d22f61e458f03b8a3efcd8485fbe41bfc5d4ca authored about 8 years ago

integrated unified logging, did some refactoring

9ad5d970518f6c632db08d1b31c50d0451c4f146 authored about 8 years ago

Re-enabled duration field in restplus event model

7eedd2b7561a559ab299fbe877a73c241bfca49b authored about 8 years ago

Merge pull request #17 from ActivityWatch/dev/views

Views REST API

975e357772926c9b4ae991e86092f5524f10d574 authored about 8 years ago

View APIs now handles 404s better

View APIS now have docstrings
QueryView now handles QueryExceptions properly

2bed46ff6bf192d6dc2fb26d1b40317e8ebd5293 authored about 8 years ago

Merge branch 'master' into dev/views

0cd517a22be9561b9e2b20513ff869a699ef5a46 authored about 8 years ago

Removed redundant import

5e08dfe55dd77e01258c29be04524349c8d965b4 authored about 8 years ago

Disabled CORS

9b03cba76ee4e8645037498cd1814c34294dc343 authored over 8 years ago

Fixed the duration field

60d03bd8d8fa39cce0a792d923d05601146d2595 authored over 8 years ago

Fixed critical create_view bug

b84cc56e32f4a5e66b3111be9d91f3d4b488e030 authored over 8 years ago

start/end/limit support for view queries

69e8fda2b043c41d30c794955cf4b0b8388bec4c authored over 8 years ago

Initial support for views

2705cc54bc36848c4eaa346e87576138cfa9cd1f authored over 8 years ago

Removed print statement

9071cd0a791cf37e60bf84fea3d881fc0ca7acca authored over 8 years ago

Merge pull request #16 from ActivityWatch/dev/transform

Updated to conform to refactoring in aw-core

8ceded397b500f1bc5449e3dfd5df86b22cad825 authored over 8 years ago

Updated to conform to refactoring in aw-core

d6487eb0d2099f5295d9b27a6f4106f3a01e4c54 authored over 8 years ago

Merge pull request #15 from ActivityWatch/dev/chunk-and-timefilter

Chunking and timefilter

b536b5dd56e9e015a07d2effd0bd03027a462299 authored over 8 years ago

Now handles when someone requests data from a bucket that doesn't exist

8b8f0e2bb96b752c88dbc49ddb60ee653b7b64a5 authored over 8 years ago

Fixed tests

37a3a13b2d74ba3e41814956a582f0713203bba6 authored over 8 years ago

Moved 304 logs from INFO to DEBUG

91c3b193c3a70c89544288907a11471b93caed93 authored over 8 years ago

Merge branch 'master' into dev/chunk-and-timefilter

d1a352b44f3c9f3417b958759864a1c26bcae397 authored over 8 years ago

Minor fixes and moved chunking logic to bucket

d6883a40e1c93f504cc5e1836e6154a1a1acca52 authored over 8 years ago

Is now based on the dev/next aw-core branch

1558d469506e304e61612a30add4e4e6020fc99c authored over 8 years ago

Now packages static webui with dist, also moved away from onefile dist

c3b9245807d30455ad9f203571559974332f1d6a authored over 8 years ago

Updated chunking api url

ca8287c428a6301c06ba287c6d3d6ec07d42f7a7 authored over 8 years ago

Added other_labels

71e70ac59c42adcc7533bc15d6d92e35e5c09994 authored over 8 years ago

Merge branch 'master' into dev/chunking

10f5acb9ac50542592638bfe8af3218bfaebe243 authored over 8 years ago

Added support for serving aw-webui staticly

73a4bec403c0292d8736bbc2b8ec91f450ffff71 authored over 8 years ago

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

3da50b68fa643d6c1b1c9a284cb2b633ee5e7939 authored over 8 years ago

Improved flask logging

0111233189f4768073daa5e482dcdcc300c327a4 authored over 8 years ago

Cleaned up README

f5248ff4f9c688e7e2e3be3dd551a19719e2ed73 authored over 8 years ago

Improved aw-server logging

44aa5a43df80974194703a83e4ca8732ac13b2ce authored over 8 years ago

Added swagger comments to events/replace_last

13d16e123bea12c9c3ca58f11cdf297d86b6539e authored over 8 years ago

Removed HeartbeatResource

6867e220c503ea29621d3d0c5d9922998caddae5 authored over 8 years ago

Added replace_last_event support

11a9073267f56cae336c1fbf8bdc6c32d4ba953b authored over 8 years ago

Merge pull request #14 from ActivityWatch/dev/create-bucket

Implemets API to create_bucket and more metadata

19191be1c98e49ffa431e96f527cbd51f0365f9c authored over 8 years ago

create_bucket now passes down datetime instead of string

b0e01440bf132f5d267b3db23657616a73c6cb3f authored over 8 years ago

Fixed broken BadRequest initialization

7a38dfe8f10f74b1c31b6a19d43ade41187ae1cf authored over 8 years ago

Fixed create_bucket always returning 500

3dc9daf1da11abda7fed5ba67747a7487eacc9b5 authored over 8 years ago

Handle if bucket already exists in create_bucket

5cc0e578d990e9016c448255ab3e1b2cff6b5988 authored over 8 years ago

Updated createBucket API and added a BadRequest class for a standard way of reporting bad requests

0b9f0b732e5113f91344346ef596cf1f638dd70a authored over 8 years ago

Added create bucket API and added more metadata to buckets

eae9223c8c239e459e62e7e942ed497c87577058 authored over 8 years ago

Label categorization and duration sum for chunking

4f8be7c5905b89300034de0c273315bd65b0cf98 authored over 8 years ago

Merge commit 'c5941f8'

790b8e1c009e198e0fc84762594ef5aeb23cdecb authored over 8 years ago

Added count-field for events in server-api

c5941f81aab4a4b23da420312788ce2d64448c92 authored over 8 years ago

Initial work on chunking events

b86f3912e33f074702a2875ce26c7a52a4c4dc27 authored over 8 years ago

Set version for aw-core dependency link

4408d8198024b42ecc4b6d80110dd3074a093e53 authored over 8 years ago

Merge branch 'master' of github.com:ActivityWatch/actwa-server into HEAD

b731ba89d29df0ea2be3f99b62aa530a2d275f4e authored over 8 years ago

Added dependency link to aw-core

c4e78552b828cdee1720c955a944998c604d47e1 authored over 8 years ago

Fixed /api/0/log so it returns valid json and reversed the order

3cd8457d6cc98ab7275e80b7c091943b154c28ac authored over 8 years ago

Added /api/0/log docstrings

f31da3f18b0740ac7dfb8f395659069ac319c16d authored over 8 years ago

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

cc6d926094e3c9e5da91d8efb67b80d0b7b81404 authored over 8 years ago

Cleaned up logging, added file logging and /log api

10644c9a501ee0b83343e72e31bed8df53c59e68 authored over 8 years ago

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

aced0dcbfa9f65ed0982d0d9dd9fb7b3910c1757 authored over 8 years ago

Added duration to model

c54d6ef8096308103df09ef290034007a01b0589 authored over 8 years ago

Added dependency link to aw-core

6b7922760d5efc8fc20c29c1868797e63f54ef34 authored over 8 years ago

Port can now be specified

7e445042cebcdc42959ba38fcb2b98fd2b24f5cb authored over 8 years ago

Added more API comments

c4fe4bd7480eb2189941020acbd5e90b315fb892 authored over 8 years ago

Added 'limit' as get events query parameter

70f417b8a3f5b63bf20492eb26ff84b70dfd196f authored over 8 years ago

[pyinstaller] removed path from spec

bb353eae5eb1414d816f22c90c995238208688fb authored over 8 years ago

Fixed some trouble

76dec737a6e501b5203b159ce79e028891889bdd authored over 8 years ago

Added PyInstaller spec for aw-server

1542615af96e81df9a7e9211ed6626ac294fb120 authored over 8 years ago

Added some models to the API for better Swagger docs

d954123949b15fe15f6d5dc7d68265cb1533caec authored over 8 years ago

Progress on buckets API

701d5e2d1be40bce72a6ce519ce499ca84d0835d authored over 8 years ago

Changed flask-cors import to get rid of warning message

d095bf4f495471c90047da8caf46160b8ef56fae authored over 8 years ago

Switched to flask-restplus, removed unused and unimplemented session API

79e254443f4996a66acd4b217dc0a7374487f592 authored over 8 years ago

Added ability to output logs as JSON

359c0c0b4d3fd738be0ab4a2ac0346a7ddec384a authored over 8 years ago

Changed from flask-restful to flask-restplus, added python-json-logger as a dependency

0dc5fd57a2fba08ccef7b53bed5223507ea4e01e authored over 8 years ago

Prepared for the bucket endpoint

f3cdb4d6d25d5447c94bbaabe17f55dd21fcfd03 authored over 8 years ago

Updated travis conf, added build status to README

85a3217f9d7d6553fe6727a08c440ec0c71e972b authored over 8 years ago

Fixed tests and travis conf

d4aa337c947e47fe371cf10f50ee73d1431f0a84 authored over 8 years ago

Added ability to send a list of events to API

fa7bc62629e01654dc156dce7c943aa28d0252d5 authored over 8 years ago

Removed deprecated Activity api

f548696b85ec61215773fd76153abaacfa7e3e34 authored over 8 years ago

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

409f0e2286b4aa0253934c923caabf89c1aa6f14 authored over 8 years ago

Changed to new module naming convention, abandoned namespace packages

74bead1317f75bcc41ddb05a3578389c2084328d authored over 8 years ago

Added WIP BucketResource and EventResource...

also some notes regarding how to move forward

e69176d5849c0008dbef3b3fb4937940772d5030 authored over 8 years ago

Added proper install_require for appdirs

277104eb1492b522660529474e5ebbf1ec7f4b84 authored over 8 years ago

Moved datastore to aw-core

4944e391f8cc6c7f7aba11ec3238c77c045635d2 authored over 8 years ago

Datastore strategy 'files' now puts data in proper directory using appdirs

84acbb7de045cb2b7fc5cd3ea15b3d7ceb2355e8 authored over 8 years ago

Now uses a better datastore (with tests!)

5752f7e798b6e72bd365cca3937a8e5d0cdf109e authored over 8 years ago

Fixed ExecStart in systemd service to fetch bin path using /usr/bin/env

b01271d4507724a9321762e622c87fe5dab25171 authored over 8 years ago

Switched to using develop-mode package installs since namespace packages fail horribly

cf8873ef1a54bef6fe231b9201516396e1a61d54 authored over 8 years ago

Travis script now installs aw-core before installing aw-server, also added basic import tests

4a62337136ebecc2a813e161c0f3eeaa90556cb2 authored over 8 years ago

Added .travis.yml

ea2fbeb69dea013741a5ac1665f8054c53995ec3 authored over 8 years ago

Fixed last commit

a9df80515913741448c7dcb3216e910bb4c3712b authored over 8 years ago

Fixed systemd service (moved After= to the proper location)

2526e6bac37b714447b1ede84b8d95c0ba60c2d8 authored over 8 years ago

[argparse] Changed to using store_true instead of store_const

9b1d2a8994818b620f46d4509b3620c881226728 authored over 8 years ago

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

3f3c5a9daab1da5c4588c2e973f0afbee28b3d9c authored over 8 years ago

Changed default datastore method to memory, added warning that using it is not persistent storage

06bd575d69ee7ffcee5c9e595f64b177aa77518b authored over 8 years ago

Added mongo connection error message

1546acd453fadf49b8a80a20444c651a37970d98 authored over 8 years ago

Fixed dependencies

b0dd068f184a85f63cfa0a344aca14142685433a authored over 8 years ago

Added proper storage choices in argparse usage

f94e219f6c3af403ada0e5452328ba3fe6ae0bf7 authored over 8 years ago

Added notes to README about running in testing mode

8a0c9e4028426dc31511cf5c148e64b11a81256d authored over 8 years ago

Lots of changed, see desc.

- Added use of argparse
- Added proper support for --testing flag
- Restructured files
- Added f...

116bcc3e0369585c4cfd104617479e04f967f083 authored over 8 years ago

Improvements to README

570b9d364cfedebd782847825a44b2194997b207 authored over 8 years ago