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

15381 Commits

Author SHA1 Message Date
Andy Armstrong
3fb7134efc Merge pull request #14020 from edx/andya/update-gemnasium-libraries 
Clean up npm-installed packages
 2016-11-23 14:02:29 -05:00
Andy Armstrong
746e310088 Clean up npm-installed packages 2016-11-22 17:51:09 -05:00
Cliff Dyer
ca5c741f30 Merge pull request #14027 from edx/cdyer/mark-attempted-problems 
Use first_attempted value from database and attempted values from individual problems.
 2016-11-22 17:07:02 -05:00
Ned Batchelder
624f31f31d Merge pull request #14043 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-11-22 16:17:28 -05:00
J. Cliff Dyer
5350e31667 fixup: extract some common code. 2016-11-22 15:53:30 -05:00
Matthew Piatetsky
f1e75d031f Merge pull request #14008 from edx/ECOM-5537 
ECOM-5537 Add Media Kit and move sitemap in footer
 2016-11-22 15:40:28 -05:00
Matthew Piatetsky
ae7020cbf9 Add Media Kit and move sitemap in footer 2016-11-22 13:20:29 -05:00
J. Cliff Dyer
0e2534f3ec Wrap update_or_create in transaction to allow validation after save 2016-11-22 12:12:15 -05:00
J. Cliff Dyer
86c12e67cc fixup: Error instead of correcting on invalid inputs. 2016-11-22 11:48:33 -05:00
Ned Batchelder
bb8db567a3 Update translations (autogenerated message) 2016-11-22 16:26:49 +00:00
Renzo Lucioni
84c42ae1b8 Clean up construction of program detail page links 
We used to link program cards on the LMS program listing page to the marketing site. Those cards now link to detail pages also hosted by the LMS, rendering that functionality obsolete.

ECOM-5063
 2016-11-22 09:47:23 -05:00
J. Cliff Dyer
b6305a1553 Use first_attempted value from database 
TNL-5930
 2016-11-21 15:12:42 -05:00
Douglas Hall
c575e7f2cc Merge pull request #12645 from CredoReference/more-than-one-lti-consumer-with-empty-instance-guid 
Ability to create two or more LTI consumers through the Django admin with an empty instance_guid field
 2016-11-21 14:04:21 -05:00
Toby Lawrence
c67ee94d80 Merge pull request #13996 from edx/PERF-321 
[PERF-321] Move heavy JS files for WordCloud out of lms-modules.js
 2016-11-21 13:49:00 -05:00
alisan617
f7727fe76a Merge pull request #14028 from edx/alisan/cohorts-dropdown-discussion-TNL-5936 
Discussion cohorts only dropdown alignment
 2016-11-21 13:05:49 -05:00
Adam
0fbe384248 Merge pull request #14006 from edx/adam/fix-date-unicode-issue 
use a QueryDict to encode a url param that potentially has unicode (E…
 2016-11-21 12:59:00 -05:00
alisan617
a5039f6342 make cohorts filter dropddown fit inside the thread list view 2016-11-18 16:47:13 -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
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
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
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
Dmitry Viskov
693408eb4e Ability to create two or more LTI consumers through the Django admin with an empty instance_guid field. 2016-11-18 18:43:26 +03: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
fda2ceac8d Fix Delete-Student-State CSM entry deletion 2016-11-18 10:27:12 -05:00
Nimisha Asthagiri
7899528b52 Compute Attempted versus Grade of Zero 
TNL-5953
 2016-11-18 10:05:23 -05:00
Adam Palay
10b33c8a8d use a QueryDict to encode a url param that potentially has unicode (ECOM-6390) 2016-11-18 09:31:51 -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
J. Cliff Dyer
ea781266d1 Simplify business hours on help modal 2016-11-17 14:19:48 -05:00
Eric Fischer
01cc136217 Allow CELERY_QUEUES to be overriden using ENV_TOKENS 2016-11-17 12:56:07 -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
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
Toby Lawrence
a49227661b undo the test shenanigans i was doing 2016-11-17 09:49:42 -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
Toby Lawrence
ff619d9bd4 Switch to dedicated student/author views. 2016-11-16 13:10:52 -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
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
Gregory Martin
b814678933 register dateutil_factory in request.js 2016-11-16 07:18:19 -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
Toby Lawrence
da664ce7f8 quality fix 2016-11-15 15:03:29 -05:00