Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
43,773 Commits 1 Branch 0 Tags
cdcb4be0773caca7f31c647687713fa944d79bae
Commit Graph

43773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jillian Vogel
cdcb4be077 Adds "all_sources" field to Mobile API and video module Course Blocks 
student_view_data.

Added to both places because the iOS app uses both APIs data to provide
downloadable videos.
 2017-12-11 23:59:52 +10:30
Brian Mesick
c9c67e0827 Merge pull request #16644 from edx/bmedx/django111_fix_startup 
Fix Django 1.11 startup
 2017-11-21 15:36:07 -05:00
Eric Fischer
3e9e97e6d8 Merge pull request #16635 from edx/efischer/EDUCATOR-1773 
No unicode in "from" value on Bulk Emails
 2017-11-21 13:01:42 -05:00
Christopher Lee
0d931107aa Merge pull request #16589 from edx/clee/LEARNER-2891 
Remove uneccessary aria labels in the student dashboard
 2017-11-21 12:52:31 -05:00
Jeremy Bowman
6457e76d02 Merge pull request #16612 from edx/jmbowman/PLAT-1199 
PLAT-1199 Stop using pycrypto
 2017-11-21 12:45:19 -05:00
bmedx
048b609f87 Fix Django 1.11 startup 2017-11-21 11:58:38 -05:00
Eric Fischer
19c580e52f No unicode in "from" value on Bulk Emails 
Until https://github.com/django-ses/django-ses/issues/137 is resolved, we need
to proactively search for and prevent unicode values in from_addr.

EDUCATOR-1773
 2017-11-21 11:32:31 -05:00
Jeremy Bowman
43a11af735 PLAT-1199 Stop using pycrypto 2017-11-21 11:25:48 -05:00
Jeremy Bowman
80d7cefd3c Merge pull request #16632 from edx/jmbowman/PLAT-1413 
PLAT-1413 Remove TEMPLATE_DEBUG setting
 2017-11-21 10:26:49 -05:00
Rabia Iftikhar
7316002f28 Merge pull request #16623 from edx/ri/edx-organizatios-update-version 
update edx-organizations version
 2017-11-21 12:18:01 +05:00
Farhanah Sheets
f79a7b6e0b Merge pull request #16634 from edx/fsheets/EDUCATOR-1559 
Discussion Add Post - Add Explicit Labeling of Discussion Checkboxes
 2017-11-20 16:03:12 -05:00
Farhanah Sheets
7c7a147e8d Merge pull request #16628 from edx/fsheets/EDUCATOR-1561 
Discussion Add Post - Update sr Label to Match Visual Label
 2017-11-20 16:02:42 -05:00
Troy Sankey
1e09a548b1 Merge pull request #16568 from edx/pwnage101/set_language_shim_PLAT-1353 
Avoid a django breaking change: set_language response code
 2017-11-20 15:08:11 -05:00
Troy Sankey
bff8c08245 Avoid a django breaking change: set_language response code 
In Django 1.10+, the set_language view (/i18n/setlang) will respond to
Ajax requests which do not contain a "next" parameter with status 204 No
Content instead of 304.  This commit adds the "next" parameter to the
request in order to ensure that upgrading to Django 1.10+ will not cause
the set_language view to change behavior.

PLAT-1353
 2017-11-20 15:02:13 -05:00
Jeremy Bowman
8b3f81f3b4 PLAT-1413 Remove TEMPLATE_DEBUG setting 2017-11-20 14:39:36 -05:00
Farhanah Sheets
70874502dd Add for/id attributes for explicit labeling of discussion checkboxes 2017-11-20 14:25:01 -05:00
Farhanah Sheets
c8c3b55390 Update sr label to match visual label 2017-11-20 13:55:59 -05:00
Robert Raposa
d9420fc029 Merge pull request #16626 from edx/robrap/lower-thresholds 
Lower thresholds.
 2017-11-20 13:49:35 -05:00
christopher lee
4e32bd5abb Fix aria label for course details on the course dashboard 2017-11-20 13:48:17 -05:00
John Eskew
bf146de054 Merge pull request #16585 from edx/jeskew/enable_pylint_again 
Fix the systems parsing code for pylint.
 2017-11-20 11:00:05 -05:00
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
Robert Raposa
1fdba18502 Lower thresholds. 2017-11-20 10:27:51 -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
rabia23
3a50091e81 update edx-organizations version 2017-11-20 14:12:48 +00: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
John Eskew
c78ccf8fc1 Fix the systems parsing code for pylint. 
Add lower pylint error threshold to guard against unsuccessful runs.
Increase upper pylint threshold. Add tests for pylint option parsing.
 2017-11-18 10:50:20 -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