Skip to content

Commit

Permalink
Merge branch 'release/10.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
moh-moola committed Sep 23, 2019
2 parents 41b782e + ca115a7 commit eee22b0
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 10 deletions.
5 changes: 5 additions & 0 deletions CHANGES.rst
@@ -1,5 +1,10 @@
CHANGE LOG
==========

10.0.0
------
- Add support for Molo 10 and Django 2.2

8.0.0
-----
- Add support for Molo 8 and drop Python 2 support
Expand Down
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
8.0.0
10.0.0
2 changes: 1 addition & 1 deletion molo/pwa/tests/test_notifications.py
Expand Up @@ -4,7 +4,7 @@
from mock import patch

from django.contrib.auth.models import User
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.test import TestCase, Client

from fcm_django.models import FCMDevice
Expand Down
12 changes: 6 additions & 6 deletions molo/pwa/urls.py
@@ -1,4 +1,4 @@
from django.conf.urls import url
from django.conf.urls import re_path

from fcm_django.api.rest_framework import FCMDeviceViewSet
from rest_framework.routers import DefaultRouter
Expand All @@ -12,11 +12,11 @@
router.register(r'devices', FCMDeviceViewSet)

urlpatterns += [
url(
re_path(
r'^notification_devices/$', RegistrationTokenView.as_view(),
name='registration-token'),
url('^serviceworker.js$', service_worker),
url('^manifest.json$', manifest),
url('^fcm.js$', fcm),
url('^toast.min.js$', toast),
re_path('^serviceworker.js$', service_worker),
re_path('^manifest.json$', manifest),
re_path('^fcm.js$', fcm),
re_path('^toast.min.js$', toast),
]
4 changes: 2 additions & 2 deletions requirements.txt
@@ -1,7 +1,7 @@
molo.core<9.0.0,>=8.0.0
molo.core>=10.0.0,<11.0.0
celery<4.0
django-celery
psycopg2
html5lib==0.9999999
fcm-django
Unidecode==0.04.16
Unidecode==0.04.16

0 comments on commit eee22b0

Please sign in to comment.