4c09ad4ca7
fix flake error W504
2019-01-09 16:52:26 +02:00
02e63ed82c
Merge tag '1.0.1' into develop
...
1.0.1
2019-01-02 17:28:58 +02:00
a411ad1ccc
Merge branch 'release/1.0.1'
2019-01-02 17:28:50 +02:00
1a1df18bf3
Bump version to 1.0.1
2019-01-02 17:28:36 +02:00
56d28faec8
Merge branch 'master' into develop
2019-01-02 17:24:40 +02:00
f95b8dcb93
Merge pull request #28 from praekeltfoundation/feature/GEWEB-740-upgrade-to-wagtail-2-and-python-3
...
Define panel for rules to handle InlinePanel changes
2019-01-02 17:23:32 +02:00
d3f4d42d82
Define panel for rules to handle InlinePanel changes
2019-01-02 16:51:56 +02:00
4c08581919
Merge tag '1.0.0' into develop
...
1.0.0
2018-12-18 14:03:39 +02:00
11886ae135
Merge branch 'release/1.0.0'
2018-12-18 14:03:29 +02:00
83cc7f790e
Bump version to 1.0.0
2018-12-18 14:03:01 +02:00
dcdeb4e9a2
Update imports in examples in docs
2018-12-18 14:02:01 +02:00
2e827be41a
Merge pull request #27 from praekeltfoundation/feature/GEWEB-740-upgrade-to-wagtail-2-and-python-3
...
Upgrade to Python 3 and Wagtail 2
2018-12-18 13:48:31 +02:00
0f9bfb0343
Tell travis to use Wagtail 2.0
2018-12-18 13:37:34 +02:00
1c74e6cfb9
Update Wagtail imports to work for 2.0
2018-12-18 13:32:02 +02:00
9c45ac56db
Upgrade Wagtail to 2.0 in requirements and tests
2018-12-18 13:30:27 +02:00
2f7b92fb2e
Run tests on python 3.6
2018-12-18 10:40:45 +02:00
3a86c189dc
Merge tag '0.11.3' into develop
...
Bugfix: Handle errors when testing an invalid visit count rule
2018-03-09 20:35:33 +02:00
82c26f9772
Merge branch 'release/0.11.3'
2018-03-09 20:35:20 +02:00
03eb812e45
Version 0.11.3
2018-03-09 20:35:08 +02:00
e3522d0acb
Merge pull request #26 from praekeltfoundation/feature/catch-exceptions-when-visit-count-rule-is-blank
...
Handle exceptions for empty VisitCountRule
2018-03-09 20:32:05 +02:00
7f5e958ee3
Catch the exception if the visit count rule doesn't have a page
2018-03-09 19:20:30 +02:00
241bfb5240
Merge tag '0.11.2' into develop
...
Bugfix: Stop populating static segments when the count is reached
2018-03-08 14:00:58 +02:00
d5df6e0e58
Merge branch 'release/0.11.2'
2018-03-08 14:00:38 +02:00
865efd0792
Version 0.11.2
2018-03-08 13:59:23 +02:00
454c936e0f
Merge pull request #25 from praekeltfoundation/feature/fix-static-segment-population
...
Fix off-by-one error in static segment population
2018-03-08 13:24:48 +02:00
74d3123084
Ensure static segments don't have one extra user
2018-03-08 13:14:29 +02:00
9bfd816430
Merge tag '0.11.1' into develop
...
Populate entirely static segments from registered Users not active Sessions
2018-03-01 16:26:46 +02:00
02e06bd9f3
Merge branch 'release/0.11.1'
2018-03-01 16:26:35 +02:00
c7ad3251cf
Version 0.11.1
2018-03-01 16:26:20 +02:00
cb8b7da496
Merge pull request #23 from praekeltfoundation/feature/populate-static-segments-from-db-at-creation
...
Populate static segments from database
2018-03-01 16:23:10 +02:00
0efd3ae937
Update tests for new static segment population
2018-02-26 14:34:02 +02:00
d335e4fd7b
Populate static segments even if the count is 0
2018-02-26 14:31:56 +02:00
db2f82967e
Only loop through users once when saving static segments
...
When saving a new static segment we count the matching users and
populate the segment from the database. Each of these requires us
to loop through all of the users, so it's better to do them at the
same time.
2018-02-25 15:43:12 +02:00
37243365a7
Merge branch 'develop' into feature/populate-static-segments-from-db-at-creation
2018-02-25 15:08:36 +02:00
43a2b590b4
Merge tag '0.11.0' into develop
...
Bug Fix: Query rule should not be static
Enable retrieval of user data for static rules through csv download
2018-02-23 17:02:53 +02:00
cc1dd337bb
Merge branch 'release/0.11.0'
2018-02-23 17:02:34 +02:00
a677846ff7
Bump version to 0.11.0
2018-02-23 17:02:17 +02:00
7d7861b862
Merge pull request #22 from praekeltfoundation/feature/SAS-72-download-cvs-of-user-data
...
Download CSV of users in a segment
2018-02-23 16:50:52 +02:00
8e854d0abe
Merge branch 'develop' into feature/SAS-72-download-cvs-of-user-data
2018-02-23 14:05:31 +02:00
0051061d96
Merge pull request #21 from praekeltfoundation/feature/SAS-72-get-user-info-for-visit-count-rule
...
Get user info from visit count rule
2018-02-23 14:02:15 +02:00
f898dfe017
Actually add tests for segment users view
2018-02-22 16:12:24 +02:00
8ced5bd81c
Fix flake8
2018-02-22 15:15:01 +02:00
9a86b0c8cc
Add tests for segment users view
2018-02-22 15:14:34 +02:00
9408f90789
Use mock for testing matching user count
...
The fake class was causing other tests to fail because it inherits from AbstractBaseRule but isn't in the database.
I removed it and replaced it with mocked calls
2018-02-22 14:23:14 +02:00
ba6056e3f8
Link to download CSV of users in segment
2018-02-22 14:21:43 +02:00
fdc0a7f2e1
Get user info for Visit count rule
2018-02-21 19:08:29 +02:00
12b0cd9231
Make visit count session retrieval seperate method
2018-02-21 19:07:35 +02:00
330557be8d
Make VisitCountRule.test_user actually test with only a user
2018-02-21 18:48:44 +02:00
aa917dee9c
Merge pull request #20 from praekeltfoundation/feature/SAS-90-revert-query-rule-to-not-be-static
...
Remove static flag for Query Rule
2018-02-21 15:54:36 +02:00
364cb1a7e6
Query rule should not be static
2018-02-20 15:08:12 +02:00
