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

9227 Commits

Author SHA1 Message Date
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
muhammad-ammar
20d6221364 Fix Video Transcript Test 
TE-460
 2014-09-05 10:33:37 +00:00
Nimisha Asthagiri
041d72ccc6 Update mongo counts. 2014-09-04 18:14:13 -04:00
Don Mitchell
b28af4fdaa Temporarily disable bulk operations b/c old mongo 
does too much work on exit and doesn't handle nesting
 2014-09-04 17:28:17 -04:00
Sarina Canelake
ae697de728 Add i18n extraction test 2014-09-04 17:03:53 -04:00
Nimisha Asthagiri
08a0c6392e Merge pull request #5070 from edx/reruns/error-handling 
Course Rerun: include stack trace in errors and Log errors.
 2014-09-04 16:25:43 -04:00
cahrens
bc483ebae8 Bok choy test for cohort group label in post. 2014-09-04 16:19:35 -04:00
Diana Huang
371dfd6187 Revert "Merge pull request #4976 from edx/will/ecom-128" 
This reverts commit a03baee25c, reversing
changes made to 12e2d442e9.
 2014-09-04 16:01:28 -04:00
Han Su Kim
578be6cc70 Merge branch 'release' 2014-09-04 15:50:33 -04:00
Jason Bau
07b814467c Merge pull request #5062 from Stanford-Online/jbau/shib-unicode 
external_auth: handle request.META values as str, not unicode
 2014-09-04 12:47:50 -07:00
Nimisha Asthagiri
bdd91daeb6 Include stack trace in Course Rerun errors; Log errors. 2014-09-04 14:31:07 -04:00
Andy Armstrong
8349dbfa42 Implement forum cohort visibility labels correctly 
TNL-25
 2014-09-04 13:47:48 -04:00
Nimisha Asthagiri
272dd2aa52 Merge pull request #5071 from edx/split/re-import-issue 
LMS-11342 Fix Split reimport issue.
 2014-09-04 10:58:12 -04:00
Alexander Kryklia
62afe9c3a5 Fix description for LTI passports field. 2014-09-04 16:17:27 +03:00
Julia Hansbrough
0dea82e43e Analytics should use user.id not anon id 2014-09-04 09:03:55 -04:00
muhammad-ammar
da9a01a6c3 Tooltip Acceptance Test 2014-09-04 10:24:55 +00:00
Waheed Ahmed
4993e22384 Minor styling tweaks. 
LMS-11302
 2014-09-04 14:10:37 +05:00
Nimisha Asthagiri
b6590228a3 LMS-11342 Fix Split reimport issue. 2014-09-03 23:03:00 -04:00
Jim Abramson
2cba87d0e7 Merge pull request #5051 from edx/jsa/fix-thing 
remove use of ngettext in discussion jasmine test
 2014-09-03 16:53:53 -04:00
jsa
50741304dc remove use of ngettext in discussion jasmine test 2014-09-03 15:09:44 -04:00
Jason Bau
4d5a2380f1 external_auth: handle request.META values as str, not unicode 2014-09-03 12:07:35 -07:00
Calen Pennington
48bdeeeae8 Merge pull request #5052 from edx/split/bulk-rerun-LMS-11332 
Enable bulk operations on split
 2014-09-03 11:18:23 -04:00
Dave St.Germain
6261d9c828 Merge pull request #5014 from edx/dcs/BLD-1189 
Removed spacebar event handler, because it did more harm than good.
 2014-09-03 11:14:15 -04:00
Renzo Lucioni
9219cbdca8 Fix 3rd party auth string interpolation, address design feedback 2014-09-03 10:51:34 -04:00
Christina Roberts
bda16e2f00 Merge pull request #5043 from edx/christina/cohort-selector 
Move tests into appropriate directory structure.
 2014-09-03 10:35:19 -04:00
Renzo Lucioni
93a263b92f Correct 3rd party auth login page message and styling 2014-09-03 09:50:45 -04:00
Calen Pennington
f70e702503 Add specific bulk-operation test for LMS-11332, and a fix 2014-09-03 09:50:41 -04:00
Don Mitchell
96bc5cc83a Merge pull request #5001 from edx/split/edit_info 
Split/edit info
 2014-09-03 08:28:31 -04:00
Don Mitchell
a65771df93 Implement edit info as mixin on base mongo 
LMS-11183, LMS-11184
 2014-09-02 17:15:08 -04:00
cahrens
a96b2bd734 Move tests into appropriate directory structure. 2014-09-02 16:36:08 -04:00
chrisndodge
c5fc9b2fc8 Merge pull request #4771 from edx/cdodge/ecommerce-invoicing 
Cdodge/ecommerce invoicing
 2014-09-02 15:32:41 -04:00
Calen Pennington
1e2d5ffe03 Merge pull request #5031 from edx/andya/merge-hotfix-2014-08-29 
Merge hotfix-2014-08-29 to master
 2014-09-02 15:32:05 -04:00
Don Mitchell
85fa712fdf Change published_date to published_on 
to make consistent with other edit info timestamps
LMS-11184
 2014-09-02 13:20:23 -04:00
Muhammad Shoaib
2cc0433833 Implement mediated bulk purchase epic 
Updating EX-60 logic
 2014-09-02 13:03:24 -04:00
Ben Patterson
1abb8de2ba Merge pull request #5037 from edx/ammar-ben/bok-choy-shard-3 
Split bok-choy tests into 3 shards (merge)
 2014-09-02 11:01:49 -04:00
Stephen Sanchez
8eeb091de8 Merge pull request #5036 from edx/sanchez/fix_django_header_tests 
Sanchez/fix django header tests
 2014-09-02 10:44:16 -04:00
Calen Pennington
fb56588090 Tweak mongo count numbers 2014-09-02 10:29:23 -04:00
Alexander Kryklia
9a0d9f70c4 Merge pull request #4501 from htareque/lti_revision_3 
username and email request for lti module
 2014-09-02 17:11:24 +03:00