Brian Mesick
d2d764390f
Merge pull request #16610 from edx/bmedx/django111_commaseparated_fields
...
Move suggested_prices to CharField for Django 1.11 compat
2017-11-20 10:55:40 -05:00
Brian Mesick
781af9ce15
Merge pull request #16600 from edx/bmedx/i18n_tools_hans_fix
...
Fix lang mapping for zh_HANS
2017-11-20 10:55:21 -05:00
Sofiya Semenova
14c1f5bd00
Merge pull request #16616 from edx/sofiya/clean
...
Don't get the site object unless the message is going to be sent
2017-11-20 10:32:21 -05:00
Eric Fischer
b78d5061fc
Merge pull request #16597 from edx/efischer/EDU-1685-followup
...
Follow up to #16473
2017-11-20 10:05:36 -05:00
Gabe Mulley
2ddf3eafdd
Merge pull request #16609 from edx/mulby/fix-schedules-landing-page
...
ensure landing page for scheduled emails is not a redirect
2017-11-20 08:49:23 -05:00
Gabe Mulley
7dbe2cd89d
ensure landing page for scheduled emails is not a redirect
2017-11-20 07:12:31 -05:00
Hasnain Naveed
e1bf86226a
Merge pull request #16608 from edx/hasnain-naveed/WL-1257
...
WL-1257 | Removed the hard-coded "edX" related strings from nudges em…
2017-11-20 15:56:14 +05:00
Nimisha Asthagiri
fabccf6163
Merge pull request #16614 from edx/pacing/enable-highlights-field
...
Add highlights_enabled_for_messaging course field
2017-11-17 19:47:09 -05:00
John Eskew
a4474385ec
Merge pull request #16606 from edx/jeskew/remove_default_manager_access
...
Add a proper get_queryset() method to remove _default_manager access.
2017-11-17 17:07:06 -05:00
Gabe Mulley
3bc05d372e
Merge pull request #16613 from edx/mulby/remove-restrictions-on-schedule-updates
...
Remove restrictions on schedule updates when course start dates change
2017-11-17 16:17:29 -05:00
Fred Smith
29f8180763
Merge pull request #16593 from edx/derf/be_able_to_configure_default_video_cdn_url
...
be able to configure default video cdn url
2017-11-17 15:38:35 -05:00
Sofiya Semenova
e77137c2f9
Don't get the site object unless the message is going to be sent
2017-11-17 15:33:20 -05:00
Nimisha Asthagiri
3ae87dd9d7
Update Studio API to include highlights_enabled_for_messaging
2017-11-17 14:53:52 -05:00
Nimisha Asthagiri
8b0693f229
Add highlights_enabled_for_messaging course field
2017-11-17 14:42:46 -05:00
Gabe Mulley
1f3085b2bc
rename test methods
2017-11-17 14:05:15 -05:00
Anthony Mangano
77100cd47d
Merge pull request #16594 from edx/release-mergeback-to-master
...
Merge release back to master
2017-11-17 13:59:53 -05:00
Harry Rein
6a2f46e061
Merge pull request #16592 from edx/fix-footer-scope-to-fix-btn-styling
...
Scope base build to footer only.
2017-11-17 13:45:05 -05:00
Sofiya Semenova
1d08f71336
Merge pull request #16599 from edx/sofiya/ed-1590-2
...
ed-1590 Templates for email forum notifications
2017-11-17 13:36:26 -05:00
Gabe Mulley
a6387c0e5f
log changes to the start date
2017-11-17 13:34:15 -05:00
Gabe Mulley
26303580a5
update schedule start when course start date changes
2017-11-17 13:28:31 -05:00
Albert (AJ) St. Aubin
8b8677a093
Merge pull request #16575 from edx/aj/entitlement_user_filter
...
Addition of user filter parameter to the Entitlement API
2017-11-17 08:22:01 -05:00
Hasnain
bf2ca3adcd
WL-1257 | Removed the hard-coded "edX" related strings from nudges emails.
2017-11-17 12:06:50 +05:00
John Eskew
9292741fdd
Add a proper get_queryset() method to remove _default_manager access.
...
Remove the now-unused custom model manager for coupons.
2017-11-16 22:05:08 -05:00
bmedx
f93696ca85
Move suggested_prices to CharField for Django 1.11 compat
...
CommaSeparatedIntegerField is deprecated, this is the replacement. I
have confirmed there is no SQL generated for this migration since it is
already a CharField behind the scenes.
2017-11-16 17:35:41 -05:00
Ayub khan
f097b7149c
Merge pull request #16588 from edx/update_translations_16_nov
...
Update translations
2017-11-17 02:38:23 +05:00
bmedx
13ca6343ce
Fix lang mapping for zh_HANS
2017-11-16 15:38:18 -05:00
Sofiya Semenova
821db8aa11
ed-1590 Templates for email forum notifications
2017-11-16 15:26:56 -05:00
Fred Smith
14c7c5086e
be able to configure default video cdn url
2017-11-16 14:30:18 -05:00
Albert St. Aubin
d918cdb81e
Addition of user filter parameter to the Entitlement API
...
[LEARNER-3274]
2017-11-16 13:52:54 -05:00
John Eskew
ee36534fde
Merge pull request #16574 from edx/jeskew/add_request_limits_for_django110
...
Add request limits to LMS/CMS Django settings.
2017-11-16 13:13:46 -05:00
Eric Fischer
71aaf6127e
Follow up to #16473
...
This rule needs an !important in order to override the inline style
2017-11-16 13:08:18 -05:00
Harry Rein
b6f55c24b9
Scope base build to footer only.
2017-11-16 12:20:48 -05:00
Alex Dusenbery
2fbdb8f6b3
EDUCATOR-1590 | Test that we can actually render the forum emails.
2017-11-16 12:19:16 -05:00
Alex Dusenbery
c28427fd09
EDUCATOR-1590 | Message context usernames should come from django models.
2017-11-16 12:19:16 -05:00
Christopher Lee
926c745a4c
Merge pull request #16372 from proversity-org/proversity/default-course-mobile-availability
...
add DEFAULT_MOBILE_AVAILABLE flag
2017-11-16 11:12:48 -05:00
Anthony Mangano
8bdbb38b08
Merge pull request #16582 from edx/amangano/fix-spanish-translations
...
Fix Spanish translations
2017-11-16 10:48:29 -05:00
Stu Young
d6970826f6
Merge pull request #16581 from edx/estute/stop-writing-quality-violations-to-console
...
stop writing linting violations to console
2017-11-16 10:25:28 -05:00
Brian Mesick
4223bf700b
Merge pull request #16567 from edx/bmedx/django111_get_prep_lookup
...
Change get_prep_lookup to a Lookup
2017-11-16 10:16:42 -05:00
Jose Antonio Gonzalez
f38e5ab939
add DEFAULT_MOBILE_AVAILABLE flag
2017-11-16 16:50:37 +02:00
Carol Tong
ebe857373a
Merge pull request #16483 from edx/carol/DOC-3822
...
DOC-3822 Make 2 steps more obvious in credit eligible email
2017-11-16 09:44:36 -05:00
Bill Filler
03c97b5697
Merge pull request #16583 from edx/bfiller/ENT-727
...
Disable View Consent button on dashboard
2017-11-16 09:42:46 -05:00
Gabe Mulley
39575bcf4d
Merge pull request #16586 from edx/fix-email-tracking
...
coerce UUIDs to strings when logging email sent events
2017-11-16 08:52:46 -05:00
Asad Iqbal
3132d29ca5
Merge pull request #16557 from edx/asadiqbal08/ENT-729
...
ENT-729 asadiqbal08/Authenticating directly using "tpa_hint" URL link the learner to enterprise customer
2017-11-16 17:58:53 +05:00
asadiqbal
e5c55a8945
ENT-729
2017-11-16 16:28:31 +05:00
ayub-khan
6fb44898f8
update translations
2017-11-16 16:03:38 +05:00
Noraiz Anwar
ded3422790
Merge pull request #16587 from edx/noraiz/EDUCATOR-1732
...
remove temporary log
2017-11-16 14:32:49 +05:00
David Ormsbee
b03369579b
Merge pull request #16477 from edx/ormsbee/consolidate_theme_js
...
Remove collection of JS bundles for themes.
2017-11-16 03:10:15 -05:00
noraiz-anwar
8028d7aede
remove temporary log
2017-11-16 12:59:52 +05:00
Gabe Mulley
6de115545a
coerce UUIDs to strings when logging email sent events
2017-11-15 22:34:54 -05:00
Gabe Mulley
a4095e49b2
fix discussion notifications emails
2017-11-15 21:06:46 -05:00
