8
Commit Graph

749 Commits

Author SHA1 Message Date
Kaitlyn Crawford
86e669e4f4 Add custom js files to segment create view 2019-01-16 12:02:14 +02:00
sewagodimo
807005461e update version to 1.0.3 2019-01-10 17:13:38 +02:00
sewagodimo
7f9e0971f5 Merge tag '1.0.3' into develop
bugfix:exclude variant returns queryset when params is queryset
2019-01-10 16:12:20 +02:00
sewagodimo
a4a1a2ddca Merge branch 'release/1.0.3' 2019-01-10 16:12:14 +02:00
sewagodimo
9cc6e966ba bugfix:exclude variant returns queryset when params is queryset 2019-01-10 16:12:01 +02:00
Sewagodimo
311abeb6c8 Merge pull request #30 from praekeltfoundation/feature/GEWEB-746-fix-panel-server-error
exclude variants should return a list when a list if given or a queryset
2019-01-10 15:05:56 +02:00
sewagodimo
60675203c6 fixed some comments 2019-01-10 14:51:43 +02:00
sewagodimo
ceef806301 add tests for varient exclusion use cases 2019-01-10 14:47:18 +02:00
sewagodimo
650e061f91 assign pages on exclude 2019-01-10 14:47:01 +02:00
sewagodimo
9235932f00 update exclude varient format and add variants to tests 2019-01-10 12:41:53 +02:00
Kaitlyn Crawford
1e0efc975a Merge tag '1.0.2' into develop
1.0.2
2019-01-09 19:14:24 +02:00
Kaitlyn Crawford
7517dcd051 Merge branch 'release/1.0.2' 2019-01-09 19:14:17 +02:00
Kaitlyn Crawford
94c9efa315 Bump version to 1.0.2 2019-01-09 19:14:07 +02:00
Sewagodimo
f73e59421b Merge pull request #29 from praekeltfoundation/feature/GEWEB-740-upgrade-to-wagtail-2.2
Upgrade to wagtail 2.2
2019-01-09 17:39:44 +02:00
sewagodimo
f054b86e07 fix flake error in conftest 2019-01-09 17:25:56 +02:00
sewagodimo
cbb56847ae fix flake8 error 2019-01-09 17:17:51 +02:00
sewagodimo
b135e79c77 remove trailing print 2019-01-09 17:04:00 +02:00
sewagodimo
5cd8751450 add ve to the gitignore 2019-01-09 16:56:38 +02:00
sewagodimo
c07b280276 allow database access for tests 2019-01-09 16:55:06 +02:00
sewagodimo
28266c4500 fix flake error 2019-01-09 16:54:49 +02:00
sewagodimo
94a5c6b289 tests for querysets in variant_exclude 2019-01-09 16:54:28 +02:00
sewagodimo
875d8302de exclude variants should return a list when a list if given or a queryset 2019-01-09 16:54:04 +02:00
sewagodimo
4c09ad4ca7 fix flake error W504 2019-01-09 16:52:26 +02:00
Kaitlyn Crawford
0d260a12a4 Tell travis to use wagtail 2.2 2019-01-09 16:28:31 +02:00
Kaitlyn Crawford
7888f0b615 Upgrade to wagtail 2.2 in requirements and tests 2019-01-09 16:12:05 +02:00
Kaitlyn Crawford
02e63ed82c Merge tag '1.0.1' into develop
1.0.1
2019-01-02 17:28:58 +02:00
Kaitlyn Crawford
a411ad1ccc Merge branch 'release/1.0.1' 2019-01-02 17:28:50 +02:00
Kaitlyn Crawford
1a1df18bf3 Bump version to 1.0.1 2019-01-02 17:28:36 +02:00
Kaitlyn Crawford
56d28faec8 Merge branch 'master' into develop 2019-01-02 17:24:40 +02:00
Kaitlyn
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
Kaitlyn Crawford
d3f4d42d82 Define panel for rules to handle InlinePanel changes 2019-01-02 16:51:56 +02:00
Kaitlyn Crawford
4c08581919 Merge tag '1.0.0' into develop
1.0.0
2018-12-18 14:03:39 +02:00
Kaitlyn Crawford
11886ae135 Merge branch 'release/1.0.0' 2018-12-18 14:03:29 +02:00
Kaitlyn Crawford
83cc7f790e Bump version to 1.0.0 2018-12-18 14:03:01 +02:00
Kaitlyn Crawford
dcdeb4e9a2 Update imports in examples in docs 2018-12-18 14:02:01 +02:00
Kaitlyn
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
Kaitlyn Crawford
0f9bfb0343 Tell travis to use Wagtail 2.0 2018-12-18 13:37:34 +02:00
Kaitlyn Crawford
1c74e6cfb9 Update Wagtail imports to work for 2.0 2018-12-18 13:32:02 +02:00
Kaitlyn Crawford
9c45ac56db Upgrade Wagtail to 2.0 in requirements and tests 2018-12-18 13:30:27 +02:00
Kaitlyn Crawford
2f7b92fb2e Run tests on python 3.6 2018-12-18 10:40:45 +02:00
blurrah
1e69d929aa Bump version: 0.12.0 → 0.12.1 2018-09-26 20:42:26 +02:00
blurrah
a178a8b533 Fix django classifier version number 2018-09-26 20:40:42 +02:00
blurrah
f2e01c803a Bump version: 0.11.3 → 0.12.0 0.12.0 2018-09-26 14:23:05 +02:00
Jasper Berghoef
eb9d4f3e31 Update changelog for version 0.12.0 2018-09-26 14:20:18 +02:00
Boris Besemer
4ceb59c719 Merge pull request #193 from ixc/relax-wagtail-constraint
Remove overly restrictive wagtail dependency version constraint (#192)
2018-09-26 08:14:59 +02:00
Tai Lee
6fcab3ac11 Remove overly restrictive wagtail dependency version constraint (#192) 2018-09-26 11:00:47 +10:00
tm-kn
1f464adaa7 Do not generate sitemap entries for variants (#187) 2018-09-25 07:57:41 +02:00
tm-kn
d15f6c37d3 Return 404 if variant page is accessed directly (#188) 2018-09-25 07:57:06 +02:00
tm-kn
7d679d7111 Add origin country rule (#190) 2018-09-25 07:51:25 +02:00
tm-kn
b11a6ce4ca Add missing TOXENV=lint to Travis (#191) 2018-09-25 07:50:54 +02:00