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

39460 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qubad786
05ad083ae0 remove transaction.atomic decorator 2016-11-28 01:43:42 +05:00
Marko Jevtić
ab44b12a72 Merge pull request #14052 from edx/mjevtic/TNL-6009 
[TNL-6009] Mark test as flaky
 2016-11-25 10:22:23 +01:00
Marko Jevtic
682e030ad0 [TNL-6009] Mark test as flaky 2016-11-25 08:12:40 +00: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
Albert (AJ) St. Aubin
fa705d8366 Merge pull request #14042 from edx/aj/TNL-5774-flaky-test 
Aj/tnl 5774 flaky test
 2016-11-23 09:01:40 -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
Albert St. Aubin
6752b90dae Removed flaky annotations and updated tests to correct flakiness 
TNL-5774
 2016-11-22 11:18:28 -05:00
Calen Pennington
ac2b5bccf2 Merge pull request #13717 from open-craft/smarnach/anonymous-id 
Allow to store multiple anonymous ids per (user, course)
 2016-11-22 10:11:40 -05: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
Adam
f77c351244 Merge pull request #14035 from edx/adam/neo4j-add-detached-field 
specify if an item is detached
 2016-11-22 08:09:14 -05:00
J. Cliff Dyer
b6305a1553 Use first_attempted value from database 
TNL-5930
 2016-11-21 15:12:42 -05:00
Douglas Hall
5b432edee3 Merge pull request #14031 from edx/douglashall/WL-833 
WL-833 Allow for LinkedIn add to profile cert name override
 2016-11-21 14:49:53 -05:00
Adam Palay
ed713d7caa specify if an item is detached 2016-11-21 14:28:37 -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
Albert (AJ) St. Aubin
97ec6ec374 Merge pull request #14014 from edx/aj/meta_test 
Additional acceptance test to check the problem meta is not altered b…
 2016-11-21 13:54:47 -05:00
Adam
261eb31d37 Merge pull request #13992 from edx/adam/refactor-dump-to-neo4j-caching 
Moves dump_to_neo4j cache backend to neo4j instead of memcached (SUST…
 2016-11-21 13:51:25 -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
Robert Raposa
8c2d6046db Merge pull request #14034 from edx/robrap/thresholds 
Tighten safe template thresholds.
 2016-11-21 12:57:24 -05:00
Adam Palay
64722bfc8a Moves dump_to_neo4j cache backend to neo4j instead of memcached (SUST-76) 
Also
* Instead of caching when a course is last published, we get this information
  from the CourseStructure table
* This commit introduces a mock py2neo Graph to be used for testing
 2016-11-21 12:36:39 -05:00
Douglas Hall
1c8e859b51 Allow for LinkedIn add to profile cert name override 2016-11-21 12:33:33 -05:00
Albert St. Aubin
25fd6b57af Test update for PR comments 2016-11-21 11:31:17 -05:00
Albert St. Aubin
96eeb3fcc5 Additional acceptance test to check the problem meta is not altered by sequence navigation. 2016-11-21 11:04:26 -05:00
Robert Raposa
8a8ebfda0f Tighten safe template thresholds. 2016-11-21 09:25:03 -05:00
Muhammad Ammar
9749bbab0c Merge pull request #13970 from edx/ammar/tnl-5898-edxval-soft-delete-video 
soft delete video from video uploads page
 2016-11-21 19:05:39 +05:00
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
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
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