Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

22621 Commits

Author SHA1 Message Date
Matthew Piatetsky
d31a8a4dbc Toggle new program progress page with waffle switch 
ECOM-7389
 2017-03-20 13:23:42 -04:00
Albert (AJ) St. Aubin
8ec9012eac Merge pull request #14673 from edx/aj/missed_headers_styles 
Updates to correct a header styling issue
 2017-03-20 10:55:15 -04:00
Albert St. Aubin
91fce2a92b Updates to correct a header styling issue and to make the starting header level selectable 2017-03-20 08:37:33 -04:00
Nimisha Asthagiri
2b0ff8e3a3 Storage-backed Block Structures: Use correct bucket 
TNL-6645
 2017-03-20 00:05:06 -04:00
Nimisha Asthagiri
a2daa8d0fd Move generate_course_blocks to block_structure 2017-03-20 00:04:16 -04:00
Matthew Piatetsky
bf08c6ed7c Merge pull request #14698 from edx/ECOM-6601 
ECOM-6601 Update display of progress on programs dashboard
 2017-03-19 19:04:50 -04:00
Jillian Vogel
be088dd924 Adds settings.ENTERPRISE_PUBLIC_ENROLLMENT_API_URL 
which is used for external, client-side requests by the Enterprise app to the
Enrollments API.

This allows ENTERPRISE_ENROLLMENT_API_URL to use localhost:8000, to be used for
internal, server-side requests.

Bumps edx-enterprise version to 0.27.4 to use this change.
 2017-03-18 12:43:53 +10:30
Nimisha Asthagiri
6a954c1e4e Merge pull request #14690 from edx/neem/fix-entrance-exam-grades 
Fix grading for Entrance Exams
 2017-03-17 19:04:35 -04:00
Matthew Piatetsky
f9f5119277 Update display of progress on programs dashboard 
ECOM-6601
 2017-03-17 19:02:15 -04:00
Nimisha Asthagiri
54d938cab5 Fix grading for Entrance Exams 
TNL-6227
 2017-03-17 17:32:36 -04:00
Uzair Rasheed
a8277a6a64 Merge pull request #14658 from edx/uzairr/TNL-6639 
TNL-6639 Add timeout in request to xqueue
 2017-03-18 02:00:38 +05:00
Nimisha Asthagiri
a77c345a58 Merge pull request #14689 from edx/neem/fix-milestone-grades 
Fix grading for Gated Subsections
 2017-03-17 16:10:12 -04:00
AsadAzam
6a85cd1a7c Merge pull request #14712 from edx/TNL-6637-whitelist-logs 
Added logs for adding/removing students from whitelist
 2017-03-17 21:11:29 +05:00
Michael Youngstrom
195e7f27d3 Disable Django API browser and bump pa11ycrawler 
Force run on PR for testing

Remove pa11ycrawler from base.txt for testing

Update pa11ycrawler dependency

Revert code needed for testing on Jenkins

Enable testing for Jenkins

Update accessibility-tests.sh

Update accessibility-tests.sh

Point to newest pa11ycrawler release

Remove force run on PR

Reset accessibility-tests.sh
 2017-03-17 13:51:13 +00:00
Asad Azam
9ae3a3210b Added logs for adding/removing students from whitelist 2017-03-17 17:48:19 +05:00
uzairr
d117222f7c Add timeout in request to xqueue 2017-03-17 10:23:20 +00:00
M. Rehan
3c040b93c2 Merge pull request #14704 from edx/mrehan/strip-edx-video-id 
TNL-5769 – strip video id on saving the video
 2017-03-17 12:56:41 +05:00
Muhammad Ammar
7766e15a65 Merge pull request #14684 from edx/ammar/backend-changes-to-support-hls 
backend changes to support hls
 2017-03-17 12:46:26 +05:00
Nimisha Asthagiri
634ac8a825 Still compute grades asynchronously when PersistentGrades is enabled 2017-03-16 18:26:17 -04:00
Ned Batchelder
73850f4627 Update translations (autogenerated message) 2017-03-16 14:07:42 -04:00
Ned Batchelder
75cb211cbe Update translations (autogenerated message) 2017-03-16 14:07:41 -04:00
sanfordstudent
2604cd24bb Merge pull request #14675 from edx/sstudent/TNL-6644 
change rescore-if-higher to update if scores are equal
 2017-03-16 11:59:39 -04:00
Qubad786
4a2589c7c3 strip video id on saving the video 2017-03-16 19:48:46 +05:00
muhammad-ammar
5ec5e97a0c backend changes to support hls 
TNL-6541
 2017-03-16 19:30:49 +05:00
Sanford Student
9a44777335 changes is score higher to use gtoe 
for TNL-6644
 2017-03-16 10:25:37 -04:00
attiyaishaque
abcbb09414 TNL-6188 Escaping in course outline section & subsection. 2017-03-16 11:13:28 +05:00
Nimisha Asthagiri
cfb032a50c Fix grading for Gated Subsections 
TNL-5955
 2017-03-15 17:16:20 -04:00
