7
Commit Graph

311 Commits

Author SHA1 Message Date
821dcccfcb Some eenie weenie fixes 2016-11-10 09:27:26 +01:00
42bfbbad62 Removed unused import statement from filters 2016-11-10 09:02:54 +01:00
f63da898ba Corrected days display on segment view
With working enabled date and disabled date. Will pause counting when
disabled.
2016-11-09 18:44:15 +01:00
f0aeead152 Small fixes to Visit count, prevent middleware functionality on admin 2016-11-09 17:05:58 +01:00
42a8c93a60 Add localisation to segment overview stats 2016-11-09 16:00:25 +01:00
b47cfd67cc Add visit count and days to segment overview 2016-11-09 15:33:26 +01:00
b6c35e214a Import sorting and other code cleaning 2016-11-09 14:10:52 +01:00
7e8e395448 Model clean up 2016-11-09 12:56:16 +01:00
cbda3f93e3 Removed 'name' value from AbstractBaseRule 2016-11-09 12:40:19 +01:00
701e43b60e fixes query and migrations 2016-11-09 12:36:17 +01:00
267f2b05db Added Wagtail panels to rule models. 2016-11-09 12:09:47 +01:00
a4bd0ece20 changed inheritance to polymorphic 2016-11-09 11:18:59 +01:00
075ea804fa Fixed a mistake in the Visit Count rule and changed the order of the STATUS_CHOICES 2016-11-09 10:26:25 +01:00
83ed5ca9bc Create empty 'segments' object in session if none exists 2016-11-09 10:12:44 +01:00
a8ae9f5c66 Set model admin "extra" to 0 to prevent weird behaviour and clean up the interface 2016-11-09 09:57:15 +01:00
c9343c770d Rule names 2016-11-09 09:46:23 +01:00
b3fb265f9d Removed delete button from overview 2016-11-08 17:47:27 +01:00
c7a8119ec9 Refactored segment model. Implemented 'enable' and 'disable' in overview 2016-11-08 17:32:27 +01:00
bd188edb8d Activated VisitCountRule as inline admin element 2016-11-08 16:18:47 +01:00
201bf0355b Visit count rule 2016-11-08 16:11:30 +01:00
4b09406256 Merge pull request #4 from LabD/feature/WXP-53-front-end-segment-bouwer
Feature/WXP 53 front end segment bouwer
2016-11-08 15:22:47 +01:00
ee94ce3f14 Overview block fix. 2016-11-08 15:13:28 +01:00
26079e1e92 Fixed merge conflict 2016-11-08 15:00:15 +01:00
b1c39fd8ad Merge branch 'master' into feature/WXP-53-front-end-segment-bouwer
# Conflicts:
#	src/personalisation/wagtail_hooks.py
2016-11-08 14:54:28 +01:00
b07d01e4ea Some final styling tweaks 2016-11-08 14:53:57 +01:00
c659617872 something changed 2016-11-08 13:45:18 +01:00
d30c79ef4e Responsievnesss 2016-11-08 13:17:47 +01:00
51cea10adc more middleware tweaking 2016-11-08 11:49:10 +01:00
724fcfae7a Merge pull request #3 from LabD/feature/WXP-62-referral-rule
Feature/wxp 62 referral rule
2016-11-08 11:21:20 +01:00
253a53433b adds matching functionality to referral rule 2016-11-08 11:18:41 +01:00
6538821f88 BEM fixes 2016-11-08 11:16:35 +01:00
d3cfc94d78 Fixed a bug that rendered a tags in the wrong place. 2016-11-08 11:08:52 +01:00
9956d5595a adds referral to the admin and isorts imports 2016-11-08 10:52:06 +01:00
f3af24b5ed Merge branch 'master' into feature/WXP-53-front-end-segment-bouwer 2016-11-08 10:05:23 +01:00
6c541feeae Added actions buttons to segment block 2016-11-08 10:02:22 +01:00
72aad87f01 Update to readme
Included modeladmin
2016-11-08 09:51:36 +01:00
0b41251ded Styling and functionality improvements 2016-11-08 09:48:52 +01:00
5e06baeee2 adds referral rule and fixes segment testing 2016-11-08 09:04:57 +01:00
1694b1d2ce Styling and markup segmentation overview WIP 2016-11-07 17:41:05 +01:00
40a9c598bb adds referral rule 2016-11-07 17:33:44 +01:00
35a8bd5c8e adds automatic rule subclass checks in the middleware 2016-11-07 17:11:15 +01:00
59aec0871e adds updated readme with instructions 2016-11-07 15:56:44 +01:00
bbbc47749f Merge pull request #2 from LabD/feature/WXP-77-rule-base
Feature/wxp 77 rule base
2016-11-07 15:48:40 +01:00
eac54cda50 now adds segments of a user to the session 2016-11-07 15:42:03 +01:00
e7accad575 adds base and time rules 2016-11-07 15:22:22 +01:00
c48eaaf56c Removed search field for reduced complexity. 2016-11-07 14:30:19 +01:00
8b98084e3f Fixed overwriting modeladmin view 2016-11-07 14:22:32 +01:00
b088e065a2 adds absolute import 2016-11-07 14:10:26 +01:00
62cffb902b adds segment migration 2016-11-07 14:06:38 +01:00
b09994d42e Reverted back to default template titles and references. 2016-11-07 14:02:40 +01:00