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

40485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
J. Cliff Dyer
9ee79a5729 Ensure ScorableXBlocks have rescore button. 2017-03-17 12:40:19 -04: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
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
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
Ned Batchelder
5e5f0c170e The exact version differs by open edx release 
(cherry picked from commit 1c7f35d44a68010f3dd9110061e9ecc55a641043)
 2017-03-13 14:13:55 -04:00
Ari Rizzitano
9033cd4cc8 bump xblock-poll to 1.2.6 (TNL-6359, TNL-6360) 
temporarily point xblock poll at my fork for testing

try egg version 1.2.6

actual bump
 2017-03-13 13:34:57 -04:00
Ned Batchelder
fa5e286236 Simplify HelpContextProcessorTest a little 
(cherry picked from commit acee7b55aff0c73c08552199c536d84555bcaae4)
 2017-03-13 13:21:46 -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
Jeremy Bowman
54d9bbd848 Merge pull request #14635 from edx/jmbowman/async_course_export_2 
PLAT-1121 Export courses asynchronously
 2017-03-13 11:34:59 -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
Jeremy Bowman
8d36c3825c PLAT-1121 Export courses asynchronously 2017-03-13 09:00:11 -04:00
Saleem Latif
d40e8c05e8 Merge pull request #14660 from edx/saleem-latif/ENT-232 
ENT-232: Add a switch for selecting pagination traversal in edx_api_utils
 2017-03-13 16:57:25 +05:00
Saleem Latif
381d136a06 Add a switch for selecting pagination traversal in edx_api_utils 2017-03-13 16:03:34 +05:00
Mushtaq Ali
7ab699bce6 Merge pull request #14659 from edx/mushtaq/remove-banner-logging 
Remove success banner on container state change
 2017-03-13 12:08:24 +05: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
Simon Chen
764ef48332 Add logging for user cookie send for sailthru 2017-03-10 10:10:37 -05:00
Mushtaq Ali
cb2d78bf34 Add logging on move xblock 
Add i18n to backend error messages in case they appear to end user
Remove success banner when trying to publish or discard changes on container page
 2017-03-10 19:25:03 +05:00
Jillian Vogel
36be4b2499 Merge pull request #14631 from open-craft/jill/ent-204-consent-wiki-forums 
[ENT-204] Require data sharing consent before accessing forum and wiki
 2017-03-10 12:09:23 +10:30
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