Eric Fischer
e9b193436b Merge pull request #14688 from edx/efischer/email_all_modes 
All modes are valid bulk email targets
 2017-03-14 16:15:15 -04:00
Eric Fischer
39363c1171 All modes are valid bulk email targets 2017-03-14 14:43:40 -04:00
David Ormsbee
294bbe7fe0 Test speedup: Monkey patch Kombu entrypoints fn. 
We monkey patch Kombu's entrypoints listing because scanning through
this accounts for the majority of LMS/Studio startup time for tests,
and we don't use custom Kombu serializers (which is what this is for).
Still, this is pretty evil, and should be taken out when we update
Celery to the next version where it looks like this method of custom
serialization has been removed.

FWIW, this is identical behavior to what happens in Kombu if
pkg_resources isn't available.
 2017-03-14 13:45:40 -04:00
Albert (AJ) St. Aubin
be0fad1b4b Merge pull request #14662 from edx/aj/TNL-6356_show_answer_notification 
Updates to add a show answer notification and update focus when the
 2017-03-13 13:00:31 -04:00
Albert St. Aubin
b4956cf1cb Updates to add a show answer notification and update focus when the notification is shown. 
TNL-6356
 2017-03-13 09:31:40 -04:00
Clinton Blackburn
4cc7628696 Upgraded to Python Social Auth 0.2.21 to resolve migration issue 2017-03-10 23:06:02 -05:00
Simon Chen
5cd3a86382 Merge pull request #14668 from edx/schen/add_logging 
Add logging for user cookie send for sailthru
 2017-03-10 13:29:40 -05:00
Joel Barciauskas
630985b3cc Wrap all newrelic dependencies in a check to see if the module is loaded 2017-03-10 12:22:08 -05:00
Simon Chen
764ef48332 Add logging for user cookie send for sailthru 2017-03-10 10:10:37 -05:00
Jillian Vogel
25383a603e Ensure Enterprise-integrated courses require user consent before granting access to Wiki and Discussion forum. 
* User-facing links are gated; internal services are not.
* Adds view decorator data_sharing_consent_required
* Renames `get_course_specific_consent_url` to `get_enterprise_consent_url`,
  which now checks `consent_needed_for_course` before returning a consent URL.
 2017-03-10 09:29:24 +10:30
Cliff Dyer
27dc58464b Merge pull request #14639 from edx/neem/scorable-xblock 
Make instructor_tasks aware of ScorableXBlockMixin
 2017-03-09 17:08:47 -05:00
J. Cliff Dyer
21b224ec59 Give instructor task knowledge of new rescore. 
* Bump xblock version
* Update rescore instructor task helper to handle generic rescore.
* Add set_score to grade signal handler.
 2017-03-09 14:59:06 -05:00
Ned Batchelder
7d7f17a3b3 Merge pull request #14663 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-03-09 14:03:09 -05:00
Brian Jacobel
6eda14e72e Merge pull request #14629 from edx/bjacobel/bourbon-warnings 
Quiet Bourbon deprecation warnings, UXPL upgrade 0.18.1
 2017-03-09 12:42:18 -05:00
Ned Batchelder
9d9266f1c5 Update translations (autogenerated message) 2017-03-09 16:17:10 +00:00
Ned Batchelder
15a4fc420a Update translations (autogenerated message) 2017-03-09 12:08:25 +00:00
rabiaiftikhar
ccfa3ea74d TNl-6610 Fix "more" menu on discussion post for global staff. 2017-03-09 14:16:31 +05:00
Calen Pennington
0c30c06a78 Merge pull request #14656 from edx/release-mergeback-to-master 
Merge release back to master
 2017-03-08 15:23:50 -05:00
Albert (AJ) St. Aubin
22f58606af Merge pull request #14564 from edx/aj/TNL-6347_headers 
Aj/tnl 6347 headers
 2017-03-08 13:27:40 -05:00
Nimisha Asthagiri
1224e341de Revert "Merge pull request #14588 from edx/efischer/kill_stuff" 
This reverts commit 83f2be4929, reversing
changes made to 01ed17426f.
 2017-03-08 13:10:48 -05:00
Albert St. Aubin
7c7c27183f changes header levels for a11y 
TNL-6347
 2017-03-08 11:45:45 -05:00
Ahsan Ulhaq
e51c692ef8 Merge pull request #14570 from edx/ahsan/ECOM-6463-login-should-not-point-asset-new 
login should not point asset new
 2017-03-08 18:26:07 +05:00
Clinton Blackburn
078974d24a Disabled search for Docker-based devstack 
This feature is not well-documented, so it is unclear how to setup Elasticsearch properly to make it work. The next person who needs to work on this feature will need to make it work and, ideally, document it.
 2017-03-07 21:21:49 -05:00