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

39400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
alisan617
a5039f6342 make cohorts filter dropddown fit inside the thread list view 2016-11-18 16:47:13 -05:00
Nimisha Asthagiri
bc551b9b25 Merge pull request #14001 from edx/beryl/get-max-score-opt 
Optimize max_score by moving from XModule to Descriptor
 2016-11-18 11:41:55 -05:00
Max Rothman
0f7f83ac1b Merge pull request #14024 from edx/release 
Merging release into master for hotfix-2016-11-17
 2016-11-18 11:34:47 -05:00
Nimisha Asthagiri
6e1471e442 Merge pull request #14012 from edx/beryl/unattempted-problems 
Compute Attempted versus Grade of Zero
 2016-11-18 11:23:30 -05:00
Nimisha Asthagiri
257fcc0328 Fix CAPA progress display flakiness 2016-11-18 10:27:12 -05:00
Nimisha Asthagiri
fda2ceac8d Fix Delete-Student-State CSM entry deletion 2016-11-18 10:27:12 -05:00
Max Rothman
82a2435677 Merge branch 'release-candidate' into release 2016-11-18 10:22:23 -05:00
Nimisha Asthagiri
7899528b52 Compute Attempted versus Grade of Zero 
TNL-5953
 2016-11-18 10:05:23 -05:00
Cliff Dyer
0a27a1676d Merge pull request #14018 from edx/cdyer/date-help-modal 
Simplify business hours on help modal
 2016-11-17 16:10:35 -05:00
Eric Fischer
422f09d6f3 Merge pull request #13995 from edx/efischer/override_celery_queues 
Additional Celery Queues
 2016-11-17 14:30:44 -05:00
J. Cliff Dyer
ea781266d1 Simplify business hours on help modal 2016-11-17 14:19:48 -05:00
Max Rothman
cd71d300c6 Merge pull request #14016 from edx/hotfix/2016-11-17 
Upgrade cryptography library.
 2016-11-17 13:38:49 -05:00
Ben Patterson
71805ed802 Merge pull request #13974 from edx/benp/cb-never-called-workaround 
Workaround for TE-1767 aka cb() never called
 2016-11-17 13:33:50 -05:00
Eric Fischer
01cc136217 Allow CELERY_QUEUES to be overriden using ENV_TOKENS 2016-11-17 12:56:07 -05:00
J. Cliff Dyer
b796ba1900 Add missing migrations 2016-11-17 12:11:25 -05:00
Robert Raposa
06b3b401ea Upgrade cryptography library. 2016-11-17 12:08:43 -05:00
Nimisha Asthagiri
41f8d76284 Merge pull request #13515 from edx/course_blocks/update_management_command 
Enhancements to generate_course_blocks management command
 2016-11-17 11:45:46 -05:00
Ben Patterson
705c8b915e Udpates based on feedback. 2016-11-17 11:31:57 -05:00
Gregory Martin
467dc45556 Merge pull request #13952 from edx/yro_refactor-course-info-page 
Refactor info.html page datetime rendering
 2016-11-17 11:29:45 -05:00
Douglas Hall
062e0506ef Merge pull request #13977 from edx/afzaledx/wl-693-contact-us-form-in-email 
submit_feedback function now conditionally sends emails.
 2016-11-17 10:11:08 -05:00
Eric Fischer
6fb5eeb390 Merge pull request #13993 from edx/efischer/tnl-5471 
Remove Extraneous Subsection Grade DatabaseError protection
 2016-11-17 09:42:07 -05:00
Nimisha Asthagiri
f1f5a8f12f Optimize max_score by moving from XModule to Descriptor 
TNL-5939
 2016-11-17 09:17:59 -05:00
Gregory Martin
707371e1d7 Refactor info.html page datetime rendering 2016-11-17 08:54:08 -05:00
Gregory Martin
14c01e3a49 Merge pull request #14007 from edx/release 
Release Nov 16th, 2016
 2016-11-17 08:49:26 -05:00
Gregory Martin
aeb0f23d9d Merge pull request #13973 from edx/release-candidate 
Release Candidate rc/2016-11-15
 2016-11-16 16:11:06 -05:00
Albert (AJ) St. Aubin
863aa78bdf Merge pull request #13933 from edx/aj/TNL-1955_save_ui 
Initial set of changes for ui correctness state when saving a problem
 2016-11-16 14:57:27 -05:00
