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

39415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
muhammad-ammar
dd45991926 soft delete video from video uploads page 
TNL-5899
 2016-11-21 15:14:57 +05:00
Muzaffar yousaf
8cee15b6a1 Merge pull request #13916 from edx/mushtaq/tnl-5797-duplicate-functionality 
Add duplicate functionality for unit, sub-section and section
 2016-11-21 15:08:00 +05:00
Gregory Martin
89cf7ee90c Merge pull request #14022 from edx/yro_add-unset-dateutils 
instructor dash course start and end
 2016-11-18 16:34:23 -05:00
alisan617
1f987f186f Merge pull request #14009 from edx/alisan/TNL-5807-discussion-post-preview 
add discussion thread post preview in Discussion tab thread list sidebar
 2016-11-18 15:41:41 -05:00
Nimisha Asthagiri
c6c33a3d13 Merge pull request #14029 from edx/naa/fix-missing-import-conflict 
Fix missing import due to merge conflict between parallel PRs
 2016-11-18 15:25:54 -05:00
Nimisha Asthagiri
a6b93f1ab7 Fix missing import due to merge conflict between parallel PRs 2016-11-18 15:05:09 -05:00
Cliff Dyer
3fcc904eae Merge pull request #13985 from edx/cdyer/grade-latency 
Track grading task latency
 2016-11-18 14:56:45 -05:00
alisan617
ad2a2f29bc discussion thread post preview in DiscussionThreadListView 2016-11-18 13:58:17 -05:00
Nimisha Asthagiri
47de5e6c68 Merge pull request #14021 from edx/beryl/null-subsection-error 
Handle DAGs with inaccessible Subsections on Problem Score update
 2016-11-18 13:57:25 -05:00
Gregory Martin
2d60c65e7b review fix 2016-11-18 13:56:52 -05:00
Clinton Blackburn
d7a7bcc1d7 Setting user info cookie on learner dashboard 
The user info is now updated every time a user loads the learner dashboard. Given that this is the page most learners land on after enrolling in a course, updating this cookie here will ensure that the enrollment status hash is relatively up-to-date.

ECOM-4895
 2016-11-18 13:56:48 -05:00
Clinton Blackburn
f0030334af Added enrollment hash to login cookie 
This will allow the marketing site to determine if locally-stored enrollment data needs to be refreshed.

ECOM-4896
 2016-11-18 13:56:48 -05:00
J. Cliff Dyer
210a5a4a3e Add log statement when task is first created. 
TNL-5817
 2016-11-18 13:35:38 -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
Gregory Martin
a6a7b7edb7 instructor dash course start and end 2016-11-18 11:06:14 -05:00
Nimisha Asthagiri
89d916918f Handle DAGs with inaccessible Subsections on Problem Score update 
TNL-5886
 2016-11-18 10:34:01 -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
Mushtaq Ali
a31a728a95 Add duplicate functionality for unit, sub-section and section - TNL-5797, TNL-5798 2016-11-18 12:39:35 +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