Commit 5420b565 authored by Laury Bueno's avatar Laury Bueno

Merge branch 'notifications' into develop

 Conflicts:
	requirements/local.txt
parents 1e11a607 cfa3a1e2
Pipeline #8225 passed with stage
in 21 seconds
......@@ -77,6 +77,7 @@ LOCAL_APPS = [
'courses_gamification.apps.CoursesGamificationConfig',
'courses_reports.apps.CoursesReportsConfig',
'courses_legacy.apps.CoursesLegacyConfig',
'courses_notifications.apps.CoursesNotificationsConfig',
'courses_legacy.administration',
]
......
......@@ -29,4 +29,3 @@ pytest-sugar==0.9.2
-e ext-apps/django-discussion
-e ext-apps/django-messages-courier
-e ext-apps/django-courses-notifications
......@@ -22,12 +22,13 @@ django-anymail==5.0
raven==6.10.0
# <external_app>
git+https://git.hacklab.com.br/hackmooc/django-courses.git@v0.2.0#egg=django-courses
git+https://git.hacklab.com.br/hackmooc/django-courses.git@v0.3.0#egg=django-courses
git+https://git.hacklab.com.br/hackmooc/django-courses-learning-objects.git@v0.1.0#egg=django-courses-learning-objects
git+https://git.hacklab.com.br/hackmooc/django-courses-certification.git@v0.1.0#egg=django-courses-certification
git+https://git.hacklab.com.br/hackmooc/django-courses-certification.git@v0.1.1#egg=django-courses-certification
git+https://git.hacklab.com.br/hackmooc/django-courses-gamification.git@master#egg=django-courses-gamification
git+https://git.hacklab.com.br/hackmooc/django-courses-reports.git@master#egg=django-courses-reports
git+https://git.hacklab.com.br/hackmooc/django-courses-legacy.git@v0.2.4#egg=django-courses-legacy
git+https://git.hacklab.com.br/hackmooc/django-courses-legacy.git@v0.2.5#egg=django-courses-legacy
git+https://git.hacklab.com.br/hackmooc/django-courses-notifications.git@v0.1.0#egg=django-courses-notifications
git+https://github.com/hacklabr/django-discussion.git@v0.1.2#egg=django-discussion
git+https://github.com/hacklabr/django-discussion.git@v0.2.1#egg=django-discussion
git+https://github.com/hacklabr/django-messages-courier.git@master#egg=django-messages-courier
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment