Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,501 Commits 1 Branch 0 Tags
2b0ff8e3a3e1a3c092059f2b0d8ee2163fc2bb5d
Commit Graph

40501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nimisha Asthagiri
2b0ff8e3a3 Storage-backed Block Structures: Use correct bucket 
TNL-6645
 2017-03-20 00:05:06 -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
9330cca5ac Merge pull request #14671 from open-craft/jill/enterprise-public-enrollment-api-url 
Adds ENTERPRISE_PUBLIC_ENROLLMENT_API_URL to settings
 2017-03-18 18:23:47 +10:30
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
228eb5103b Merge pull request #14661 from edx/michaelyoungstrom/django_setting_change 
Disable Django API browser
 2017-03-17 10:58:18 -04:00
Jesse Shapiro
09751421ef Merge pull request #14709 from open-craft/haikuginger/update-enterprise-0.27.3 
[ENT-215/ENT-217] Update edx-enterprise to 0.27.3
 2017-03-17 10:52:14 -04: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
M. Rehan
dd6b203cf0 Merge pull request #14664 from edx/mrehan/prioritize-youtube-subs-over-html5-on-save 
TNL-6539 – Prioritize youtube subs over html5 ones
 2017-03-17 12:23:06 +05:00
Nimisha Asthagiri
790208495a Merge pull request #14706 from edx/neem/async-grade-enabled 
Compute grades asynchronously although PersistentGrades is disabled
 2017-03-16 21:53:10 -04:00
Jesse Shapiro
a06f915230 Update edx-enterprise to 0.27.3 2017-03-16 18:37:54 -04:00
Nimisha Asthagiri
634ac8a825 Still compute grades asynchronously when PersistentGrades is enabled 2017-03-16 18:26:17 -04:00
Ned Batchelder
11788282b7 Merge pull request #14702 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-03-16 15:00:12 -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
Jeremy Bowman
165f348a36 Merge pull request #14696 from edx/jmbowman/PLAT-1198 
PLAT-1198 Fix flaky navigation buttons test
 2017-03-16 10:09:08 -04:00
Attiya Ishaque
474ad1a01b Merge pull request #14693 from edx/ai/TNL-6188-escaping 
TNL-6188 Escaping in course outline section & subsection.
 2017-03-16 18:58:22 +05:00
Qubad786
0ff62e766e prioritize youtube transcripts over html5 ones 2017-03-16 14:38:51 +05: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
Jeremy Bowman
c28e67732e PLAT-1198 Fix flaky navigation buttons test 2017-03-15 15:45:22 -04:00
Jesse Zoldak
173e592203 Merge pull request #14697 from edx/zoldak/pin-sinon 
Pin sinon version to be under v2.0.0
 2017-03-15 15:42:49 -04:00
Ari Rizzitano
d96bd9449b Merge pull request #14565 from edx/arizzitano/xblock-poll-1.2.6 
update xblock-poll version to 1.2.6
 2017-03-15 15:08:31 -04:00
Jesse Zoldak
20447f287e Pin sinon version to be under v2.0.0 2017-03-15 14:55:44 -04:00
Brian Jacobel
de32e69b8d Merge pull request #14680 from edx/bjacobel/discussion-dupe-ids 
Fix duplicated ids in discussion action menus
 2017-03-15 13:28:51 -04:00
Saleem Latif
0300fb1c6e Merge pull request #14683 from edx/saleem-latif/ENT-238 
ENT-238: Version upgrade of edx-enterprise to 0.27.0
 2017-03-15 11:27:32 +05: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
Ned Batchelder
cba73414be Merge pull request #14677 from edx/nedbat/safer-make-clean 
Safer "make clean"
 2017-03-14 15:34:05 -04:00
David Ormsbee
291945b6f0 Merge pull request #14686 from edx/ormsbee/test_startup_speed_monkeypatch_kombu 
Test speedup: Monkey patch Kombu entrypoints fn.
 2017-03-14 15:24:38 -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
Ned Batchelder
23c1ee3231 Merge pull request #14679 from edx/nedbat/flexible-help-link-tests 
HelpContextProcessorTest improvements from the Ficus branch.
 2017-03-14 10:20:57 -04:00
Ned Batchelder
f7f16b0a93 Safer "make clean" 
This would fail if the "git clean" step failed, and would not restore
your private files. Running it again would then fail to make an empty
tarball, clobbering the saved private files.  Now we are more resilient
to a number of failure modes.
 2017-03-14 10:00:13 -04:00
Saleem Latif
a33fd16267 Version upgrade of edx-enterprise to 0.27.0 2017-03-14 14:20:02 +05:00
Mushtaq Ali
40621b6cc2 Merge pull request #14315 from edx/mushtaq/move-component 
Move a component
 2017-03-14 12:58:20 +05:00
Brian Jacobel
85fc5871d6 Fix template to escape rendered strings 2017-03-13 17:50:16 -04:00
Brian Jacobel
b3674b34ab Fix duplicated ids in discussion action menus 2017-03-13 15:14:01 -04:00