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

15395 Commits

Author SHA1 Message Date
Eric Fischer
33273eed4e rectify old require.js hackery 2016-11-30 12:48:21 -05:00
jagonzalr
e9b121b8cd prevent RemovedInDjango19Warnings 2016-11-30 10:06:13 -05:00
Gregory Martin
0c40dfc147 Merge pull request #14048 from edx/yro_fix-sectionformat-bug 
add section format to fix display in accordion
 2016-11-29 16:04:36 -05:00
Brian Jacobel
f47ab54905 Merge pull request #14017 from edx/bjacobel/susy-reup 
Susy performance fixes in Platform, take 2
 2016-11-29 15:57:06 -05:00
Brian Jacobel
0144d91ab8 Fix certificates issues in metadata layout 2016-11-29 13:53:56 -05:00
Gregory Martin
fcf3f0b32f add section['format'] 2016-11-28 14:57:10 -05:00
Christina Roberts
af504fc61d Merge pull request #13805 from edx/christina/ac-583 
Christina/ac 583
 2016-11-28 12:22:55 -05:00
cahrens
e095da59ec Restore grading type label. 
TNL-6002
 2016-11-28 10:55:46 -05:00
Chris Rodriguez
29dcbfefe4 Progress graph a11y updates. 
TNL-5891
 2016-11-28 10:55:39 -05:00
Eric Fischer
a9960e93f5 Merge pull request #14019 from edx/efischer/verify_times 
Localize times in verify_student
 2016-11-28 09:19:04 -05:00
Albert St. Aubin
282ded7442 Addressed test failures and PR comments 
TNL-5894
 2016-11-28 07:12:23 -05:00
Lucky Jindal
cb22b909b6 AC-588: Fixed header levels,removed unneccessary element 2016-11-28 07:12:23 -05:00
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
Eric Fischer
1aff229007 Localize Times in verify_student 
Now using the DateUtils javascript to handle this more correctly in webpages.

TNL-5959
 2016-11-23 11:55:23 -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
Brian Jacobel
b1776946b8 Revert "Revert "Update to UXPL 0.17 (grids compilation performance work)"" 
This reverts commit d39f7197c3.
 2016-11-17 13:07:53 -05:00
Eric Fischer
01cc136217 Allow CELERY_QUEUES to be overriden using ENV_TOKENS 2016-11-17 12:56:07 -05:00