Clinton Blackburn
531ed41822 Updated the Credit API to support JWT authentication 2016-11-16 13:44:46 -05:00
Calen Pennington
1e9649e01e Merge pull request #13972 from cpennington/timer-logging 
Add timer logging to jenkins test runs
 2016-11-16 12:43:37 -05:00
Albert St. Aubin
866399ba05 Changes for ui correctness state when saving a problem 
TNL-1955
 2016-11-16 12:30:04 -05:00
Ben Patterson
67be6807a4 Add tests. Enjoy your coverage and feel confident. 2016-11-16 12:24:50 -05:00
Ben Patterson
f52e3cf830 Workaround for cb() never called errors 
Problem:

Intermittent "cb() never called!" errors on npm installs for platform.
This is likely due to a race condition on installing OS-specific bits that are built during time of install. When more than one compilation takes place at one time, this error can occur.

Workaround:

Detect the error and re-run the install. (When retrying, one or all of the bits have been compiled. So running it again just finishes the install.)
 2016-11-16 12:24:49 -05:00
Afzal Wali
131ca13a50 Added the templates for email subject, email body and the changes in submit_feedback function that now conditionally sends emails. 
Suggestions.
 2016-11-16 12:12:00 -05:00
Christina Roberts
695e5c0751 Merge pull request #13997 from edx/christina/ora-release-colors 
Update ORA version
 2016-11-16 11:15:35 -05:00
alisan617
47eee23814 Merge pull request #13999 from edx/alisan/fix-pr-13843-separate-discussion-tab-ui-view 
Fix the Discussion Editing Post error
 2016-11-16 10:14:27 -05:00
Ahsan Ulhaq
6776ce4646 Merge pull request #13980 from edx/ahsan/ECOM-4763-update-log-messages-updated 
Add log info for course enrollment
 2016-11-16 20:10:52 +05:00
Gregory Martin
042244c342 Merge pull request #14000 from edx/yro_fix_utils 
fix async js dateutil issue
 2016-11-16 09:33:37 -05:00
Gregory Martin
b814678933 register dateutil_factory in request.js 2016-11-16 07:18:19 -05:00
Ahsan Ulhaq
2157202aaf Add log info for course enrollment 
ECOM-4763
 2016-11-16 12:00:28 +05:00
Douglas Hall
b65d245b29 Merge pull request #13979 from edx/hasnain-naveed/WL-633 
WL-633 | refactor pay_and_verify.html template.
 2016-11-15 16:50:35 -05:00
alisan617
cb14d1598e discussion course settings change 2016-11-15 15:05:28 -05:00
alisan617
6072e52ca9 Merge pull request #13998 from edx/revert-13987-alisan/revert-13843-separate-discussion-tab-ui-view 
Revert "Revert PR#13843"
 2016-11-15 14:58:33 -05:00
alisan617
57fa123f5e Revert "Revert PR#13843" 2016-11-15 14:46:57 -05:00
Christina Roberts
9fc0138225 Merge pull request #13836 from eduNEXT/fmo/unicode_username_fixes 
Quick fixes for users with unicode usernames.
 2016-11-15 14:27:03 -05:00
cahrens
9196615322 Update ORA version 2016-11-15 13:18:15 -05:00
sanfordstudent
dd809dfdc3 Merge pull request #13961 from edx/sstudent/TNL-5895 
Add first_attempted to subsection grades data model
 2016-11-15 11:41:19 -05:00
Calen Pennington
f5f64c03fc Don't try to create a directory from an empty string 2016-11-15 11:38:33 -05:00
Calen Pennington
a207080897 Add timer logging to jenkins test runs 2016-11-15 11:00:19 -05:00
alisan617
e5a57e75a7 Merge pull request #13987 from edx/alisan/revert-13843-separate-discussion-tab-ui-view 
Revert PR#13843 that caused regression issue in editing discussion post
 2016-11-15 10:50:44 -05:00
Eric Fischer
b9adb42f23 Remove Extraneous Subsection Grade DatabaseError protection 
These lines are now being run in async tasks anyways, so we can remove this
decorator and rely on the async task to retry itself. Also cleans up a few
pylint violoations noticed in subsection_grade.py.

Tests have been updated to match new behavior.
 2016-11-15 10:49:32 -05:00
Sanford Student
6d50044ec4 adding first attempted timestamp to subsection grades 
for TNL-5895
 2016-11-15 10:01:44 -05:00