github.com/ActivityWatch/aw-server-rust commits

Fixed build issue

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

renamed env var NDK_HOME to more commonplace ANDROID_NDK_HOME

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

Create config

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

Update README.md

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

endpoints: Added support for multipart form imports from the web-ui

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

tests: Added import multipart/form-data test

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

endpoints: added single bucket export and improved tests

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

endpoints: use same export format as aw-server-python

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

endpoints: Added support for export all buckets

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

Updated Cargo.lock

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

Merge pull request #20 from ActivityWatch/dev/externalize-datastore-lock

Externalize datastore lock

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

fixed use of database on Android

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

endpoints: replace response_status macro with status::Custom

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

datastore: externalize lock

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

removed unused script

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

Merge pull request #18 from ActivityWatch/dev/travis-android

Test with Travis on Android

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

android is no longer an allowed failure in CI, fixed setting release flags depending on env var

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

switched to unoptimized builds (no --release) by default

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

added .cargo/config so cargo knows where to look for NDK ar and linker

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

fixed PATH order in compile-android.sh script

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

fixed allow_failures for real this time

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

fixed spelling error (enabling allowed failures for Android build)

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

added rustup targets

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

fixed issues in travis config

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

fixed bash condition

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

fixed variable usage

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

added missing semicolon

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

trying to add travis for Android

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

datastore: set transaction behavior to exclusive

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

Merge pull request #11 from ActivityWatch/dev/more-android-stuff

More android stuff (Rocket server, output to logcat redirection)

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

Merge branch 'master' into dev/more-android-stuff

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

refactored android.rs into module

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

endpoints: testin value in /info is no longer hardcoded

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

Replaced println with log functions

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

Configured logging to file and loglevels

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

transform: Fix calculation of gap in flood

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

transform: fix so flood gaps are met in the middle

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

datastore: Fix broken bucket delete

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

Make "id" in create_bucket API not required

To match aw-server pythons implementation

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

travis: cache cargo

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

tests: fix datastore test on windows

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

travis: Add windows and osx builds

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

fixed tests

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

enabled ability to load aw-webui in a WebView on Android (by setting custom asset_path)

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

[android] added ability to start Rocket server on android, added stdout redirection to logcat

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

Relax version of rocket_cors

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

Update rusqlite to 0.16

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

Added deps.rs badge to README

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

set correct default ANDROID_DATA_DIR

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

fixed Android-stuff related to dirs (reasonable default ANDROID_DATA_DIR, global static now uses Mutex)

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

Merge pull request #8 from ActivityWatch/dev/lol-double-rocket-0.4-fix

Fixed stuff for targeting Android

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

commented out broken test

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

removed beta target from travis config

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

set up proper building of bin alongside lib

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

fixed submodule for frontend

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

added basic .travis.yml

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

changed Err()'s into panic!'s

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

moved platform-specific dependency to bottom

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

added heartbeat and getEvents, renamed extern functions

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

moved Android-specific stuff into androis.rs

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

added ability to create buckets from Android

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

Update README.md

b31fe9571f9f8c072ec0980879416ef9516e2928 authored about 6 years ago by Johan Bjäreholt <[email protected]>

fixed android lib interface

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

modified build script to build for different targets

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

switched to bundling sqlite

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

made use of appdirs platform-conditional to allow compilation under the Android

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

Merge branch 'master' into dev/lol-double-rocket-0.4-fix

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

added stuff to compile on Android, updated Rocket to v0.4

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

Update rocket_cors to 0.4.0

94572edff205446a944b073cb1dab3edf2fa82ed authored about 6 years ago by Johan Bjäreholt <[email protected]>

Fixed flood mistakenly dropping last event

91467465ae3b27ee9e295bf352f999990ee8df65 authored about 6 years ago by Johan Bjäreholt <[email protected]>

query: better error messages

a070d4e431b42616bb8ff780cd87f445e1107db5 authored about 6 years ago by Johan Bjäreholt <[email protected]>

Added error messages to REST body when doing queries

b1f044df7365dd7e5fdb27fb3df22a1434fe94a1 authored about 6 years ago by Johan Bjäreholt <[email protected]>

datastore: added get_lock!

