7
Commit Graph

40 Commits

Author SHA1 Message Date
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
5a5ae70dd2 Merge pull request #1 from LabD/feature/WXP-75-middleware-setup
adds simple segment middleware
2016-11-07 13:36:10 +01:00
c741c6619f adds simple segment middleware 2016-11-07 13:30:15 +01:00
236044fcd0 Admin placeholders 2016-11-07 13:20:08 +01:00
e6786943f7 makes the title translatable 2016-11-07 12:21:06 +01:00
c7a216bf00 adds segments list template 2016-11-07 12:09:00 +01:00
8ed2a03238 adds editor config 2016-11-07 11:58:34 +01:00
7c14fd4862 fixes tabbing 2016-11-07 11:57:43 +01:00
f71865d954 added some more tasks 2016-11-07 11:55:29 +01:00
788217f441 adds building to all task 2016-11-07 11:51:21 +01:00
86e55b6386 adds Makefile for common tasks 2016-11-07 11:50:43 +01:00
28c5b87e08 initial project commit 2016-11-07 11:42:06 +01:00