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

25526 Commits

This Branch
This Branch
All Branches
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
Adam
d6688de7e4 Merge pull request #5097 from edx/hotfix/2014-09-05b 
Hotfix/2014 09 05b
 2014-09-05 12:40:48 -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
Brian Talbot
7b2275358f Merge pull request #5076 from edx/talbs/fix-studio-systemfb-ui 
FIX: Studio - System Feedback Icon Styling
 2014-09-05 11:37:11 -04:00
Adam
2bf9404d59 Merge pull request #5098 from edx/adam/forums-script-escape 
escape html for inline discussions (TNL-182)
 2014-09-05 11:20:14 -04:00
Adam
08f851aa7e Merge pull request #5095 from edx/cdodge/white-label-small-hotfixes 
Cdodge/white label small hotfixes
 2014-09-05 11:06:59 -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
e0c3234faf Merge pull request #5094 from edx/renzo/readd-embargo-changes 
Revert "Revert "Merge pull request #4976 from edx/will/ecom-128""
 2014-09-05 10:57:39 -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
clytwynec
f39d29ae1b Merge pull request #5027 from edx/clytwynec/make_devstack_default_settings_instead_of_dev 
change default settings for servers/assets paver tasks from "dev" to "de...
 2014-09-05 10:33:19 -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
Alison Hodges
c000201e1c Merge pull request #5089 from edx/ahodges/doc/repairs20140904 
Corrections to guides for 4 Sep release
 2014-09-05 09:23:05 -04:00
Waqas Khalid
32d9234b39 Merge pull request #3880 from mlkwaqas/waqas/lms2646-create-order-list-index-error 
Handle the indexerror exception on create_order
 2014-09-05 17:07:46 +05:00
muhammad-ammar
20d6221364 Fix Video Transcript Test 
TE-460
 2014-09-05 10:33:37 +00:00
Chris Dodge
405baab82a don't hard code the shoppingcart order confirmation page to use settings.xxx, allow for microsites to override 2014-09-04 22:18:16 -04:00
Chris Dodge
568ef4184a remove course-id visual column from the list of coupons as it's useless information here and prevents overflows from happening 2014-09-04 22:17:50 -04:00
Alison Hodges
b4ca1c12d8 Corrections to guides for 4 Sep release 
Items repaired:
- Pin_discussion.png file in wring directory
- Discussion_filters.png image in discussion_students unreadable,
replaced
- updated  release date in Research guide change log
- updated  release date in Course Author’s guide change log
- updated  “History” dates for fields added to research guide
 2014-09-04 20:57:37 -04:00
Nimisha Asthagiri
041d72ccc6 Update mongo counts. 2014-09-04 18:14:13 -04:00
Adam
cef61497d1 Merge pull request #5082 from edx/hotfix/2014-09-04 
Revert "Merge pull request #4976 from edx/will/ecom-128"
 2014-09-04 17:35:02 -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
Alison Hodges
97527266c2 Merge pull request #5081 from edx/ahodges/doc/help_fixes 
Fixes to improve help experience& correct HTML build errors
 2014-09-04 16:22:00 -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
Alison Hodges
5263f15e96 Fixes to improve help experience& correct HTML build errors 2014-09-04 15:51:36 -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
Andy Armstrong
e1c7bb833f Merge pull request #5046 from edx/andya/cohort-visibility-labels-2 
Implement forum cohort visibility labels correctly
 2014-09-04 15:39:40 -04:00
srpearce
c98ffa7714 Merge pull request #5041 from edx/sylvia/docs/relnotes_9-3 
Release notes draft
 2014-09-04 15:21:04 -04:00
Sylvia Pearce
2a0c352035 Course staff release notes 9/4/14 2014-09-04 15:20:20 -04: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
Jesse Zoldak
7eb3a22d11 Merge pull request #5075 from edx/zoldak/fix-typo 
Fix capitilization on verified flow
 2014-09-04 12:32:34 -04:00
Brian Talbot
dfbcd76885 Studio: resolves layout issues with icons in system feedback UI 2014-09-04 11:07:54 -04:00
Jesse Zoldak
814f6b9144 Fix capitilization on verified flow 2014-09-04 11:05:47 -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
f591f3819b Merge pull request #5074 from edx/alex/fix_lti_description 
Fix description for LTI passports field.
 2014-09-04 17:36:22 +03:00
Daniel Friedman
15c0531945 Merge pull request #5026 from edx/dan-f/test-lms-passes-group-id 
Test passing `group_id` in thread creation
 2014-09-04 10:34:10 -04:00
Nimisha Asthagiri
01fb81b82e Merge pull request #4975 from edx/reruns/analytics_i4x 
Remove client side parsing of module_id
 2014-09-04 10:18:38 -04:00
Julia Hansbrough
23d3a9187c Merge pull request #5073 from edx/ecom/fix-user-id 
Analytics should use user.id not anon id
 2014-09-04 10:00:28 -04:00
Alexander Kryklia
62afe9c3a5 Fix description for LTI passports field. 2014-09-04 16:17:27 +03:00