d1f0d0696b8033f07858d33480714bb4bca6be30 authored about 6 years ago by Johan Bjäreholt <[email protected]>

DB now saves at a proper location

88e2a62533d9002f7026312b2c1291049c961c26 authored about 6 years ago by Johan Bjäreholt <[email protected]>

Added unsafe CORS support

aeb58c71b9175b68555af5213f7b1e0757147cc2 authored about 6 years ago by Johan Bjäreholt <[email protected]>

Updated README.md

23e54422a0bc111e366f5fe133116b5ae8876bf9 authored about 6 years ago by Johan Bjäreholt <[email protected]>

Set bind ip to 127.0.0.1 instead of localhost

bde36f167c8101086b5c94a35f9a51a5084037a8 authored about 6 years ago by Johan Bjäreholt <[email protected]>

Bumped Rocket version to 0.4.0

82758b0f0a6c6076dbb02073af82797754d8aba4 authored about 6 years ago by Johan Bjäreholt <[email protected]>

query: Support for appending lists and strings

1ccfbcdd0ffedf3e526d2dad6740fbd657f2911b authored about 6 years ago by Johan Bjäreholt <[email protected]>

transform: added split_url_events

41800bb0227dfca3ee70cdb725dcd676f895fae3 authored about 6 years ago by Johan Bjäreholt <[email protected]>

Set rocket version to 0.4-rc.2

da368ff18eb3db298bb21800c5d5e0fcf3899499 authored about 6 years ago by Johan Bjäreholt <[email protected]>

transform: added chunk_events_by_key and filter_period_intersect

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

transform: Added filter_keyvals

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

query: Simplified query functions

6dcc8b0b3ea8fb69d866dcbbb90ad597e7a06818 authored about 6 years ago by Johan Bjäreholt <[email protected]>

removed Accept-based routing requirements for GET routes

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

removed Accept-based routing requirements for GET routes

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

query: More functions

67e1e2b14a3ee5cfeddf3da152e4f433ac31c44f authored about 6 years ago by Johan Bjäreholt <[email protected]>

Removed json payload limit

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

Added bucket import endpoint

9c4c63bf6776d167e83297aefd02c416dc011a9c authored about 6 years ago by Johan Bjäreholt <[email protected]>

Fixed warnings

d7e01fa9a33a861cca702e156c9044f633fc9842 authored about 6 years ago by Johan Bjäreholt <[email protected]>

Improved heartbeats

- Added heartbeats cache (improved performance)
- Fixed heartbeats bug
- Cleaned up heartbeat code

46e6f547ec6e7d9951928262f9a8a8ca72ab29c0 authored about 6 years ago by Johan Bjäreholt <[email protected]>

More unittests for transforms and impl equals for Event

c750075b8e058e05c9212a60453f7ed8d64c0b60 authored about 6 years ago by Johan Bjäreholt <[email protected]>

Improved query functions

- Started working on flood
- Started working on merge_events_by_keys
- Added sort_by_timestamp

070f0cd70d29fac27863b403e034138ae0d0d9be authored about 6 years ago by Johan Bjäreholt <[email protected]>

fixed Rust feature rename

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

Updated README.md

037d875ebd0f2b2dcdadc7618675ef0071b644d6 authored about 6 years ago by Johan Bjäreholt <[email protected]>

query: added dict support

a5fbbeee044173aee1fd63e315e336fa8ac5c41e authored about 6 years ago by Johan Bjäreholt <[email protected]>

query: Added query endpoint and serialization

ad7f7ed86188bb16264da88ec92cb56ef92cb664 authored about 6 years ago by Johan Bjäreholt <[email protected]>

query: moved the function argument checking code

6010e0070b2bae8d330c821db1255b834f0bf46b authored about 6 years ago by Johan Bjäreholt <[email protected]>

Replace tabs with spaces

e2d5ef4be03571dc73fa320954d26b9eee993f09 authored about 6 years ago by Johan Bjäreholt <[email protected]>

query: prototype query_bucket function

b6ff2e29f185edbc6049f399e673f37b059dfd76 authored about 6 years ago by Johan Bjäreholt <[email protected]>

Ecosyste.ms: OpenCollective

github.com/ActivityWatch/aw-server-rust