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

11117 Commits

Author SHA1 Message Date
Chris Dodge
1379158e8d make the 'ENABLE_THIRD_PARTY_AUTH' feature flag be microsite aware 2014-09-10 12:38:40 -04:00
lduarte1991
5dc9e79d91 [TNL-287] Text Annotation Tool: Reply/Grouping Bug Fix 2014-09-10 12:29:43 -04:00
Will Daly
541419e362 Merge pull request #5141 from edx/will/fix-embargo-tests 
Fix embargo middleware with tests
 2014-09-10 07:58:23 -04:00
Ben Patterson
d21384fe12 Merge pull request #5143 from edx/benp/solano2-bokchoy-course-outline 
bok-choy: Fix flakiness in date-picker steps under studio tests
 2014-09-09 14:51:11 -04:00
Adam
a346fcca2c Merge pull request #5144 from edx/adam/fix-copy 
fixes help copy for annotation settings
 2014-09-09 13:34:07 -04:00
Adam Palay
12b49ef2d4 fixes help copy for annotation settings 2014-09-09 11:43:32 -04:00
Ben Patterson
a8843aa7c7 TE-468 - bok-choy: Fix flakiness in date-picker steps under studio 
These were failing on Solano builds because the save button was clicked
before the datepicker was done its work. (The EmptyPromise was still satisfied
because the input field value had been updated, but the datepicker widget
caused issues about 3/4 of the time.)
 2014-09-09 10:17:02 -04:00
Gabe Mulley
c606c295e1 Merge pull request #5002 from mulby/gabe/add-segmentio-hook 
Add event tracking endpoint to be called by segment.io
 2014-09-09 09:17:07 -04:00
Will Daly
512db7be99 Fix embargo middleware with tests 2014-09-09 08:50:10 -04:00
Don Mitchell
ee71eba15b Merge pull request #5109 from edx/split/inherited_settings 
Cache inherited settings outside of structure
 2014-09-09 08:48:45 -04:00
Gabe Mulley
7900e8d346 Add event tracking endpoint to be called by segment.io 2014-09-09 07:25:54 -04:00
Greg Price
e26457748e Merge pull request #5127 from aboudreault/discussion-request-abort-issue 
Fix discussion error popup on http request abort
 2014-09-08 17:46:16 -04:00
Renzo Lucioni
12d5c9b281 Do not call upper on a profile country code of None 2014-09-08 17:33:02 -04:00
Don Mitchell
0f8355fd47 Test inheritance to new xblocks in same request 2014-09-08 16:13:30 -04:00
Don Mitchell
74c44c5e2b Cache inherited settings outside of structure 
LMS-11363
 2014-09-08 15:55:45 -04:00
Alan Boudreault
78fd5cc12a Fix discussion error popup on http request abort 2014-09-08 15:43:37 -04:00
Renzo Lucioni
ba7ff67a55 Merge pull request #5113 from edx/renzo/remove-unused-js 
Remove unused analytics JS left over by 3rd party auth changes
 2014-09-08 15:36:05 -04:00
Renzo Lucioni
0b2840ee6f Skip audit enrollment if user is in the experimental branch 2014-09-08 14:17:04 -04:00
Sarina Canelake
b0c2b73d80 Merge pull request #5112 from edx/sarina/quality-clean 
Quality cleanup
 2014-09-08 13:48:57 -04:00
Sarina Canelake
467f2988e1 Quality cleanup 2014-09-08 12:02:31 -04:00
Greg Price
3cf2481e6c Merge pull request #5077 from edx/gprice/forum-cohort-selector-test 
Test cohort selector in NewPostView
 2014-09-08 11:54:30 -04:00
Piotr Mitros
5364508e48 Merge pull request #5108 from edx/pmitros/retrofix-xargs 
XBlock argument passing support backport from SDK
 2014-09-07 12:51:56 -04:00
Piotr Mitros
167f4171c4 XBlock argument passing support 2014-09-07 12:01:25 -04:00
Renzo Lucioni
823be96843 Remove unused analytics JS left over by 3rd party auth changes 2014-09-05 15:46:23 -04:00
Adam
58e6dcf79c Merge pull request #5107 from edx/adam/resolve-merge-conflicts 
Adam/resolve merge conflicts
 2014-09-05 14:55:24 -04:00
Nimisha Asthagiri
3f8ea64d33 Merge pull request #5083 from edx/split/revert-to-published 
LMS-11357 Split revert_to_publish: correctly revert to Published version
 2014-09-05 14:38:45 -04:00
