7
Commit Graph

510 Commits

Author SHA1 Message Date
Kaitlyn Crawford
5ad70d68f6 Don't include staff and inactive users when counting matched users 2018-01-26 15:38:26 +02:00
Kaitlyn
06bfe77901 Merge pull request #7 from praekeltfoundation/feature/SAS-85-calculate-matching-users
Count number of users that match static rules for a segment
2018-01-26 08:58:00 +02:00
Kaitlyn Crawford
d5e89d374b Remove unnecessary imports 2018-01-25 19:51:50 +02:00
Kaitlyn Crawford
5b39e82f80 Fixed test for adding user counter to segment 2018-01-25 18:42:38 +02:00
Kaitlyn Crawford
fbcebb43a4 Store record count on a segment when it is created 2018-01-25 15:14:19 +02:00
Kaitlyn Crawford
ef271587ec Test count_matching_users method 2018-01-25 13:26:05 +02:00
Kaitlyn Crawford
786a8801b1 Migrations for Segment.matched_user_count 2018-01-25 11:26:57 +02:00
Kaitlyn Crawford
caf73aa43c Add matched_users_count field to segments 2018-01-25 11:12:46 +02:00
Kaitlyn Crawford
4021d2c915 Add method to calculate the number of users that match a segment 2018-01-24 22:00:28 +02:00
Kaitlyn Crawford
33f96af4a3 Allow test_user() for static rules to accept a user 2018-01-24 15:14:24 +02:00
Kaitlyn Crawford
6299feb497 Merge tag '0.10.4' into develop
0.10.4
2018-01-22 12:58:49 +02:00
Kaitlyn Crawford
7ced6db126 Merge branch 'release/0.10.4' 0.10.4 2018-01-22 12:58:31 +02:00
Kaitlyn Crawford
c6ce67c9c9 Version bump 0.10.4 2018-01-22 12:58:12 +02:00
Kaitlyn
3df3fc0b16 Merge pull request #6 from praekeltfoundation/feature/SAS-87-fix-static-rules
Set QueryRule to be static
2018-01-22 12:03:29 +02:00
Kaitlyn Crawford
a00929846e Set query rule to be static 2018-01-18 16:17:30 +02:00
Alex Muller
49fba11049 Merge pull request #5 from praekeltfoundation/enable-linting
Enable and fix lint
2018-01-08 10:23:36 +00:00
Alex Muller
e3488e87ad Enable and fix lint 2018-01-08 09:08:11 +00:00
Alex Muller
808aa6d202 Add tests for exclude_variants 2018-01-08 09:07:15 +00:00
nathanbegbie
efb060cc6e Merge branch 'release/0.10.3' into develop 2018-01-05 19:18:14 +02:00
nathanbegbie
414afa5269 Merge branch 'release/0.10.3' 0.10.3 2018-01-05 19:17:18 +02:00
nathanbegbie
b3f0ac2d58 Version Bump 0.10.3 2018-01-05 19:16:45 +02:00
Alex Muller
4f9c18d2cf Merge pull request #3 from praekeltfoundation/fix-segment-edit-link
Fix segment edit link
2018-01-05 17:08:12 +00:00
Alex Muller
a4a283e4f3 Fix segment edit link
This is hardcoded at the moment which doesn't work unless you
redirect URLs to have a trailing slash.

Using the reverse URL lookup works in all cases.
2018-01-05 17:00:15 +00:00
nathanbegbie
30318549e2 Merge pull request #4 from praekeltfoundation/feature/issue-4-update-wagtail-django-dependencies
Update wagtail and django dependencies
2018-01-05 18:55:18 +02:00
nathanbegbie
f19de241b0 Update dependencies for wagtail and django
Only run tests for wagtail v1.13 and django v1.11
2018-01-05 18:28:40 +02:00
nathanbegbie
95ecd8d200 Merge branch 'release/0.10.2' into develop 2017-11-23 16:33:16 +02:00
nathanbegbie
6436b85b1d Merge branch 'release/0.10.2' 0.10.2 2017-11-23 16:32:31 +02:00
nathanbegbie
06471248d3 Version Bump 0.10.2 2017-11-23 16:32:20 +02:00
nathanbegbie
e3df03f559 Merge pull request #2 from torchbox/fix/visitor-rule-not-updating
Fix visitor rule not updating correct paths
2017-11-23 16:29:13 +02:00
Tomasz Knapik
0a42ce3eeb Fix not updating visitor count rule properly 2017-11-23 14:10:16 +00:00
nathanbegbie
e5068894c3 Merge branch 'release/0.10.1' into develop 2017-11-13 15:03:41 +02:00
nathanbegbie
fdc2b97194 Merge branch 'release/0.10.1' 0.10.1 2017-11-13 15:03:32 +02:00
nathanbegbie
a8d3aeab68 Version Bump 0.10.1 2017-11-13 15:02:56 +02:00
nathanbegbie
c76d6d1617 Update manifest to include missing js files 2017-11-13 14:58:20 +02:00
nathanbegbie
a8c4b66d6e Merge branch 'release/0.10.0' into develop 2017-11-09 16:53:42 +02:00
nathanbegbie
f3fbee99a2 Merge branch 'release/0.10.0' 0.10.0 2017-11-09 16:53:37 +02:00
nathanbegbie
4918c99b5f Version Bump 0.10.0 2017-11-09 16:53:22 +02:00
nathanbegbie
330c3bd377 Merge branch 'feature/issue-1-create-pypi-release' into develop 2017-11-09 16:49:29 +02:00
nathanbegbie
9c9a9d3acd add missing function call 2017-11-09 16:37:52 +02:00
nathanbegbie
51e9aa9724 remove all the extra testing environments 2017-11-09 13:36:43 +02:00
nathanbegbie
a5705fd53c Removed extra newline 2017-11-09 13:27:31 +02:00
Milton Madanda
9d1f3074c0 add pypi password 2017-11-09 13:18:22 +02:00
nathanbegbie
3bfd5b8e8f Add deploy instructions to travis file 2017-11-09 11:54:13 +02:00
nathanbegbie
232609fb4e Update setup file for new package name 2017-11-09 11:52:55 +02:00
Todd Dembrey
35fd4836b0 update the realease 2017-11-08 13:58:50 +00:00
Todd Dembrey
b786b0a4d2 Merge pull request #1 from torchbox/feature/dynamic-segments
Add the logic for static segments
2017-11-08 11:16:25 +00:00
Todd Dembrey
23b1456438 Add tests which cover anonymous users 2017-11-01 17:10:03 +00:00
Todd Dembrey
1f4a4536ab Make the static elements tracked users only
We cannot track anonymous users as the session expires after 10 minutes of
inactivity. This also avoids an issue where there is an error when the user's
session has expired and they navigate a page
2017-11-01 16:43:22 +00:00
Todd Dembrey
b8bf27fb99 add enabled to the excluded segments checked 2017-10-27 07:29:41 +01:00
Todd Dembrey
d07e06b4f0 lock down the static segment to prevent changes 2017-10-26 14:34:16 +01:00