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

14168 Commits

Author SHA1 Message Date
Brian Jacobel
5492fb9b8b Merge pull request #14057 from edx/bjacobel/discussion-test-fixture-cleanup 
Get rid of this 4000-char long line
 2016-11-29 09:59:06 -05:00
M. Rehan
a0f99e6d4a Merge pull request #14050 from edx/mrehan/ecom-6154-integrity-error 
ECOM-6154 – remove transaction.atomic decorator
 2016-11-29 12:55:50 +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
Brian Jacobel
7806b8a482 Out-of-band cleanup on this test fixture because it horrified me so much 2016-11-28 12:00:03 -05:00
Chris Rodriguez
29dcbfefe4 Progress graph a11y updates. 
TNL-5891
 2016-11-28 10:55:39 -05:00
Albert (AJ) St. Aubin
be7f6ecb6c Merge pull request #14036 from edx/aj/AC588_TNL-5894 
Aj/ac588 tnl 5894
 2016-11-28 08:25:24 -05:00
Albert St. Aubin
282ded7442 Addressed test failures and PR comments 
TNL-5894
 2016-11-28 07:12:23 -05:00
attiyaishaque
f3a30e6f08 TNL-6004 Fixing 500 in video transcripts. 2016-11-28 15:28:39 +05:00
Qubad786
05ad083ae0 remove transaction.atomic decorator 2016-11-28 01:43:42 +05: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
Andy Armstrong
746e310088 Clean up npm-installed packages 2016-11-22 17:51:09 -05: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
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
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
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
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
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
alisan617
ad2a2f29bc discussion thread post preview in DiscussionThreadListView 2016-11-18 13:58:17 -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
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
7899528b52 Compute Attempted versus Grade of Zero 
TNL-5953
 2016-11-18 10:05:23 -05:00
J. Cliff Dyer
b796ba1900 Add missing migrations 2016-11-17 12:11:25 -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
Nimisha Asthagiri
f1f5a8f12f Optimize max_score by moving from XModule to Descriptor 
TNL-5939
 2016-11-17 09:17:59 -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
Toby Lawrence
5e40dfa24b quality 2016-11-16 14:37:47 -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
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
Ahsan Ulhaq
2157202aaf Add log info for course enrollment 
ECOM-4763
 2016-11-16 12:00:28 +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
Toby Lawrence
50559b64f0 [PERF-321] Move heavy JS files for WordCloud out of lms-modules.js 2016-11-15 11:43:54 -05:00
alisan617
18e7322e8d Revert "Refactor discussion tab UI code into parts to be reusable for inline discussions" 
This reverts commit e80d9b5792.
 2016-11-14 21:43:03 -05:00
Sven Marnach
f5d556e745 Allow to store multiple anonymous ids for each (user, course). 2016-11-14 12:55:00 +01:00
Jesse Shapiro
c8135adf12 Merge pull request #13910 from open-craft/haikuginger/sol-2071 
Increase polling rate to wait for mini-notification
 2016-11-10 21:23:13 -05:00
Jesse Shapiro
dffe3e0780 Update wait for mini-notification in testing to be more fine-grained; remove flaky test decorator 2016-11-10 15:08:08 -05:00
Awais Jibran
e26849891d Merge pull request #13939 from edx/aj/fix-discussion-user-roles 
Fix discussion user roles
 2016-11-10 18:41:12 +05:00
Awais Jibran
92b99c7dc3 Fix discussion user roles 2016-11-10 17:11:52 +05:00
Muhammad Ammar
71cc602d93 Merge pull request #13863 from edx/ammar/tnl-4163-reduce-annotatorjs-search-calls 
Single search request to fetch notes per unit
 2016-11-10 16:23:59 +05:00
Douglas Hall
3224c027e3 Merge pull request #13955 from edx/ibrahimahmed443/WL-669-education-dropdown-capitalization 
fix inconsistent capitalization in education drop down
 2016-11-10 05:46:00 -05:00
Douglas Hall
92995b42ec Merge pull request #13935 from edx/douglashall/WL-798 
WL-798 Allow for hiding course mode banners on student dashboard
 2016-11-09 14:36:04 -05:00