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

added automatic detection of Windows to `make package`

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

[Makefile] added special package-appveyor target

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

Merge pull request #15 from ActivityWatch/dev/issue-13-macos-crash

Fix to issue #13: Crashes on macOS

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

reenabled integration testing on macOS

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

Merge branch 'master' into dev/issue-13-macos-crash

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

Merge pull request #14 from ActivityWatch/dev/integration-test

Basic integration test

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

disabled integration testing on macOS, for now

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

wow, I really hate semicolons

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

at least I'm making progress now

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

might fix it, lol

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

I'm such an idiot

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

this is getting really embarassing...

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

well, what is it then?

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

no comment...

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

this is getting messy...

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

wtf, could this really be it?

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

well, fuck it then

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

yaml is terrible

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

http://i.imgur.com/hWiJXKT.gifv

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

n:th time's the charm

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

please work now you f-ing pyqt piece of sh-t

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

added upgrade pip line to travis conf

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

fixed travis yml formatting

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

fixed formatting in .travis.yml, no idea what's wrong in there

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

fixed formatting in .travis.yml

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

added xvfb to travis conf

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

fixed so that it doesn't try to run any modules

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

added a proper logger instead of a logging.info call

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

potential fix to issue #13

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

started working on basic integration test

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

added ability to specify which modules to autostart using args

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

removed redundant call to logging.basicConfig()

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

fixed executable lookup for modules when packaged by pyinstaller

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

fixed weird import error when not using `setup.py develop`

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

removed unused dependency

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

[makefile] moved simple import test into Makefile

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

[travis] added `python -c 'import aw_qt'` to script step

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

[travis] fixed Makefile usage

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

Merge pull request #9 from ActivityWatch/dev/makefile

Added Makefile

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

added platform check to config-autostart.sh

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

removed dank sagan

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

improved Makefile

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

added Makefile

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

restructured files in last commit

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

added aw-qt.desktop and config script for autostart

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

Merge pull request #6 from ActivityWatch/dev/next

cleanup/bugfixes, open log dir, graceful shutdown, etc.

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

added menu item indicating when in testing mode, minor cleanup

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

attached log to error message when module crashes

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

cleanup/bugfixes, open log dir, graceful shutdown, etc.

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

Added ability to run with testing flag and other fixes

20fc9e4a2ea700e5465b6549c26f0ed015e62da3 authored over 8 years ago by Erik Bjäreholt <[email protected]>

Modules now autostart

a49de320318209accff9cffaef36791124e71a78 authored over 8 years ago by Erik Bjäreholt <[email protected]>

Added dynamic loading of modules from localdir/PATH, fixed show_log bug

b3c59f1c0192472a4663f61bec1c1777745dbdb7 authored over 8 years ago by Erik Bjäreholt <[email protected]>

Added logviewer, error popup if module crashes, better modules menu

d0aeb03ae393e5b1eb79a8412f06a2b96a89a564 authored over 8 years ago by Erik Bjäreholt <[email protected]>

build.sh now returns non-zero exit code if pyrcc5 fails

dfcfc787caa783c229868ce2c1dd44fa99262e92 authored over 8 years ago by Erik Bjäreholt <[email protected]>

Removed unused images from resource file

b688b6d8c170e5d074f3e4bdeb0221c62bc43220 authored over 8 years ago by Erik Bjäreholt <[email protected]>

Updated manager to use execs from own path

c489c24a100bb556beed3c091db3b28a0a0c504c authored over 8 years ago by Erik Bjäreholt <[email protected]>

Moved away from onefile dist

e753d8ab372675756984056bcb8df18019310b3f authored over 8 years ago by Erik Bjäreholt <[email protected]>

Updated links

2ad8ea4b8bb453e3e4e970bdaa34149ffae4d288 authored over 8 years ago by johan-bjareholt <[email protected]>

Removed testing message, changed to better placeholder tooltip

9dd603aaad18b8cd4e144377408fec64b6df3e10 authored over 8 years ago by Erik Bjäreholt <[email protected]>

Updated logo, added as actual trayicon

970e2142389a9eedec3a9300d7d9bd6561c85c8f authored over 8 years ago by Erik Bjäreholt <[email protected]>

Added first version of logo

f91fa39b6a2dc054fbbbfe79a277bb57bff608f4 authored over 8 years ago by Erik Bjäreholt <[email protected]>

Removed one of the two pyinstaller specs

98e09251c69289339a56e0d0ac5f6dfc0cbf6ec2 authored over 8 years ago by Erik Bjäreholt <[email protected]>

Added pyinstaller run to .travis.yml

f1d16665d078414ee5fbb4bdae10f0a27dc22365 authored over 8 years ago by Erik Bjäreholt <[email protected]>

Fixed misspelling in .travis.yml

cf73812ae2acf38bedc7ea8ea8d88c72855846ee authored over 8 years ago by Erik Bjäreholt <[email protected]>

Added pyinstaller .spec files both for onefile and non-onefile

839689a6388a707dfb852fd7292d2b75ddc2a0da authored over 8 years ago by Erik Bjäreholt <[email protected]>

Minor refactoring in preparation of module detection

6944a639e2b7969e60082903cbb6833f840e8d04 authored over 8 years ago by Erik Bjäreholt <[email protected]>

Added python nightly to allowed_failures

39a95399d0195d680c6d39a52611fd7a57221736 authored over 8 years ago by Erik Bjäreholt <[email protected]>

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

3c27d50cfe8cd945b839789ea39d3fd6e7eb3410 authored over 8 years ago by Måns Magnusson <[email protected]>

Removed macOS & X11 watchers from supported watchers and added window-watcher

2fb32e3d81a45e85f5d4b9b77cc4d3908b312c3c authored over 8 years ago by Måns Magnusson <[email protected]>

Added 'pip install pyqt5' to .travis.yml

9671ab72a584ea2a5cbc94181a6f3173e457fce2 authored over 8 years ago by Erik Bjäreholt <[email protected]>

Added macoswatcher and pingwatcher to trayicon

9088289fd178168851754943b86c0f965a5fc1d9 authored over 8 years ago by Måns Magnusson <[email protected]>

Added .travis.yml

fb28bf25f0f6814c20afded1a45ab82a4b72b610 authored over 8 years ago by Erik Bjäreholt <[email protected]>

Initial commit

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