updated submodules with merged stuff for 0.8

snowy1220 · Jan 22, 2018 · b2784e8 · b2784e8
1 parent f93c403
commit b2784e8
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -39,9 +39,24 @@
   <a href="https://github.com/ActivityWatch/activitywatch/releases">
     <img title="Total downloads (GitHub Releases)" src="https://img.shields.io/github/downloads/ActivityWatch/activitywatch/total.svg" />
   </a>
+
+  <br>
+
   <a href="https://activitywatch.net/donate/">
     <img title="Donated" src="https://img.shields.io/badge/donations-%241%2Fmo-yellow.svg" />
   </a>
+  <a href="https://www.patreon.com/erikbjare">
+    <img title="Donate on Patreon" src="https://img.shields.io/badge/patreon-donate-yellow.svg" />
+  </a>
+  <a href="https://opencollective.com/activitywatch">
+    <img title="Donate on Open Collective" src="https://img.shields.io/badge/bountysource-donate-yellow.svg" />
+  </a>
+  <a href="https://salt.bountysource.com/teams/activitywatch">
+    <img title="Donate on Bountysource" src="https://img.shields.io/badge/bountysource-donate-yellow.svg" />
+  </a>
+  <a href="https://activitywatch.net/donate/">
+    <img title="Donate with another method" src="https://img.shields.io/badge/others-donate-yellow.svg" />
+  </a>
 
   <br>
 
@@ -95,10 +110,6 @@ We've worked towards this goal by creating a application for safe storage of the
 
 It is up to you as user to collect as much as you want, or as little as you want (and we hope some of you will help write watchers so we can collect more).
 
-**Note:** ActivityWatch is under development. There is still work to be done so we provide it with no guarantees with the hope that others may wish to help and give their feedback!
-
-You can read more on our [website](https://activitywatch.github.io/about/).
-
 ### Screenshots
 
 <!-- TODO: We could probably stylize these (nice borders, scaled down) -->
@@ -112,7 +123,16 @@ You can read more on our [website](https://activitywatch.github.io/about/).
   <img src="http://activitywatch.net/screenshot.png" width="22%">
 -->
 
-### Is this yet another time tracker?
+
+## Installation & Usage
+
+Downloads are available on our [releases page](https://github.com/ActivityWatch/activitywatch/releases).
+
+For instructions on how to get started, please see [our guide in the documentation](https://activitywatch.readthedocs.io/en/latest/getting-started.html).
+
+Interested in building from source? [There's a guide for that too](https://activitywatch.readthedocs.io/en/latest/installing-from-source.html).
+
+## Is this yet another time tracker?
 
 Yes, but we found that most time trackers lack in one or more important features.
 
@@ -170,11 +190,6 @@ We have a plan to address all of these and we're well on our way. See the table
 | WakaTime      | :x:                | :white_check_mark: | :white_check_mark: | :white_check_mark: | Only for text editors |
 
 
-### Installation & Usage
-
-Please see the [Getting started guide in the documentation](https://activitywatch.readthedocs.io/en/latest/getting-started.html).
-
-
 ## About this repository
 
 This repo is a bundle of the core components and official modules of ActivityWatch (managed with `git submodule`). It's primary use is as a meta-package providing all the components in one repo; enabling easier packaging and installation. It is also where releases of the full suite are published (see [releases](https://github.com/ActivityWatch/activitywatch/releases)).

diff --git a/aw-client b/aw-client
diff --git a/aw-core b/aw-core
diff --git a/aw-qt b/aw-qt
diff --git a/aw-server b/aw-server
diff --git a/aw-watcher-afk b/aw-watcher-afk
diff --git a/scripts/submodule-branch.sh b/scripts/submodule-branch.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Get current branch
+#   git rev-parse --abbrev-ref HEAD
+# Get branch for each submodule
+#   git submodule foreach "git rev-parse --abbrev-ref HEAD"
+
+SUBMODULES=$(git submodule | sed -r -e 's/^[ \+][a-z0-9]+ //g' -e 's/ \(.*\)//g')
+for module in $SUBMODULES; do
+    branch=$(git --git-dir=$module/.git rev-parse --abbrev-ref HEAD)
+    printf "%-20s %-30s\n" "$module" "$branch"
+done
+3 −3		Makefile
+1 −0		aw_analysis/__init__.py
+324 −0		aw_analysis/query2.py
+99 −0		aw_analysis/query2_functions.py
+0 −5		aw_core/__init__.py
+0 −44		aw_core/cached_views.py
+0 −6		aw_core/dirs.py
+0 −176		aw_core/query.py
+0 −269		aw_core/transforms.py
+0 −110		aw_core/views.py
+6 −0		aw_datastore/datastore.py
+8 −0		aw_datastore/storages/abstract.py
+11 −0		aw_datastore/storages/memory.py
+17 −1		aw_datastore/storages/mongodb.py
+19 −0		aw_datastore/storages/peewee.py
+7 −0		aw_transform/__init__.py
+19 −0		aw_transform/filter_keyvals.py
+69 −0		aw_transform/filter_period_intersect.py
+39 −0		aw_transform/heartbeats.py
+9 −0		aw_transform/limit_events.py
+34 −0		aw_transform/merge_events_by_keys.py
+17 −0		aw_transform/sort_by.py
+31 −0		aw_transform/split_url_events.py
+1 −1		setup.py
+33 −0		tests/test_datastore.py
+6 −6		tests/test_heartbeat.py
+0 −246		tests/test_query.py
+302 −0		tests/test_query2.py
+59 −69		tests/test_transforms.py
+0 −112		tests/test_view.py
+1 −1		Makefile
+2 −2		aw-qt.spec
+1 −1		aw_qt/manager.py
+1 −5		aw_qt/trayicon.py
+1 −1		aw-webui
+22 −37		aw_server/api.py
+47 −38		aw_server/rest.py
+3 −0		aw_server/server.py
+1 −0		tests/test_client.py
+6 −6		aw_watcher_afk/afk.py
+4 −0		aw_watcher_afk/unix.py
+1 −1		requirements.txt