Nimisha Asthagiri
69ce5ac849 Merge pull request #5110 from edx/split/pylint-fixes 
Pylint issues in test_mixed_modulestore.py.
 2014-09-05 14:33:36 -04:00
Nimisha Asthagiri
0bd9bc628c Update mongo count. 2014-09-05 14:13:00 -04:00
Brian Talbot
a6f2dd67e4 Merge pull request #5105 from edx/talbs/os-ggg-a11y 
LMS: Accessibility Tweaks
 2014-09-05 13:57:57 -04:00
Nimisha Asthagiri
2fa445c413 LMS-11357 Split revert_to_publish: correctly revert to Published version 2014-09-05 13:54:24 -04:00
Nimisha Asthagiri
c0ee194042 Pylint issues in test_mixed_modulestore.py. 2014-09-05 13:46:38 -04:00
Waqas Khalid
9c942d7eba Merge pull request #4910 from mlkwaqas/waqas/bld1199-mathjax-error 
MaxJax error while submitting answer
 2014-09-05 22:31:12 +05:00
Adam Palay
cfeb76e67f Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
 2014-09-05 13:20:15 -04:00
Nimisha Asthagiri
952eb215f0 Merge pull request #5078 from edx/split/has-changes-subtree 
LMS-11354 Make Split has_changes check subtree.
 2014-09-05 13:03:28 -04:00
Nimisha Asthagiri
db0f9dfc83 LMS-11354 Make Split has_changes check subtree. 2014-09-05 12:20:32 -04:00
Jesse Zoldak
98fa457188 Merge pull request #5091 from edx/ammar/fix-video-transcripts-test 
Fix Video Transcript Test
 2014-09-05 12:02:13 -04:00
Renzo Lucioni
a741e6a3d5 Merge pull request #5086 from edx/renzo/fix-embargo-middleware 
Refrain from accessing country code if country is None
 2014-09-05 11:44:45 -04:00
Sarina Canelake
f50b2a7b5a Merge pull request #5066 from edx/sarina/add-i18n-extract-test 
Add i18n extraction test
 2014-09-05 11:43:52 -04:00
Adam Palay
58553a7fb8 escape html for inline discussions (TNL-182) 2014-09-05 11:02:17 -04:00
Han Su Kim
b1ada02819 Merge pull request #5084 from edx/hotfix/2014-09-04b 
Tmporarily disable bulk operations b/c old mongo
 2014-09-05 11:00:02 -04:00
Renzo Lucioni
c3359135e7 Refrain from accessing country code if country is None 2014-09-05 10:58:18 -04:00
Renzo Lucioni
aa28fba9ad Revert "Revert "Merge pull request #4976 from edx/will/ecom-128"" 
This reverts commit 371dfd6187.
 2014-09-05 10:51:51 -04:00
Christina Roberts
5fc4e02ff8 Merge pull request #5063 from edx/christina/cohorts-bok-choy 
Christina/cohorts bok choy
 2014-09-05 10:35:03 -04:00
Muhammad Ammar
5bcfaaaa8b Merge pull request #5072 from edx/ammar/tooltip-test 
Tooltip Acceptance Test
 2014-09-05 18:43:21 +05:00
Adam
385b3ff48a Merge pull request #5087 from edx/release 
Release
 2014-09-05 09:31:40 -04:00
Waqas Khalid
4834e51aca Mathjax should be used after complete loading 
Student couldn't able to submit his answer in ie9
becuase mathjax was used before its complete loading
thats cuase the problem. Mathjax operations should be
handled synchronously inorder to avoid error.

BLD-1199
 2014-09-05 17:19:48 +05:00
muhammad-ammar
20d6221364 Fix Video Transcript Test 
TE-460
 2014-09-05 10:33:37 +00:00
Greg Price
1de17fb745 Move more forum nav rendering logic to front end 
The cohort selector is rendered only for a privileged user in a cohorted
course, and that logic is now in an Underscore template instead of Mako.
 2014-09-04 18:22:19 -04:00
Nimisha Asthagiri
041d72ccc6 Update mongo counts. 2014-09-04 18:14:13 -04:00
Greg Price
cd0ea052ed Ensure forum nav cohort selector works correctly 
One minor case is fixed (to pass "" instead of "all" as the group_id
parameter to indicate viewing all threads), and tests are added.
 2014-09-04 18:00:43 -04:00