8
Commit Graph

192 Commits

Author SHA1 Message Date
Jasper Berghoef
b7a4b68ea5 Removed modals. 2016-11-18 10:20:26 +01:00
Boris Besemer
f666ed68ee adds copy page logic 2016-11-17 14:51:09 +01:00
Jasper Berghoef
dca285c64b Extended info in the segment overview because vision 2016-11-17 13:53:06 +01:00
Jasper Berghoef
856992f987 Inline rules in the model admin 2016-11-17 12:33:43 +01:00
Boris Besemer
7ec039905d adds working add variation page 2016-11-15 15:36:28 +01:00
Boris Besemer
93eac2cda8 adds an add page without a template 2016-11-15 14:25:51 +01:00
Boris Besemer
ce59df3f0a adds variation add view and fixes tests 2016-11-15 13:36:51 +01:00
Jasper Berghoef
0746352ed6 Import cleanup and panel order swap 2016-11-15 12:21:07 +01:00
Boris Besemer
21c77e5cc6 docstring fixes and isort 2016-11-15 11:07:43 +01:00
Boris Besemer
067f2ba61b Merge pull request #7 from LabD/feature/personalisablepage
Feature/personalisablepage
2016-11-15 10:54:24 +01:00
Boris Besemer
d663fbe4cb adds form 2016-11-15 10:53:48 +01:00
Boris Besemer
3ad3e58d16 adds form for creating new personalisation pages 2016-11-15 10:47:01 +01:00
Boris Besemer
fc078d5b76 fixes issues, page editor now visible 2016-11-15 09:26:37 +01:00
Boris Besemer
fc39a6f875 fixes edit handler 2016-11-15 09:10:10 +01:00
Boris Besemer
94f1d89102 adds an admin page form 2016-11-15 09:10:10 +01:00
Boris Besemer
0e8a19d944 adds cached property 2016-11-15 09:10:10 +01:00
Boris Besemer
baf6574bcf adds TranslatablePage model 2016-11-15 09:10:10 +01:00
Jasper Berghoef
ed71552c47 Forms in the create view 2016-11-14 13:51:32 +01:00
Boris Besemer
b60eea8800 Merge pull request #6 from LabD/feature/visit-count-per-page
Feature/visit count per page
2016-11-11 11:17:21 +01:00
Jasper Berghoef
6ce4da5d8d Translatable text in segment index 2016-11-10 22:30:08 +01:00
Jasper Berghoef
7f679831c3 Cleaned up wagtail_hooks 2016-11-10 16:38:06 +01:00
Jasper Berghoef
f74dad0b8b Per page visit counting! 2016-11-10 16:02:47 +01:00
Jasper Berghoef
173c6b6b34 Created migrations 2016-11-10 13:26:48 +01:00
Jasper Berghoef
9d17f24e05 Forgot to solve a conflict 2016-11-10 12:52:19 +01:00
Jasper Berghoef
f98e94ea10 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/personalisation/views.py
2016-11-10 12:51:34 +01:00
Jasper Berghoef
6886a8aaad Content for the rule modals. WIP 2016-11-10 12:50:51 +01:00
Boris Besemer
76757ea28e keep on kicking against that model admin 2016-11-10 12:44:32 +01:00
Boris Besemer
3e254fba04 adds custom create model form, wip 2016-11-10 11:29:40 +01:00
Jasper Berghoef
e2ff533e7a Middleware clean up 2016-11-10 11:23:21 +01:00
Jasper Berghoef
6b912b2e05 Removed print statements 2016-11-10 11:04:48 +01:00
Jasper Berghoef
78f4a085dd Moved the visit count function, saving more information (timestamp and segment id) in the segments session 2016-11-10 10:55:34 +01:00
Jasper Berghoef
821dcccfcb Some eenie weenie fixes 2016-11-10 09:27:26 +01:00
Jasper Berghoef
42bfbbad62 Removed unused import statement from filters 2016-11-10 09:02:54 +01:00
Jasper Berghoef
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
Jasper Berghoef
f0aeead152 Small fixes to Visit count, prevent middleware functionality on admin 2016-11-09 17:05:58 +01:00
Jasper Berghoef
42a8c93a60 Add localisation to segment overview stats 2016-11-09 16:00:25 +01:00
Jasper Berghoef
b47cfd67cc Add visit count and days to segment overview 2016-11-09 15:33:26 +01:00
Jasper Berghoef
b6c35e214a Import sorting and other code cleaning 2016-11-09 14:10:52 +01:00
Jasper Berghoef
7e8e395448 Model clean up 2016-11-09 12:56:16 +01:00
Jasper Berghoef
cbda3f93e3 Removed 'name' value from AbstractBaseRule 2016-11-09 12:40:19 +01:00
Boris Besemer
701e43b60e fixes query and migrations 2016-11-09 12:36:17 +01:00
Jasper Berghoef
267f2b05db Added Wagtail panels to rule models. 2016-11-09 12:09:47 +01:00
Boris Besemer
a4bd0ece20 changed inheritance to polymorphic 2016-11-09 11:18:59 +01:00
Jasper Berghoef
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
Jasper Berghoef
83ed5ca9bc Create empty 'segments' object in session if none exists 2016-11-09 10:12:44 +01:00
Jasper Berghoef
a8ae9f5c66 Set model admin "extra" to 0 to prevent weird behaviour and clean up the interface 2016-11-09 09:57:15 +01:00
Jasper Berghoef
c9343c770d Rule names 2016-11-09 09:46:23 +01:00
Jasper Berghoef
b3fb265f9d Removed delete button from overview 2016-11-08 17:47:27 +01:00
Jasper Berghoef
c7a8119ec9 Refactored segment model. Implemented 'enable' and 'disable' in overview 2016-11-08 17:32:27 +01:00
Jasper Berghoef
bd188edb8d Activated VisitCountRule as inline admin element 2016-11-08 16:18:47 +01:00