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

26554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
muhammad-ammar
ac8c6d18ca Correct script exit status 
TE-567
 2014-10-31 07:48:56 +00:00
srpearce
375a38c4e4 Merge pull request #5772 from edx/sylvia/docs/typoinurl 
Correct typo in URL
 2014-10-28 18:35:15 -04:00
Sylvia Pearce
a5d8c2a7dc Correct typo in URL 2014-10-28 18:34:37 -04:00
srpearce
de5f23fa01 Merge pull request #5763 from edx/sylvia/docs/DOC-1062 
Sylvia/docs/doc 1062
 2014-10-28 18:06:17 -04:00
Sylvia Pearce
d68c36e6b5 Add introduction to student-facing docs 2014-10-28 18:05:47 -04:00
Alison Hodges
b56f2d3cab Merge pull request #5736 from edx/ahodges/doc/DOC1002 
Setting up another data czar instead of sharing a passphrase
 2014-10-28 16:35:19 -04:00
Alison Hodges
89a69c76b7 Setting up another data czar rather than sharing a passphrase 2014-10-28 16:34:47 -04:00
Carol Tong
3dec24aca0 Merge pull request #5690 from edx/carol/docs/TNL-42 
Remove caution re grade exports + content experiments
 2014-10-28 16:08:55 -04:00
John Eskew
c9071353fd Merge pull request #5742 from edx/jeskew/asset_manager_read_wrapper 
Wrap all asset read operations.
 2014-10-28 15:57:28 -04:00
John Eskew
1cdf84974c Merge pull request #5556 from edx/jeskew/fix_split_old_analytics_call 
Fix old analytics api call for Split modulestore.
 2014-10-28 15:49:59 -04:00
John Eskew
786a32e7cf Wrap all asset read operations. 
First step in moving assets out of the contentstore (optionally).
https://openedx.atlassian.net/browse/PLAT-77
 2014-10-28 14:20:36 -04:00
Mark Hoeber
1f97031fa8 Merge pull request #5738 from edx/markhoeber-documentation-doc858 
Python problem randomization example
 2014-10-28 14:09:48 -04:00
Mark Hoeber
32057fd69b Python problem randomization example 2014-10-28 14:08:43 -04:00
Don Mitchell
ef0111d060 Merge pull request #5759 from edx/dhm/plat-142 
Add tests for clone_course
 2014-10-28 13:31:06 -04:00
John Eskew
5e103a918b Fix pylint errors to get below limit. 2014-10-28 13:15:10 -04:00
Mark Hoeber
18ae95861c Merge pull request #5648 from edx/markhoeber-doc1096 
WIP:  edX-Insider tour in OLX Doc
 2014-10-28 11:54:39 -04:00
Mark Hoeber
6542fb791c Added Example edX-Insider Course 2014-10-28 11:53:40 -04:00
David Baumgold
a57bddb4bc Merge pull request #5760 from edx/link-contributor-process-graph 
Linkify contributor process graph
 2014-10-28 11:49:21 -04:00
John Eskew
831dd593c9 Add tests for empty analytics server info and url-encoded params. 2014-10-28 11:28:57 -04:00
John Eskew
38e88e3011 Check for empty URL and api key before old analytics api call. 
Encode course key as a URL parameter.
 2014-10-28 11:28:57 -04:00
Mark Hoeber
45e965a755 Merge pull request #5743 from edx/carol/docs/DOC-1070 
Fix case of y coords in Drag & Drop template
 2014-10-28 11:11:33 -04:00
Carol Tong
61f22668bf Fix case of y coords in Drag & Drop template 
Change from uppercase to lowercase “Y”
 2014-10-28 11:11:05 -04:00
Don Mitchell
6989999d8a Add tests for clone_course 
PLAT-142
 2014-10-28 11:09:24 -04:00
Adam
37949e07f7 Merge pull request #5345 from edx/adam/adjust-logging-level 
change ItemNotFoundErrors to log.warning on bringup
 2014-10-28 10:57:35 -04:00
David Baumgold
1a803a13b8 Linkify contributor process graph 
Because it's too small to read on RTD
 2014-10-28 10:50:13 -04:00
David Baumgold
54049fa06a Merge pull request #5758 from edx/correct-doc-link 
Correct doc link
 2014-10-28 10:32:50 -04:00
zubair-arbi
f7d6060276 Merge pull request #5658 from edx/zub/bugfix/tnl-554-conflictingimportmessages 
show warning on navigate away from import page only for first two stages
 2014-10-28 18:56:23 +05:00
David Baumgold
9ff0979693 Correct doc link 2014-10-28 09:26:08 -04:00
Sarina Canelake
f1b95b3484 Merge pull request #5699 from Edraak/staff-debug-info-ltr-code 
Make staff debug info code to be always LTR
 2014-10-28 09:13:51 -04:00
Waheed Ahmed
eb42961017 Merge pull request #5734 from edx/waheed/tnl222-fix-upload-button-on-high-level-source-edit 
Fixed upload button on high level source editing popup.
 2014-10-28 14:12:03 +05:00
Waheed Ahmed
41d2fa1a5e Fixed upload button on high level source editing popup. 
TNL-222
 2014-10-28 13:02:57 +05:00
srpearce
78a50bd7d7 Merge pull request #5748 from edx/sylvia/docs/prob_correct 
Replace index file
 2014-10-27 17:07:02 -04:00
Sylvia Pearce
8f825ca6aa Replace index file 2014-10-27 16:18:11 -04:00
srpearce
4742687a13 Merge pull request #5746 from edx/sylvia/docs/prob_migration 
Migrate exercises and tools to shared folder
 2014-10-27 15:50:05 -04:00
Sylvia Pearce
dfd00a0276 Migrate exercises and tools to shared folder 2014-10-27 15:36:45 -04:00
Will Daly
0735141afc Merge pull request #5730 from edx/will/update-donation-tests 
Add a test for donations with a white-label course mode
 2014-10-27 14:13:44 -04:00
John Eskew
ed9e059b5c Merge pull request #5557 from edx/jeskew/minor_xblock_doc_edit 
Fix XBlock doc formatting. No content change! Only formatting...
 2014-10-27 13:34:19 -04:00
Will Daly
5a1df635d0 Merge pull request #5735 from edx/will/update-release-10-27 
Merge release into master (with changes from Friday 10/24/14)
 2014-10-27 12:01:09 -04:00
Sarina Canelake
25a745526c Merge pull request #5737 from edx/sarina/102714-translations-update 
Update translations (autogenerated message)
 2014-10-27 11:44:15 -04:00
Sarina Canelake
e4bfa0f9ff Update translations (autogenerated message) 2014-10-27 11:43:16 -04:00
Don Mitchell
22cbe0c410 Merge pull request #5723 from edx/dhm/split_assetstore 
Implement asset metadata storage in Split - per-asset functionality
 2014-10-27 11:36:29 -04:00
Ben Patterson
ed2ca50804 Merge pull request #5732 from edx/benp/optimize-run-quality 
Optimize run_quality calls
 2014-10-27 11:08:59 -04:00
Will Daly
0cac6ea21b Fix pylint violations 2014-10-27 11:04:22 -04:00
Will Daly
7f54af3be0 Merge remote-tracking branch 'origin/release' 2014-10-27 10:59:31 -04:00
Will Daly
cafea30769 Merge pull request #5722 from edx/renzo/third-party-auth-no-prof-ed-autoenroll 
Prohibit automatic enrollment in prof ed courses when user authenticates via third-party auth
 2014-10-27 10:58:50 -04:00
Don Mitchell
f48289cc4f Moved assetstore tests to own file and ddt'd across stores 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
 2014-10-27 10:04:10 -04:00
Don Mitchell
b6fac23960 Implement asset metadata storage in Split - per-asset functionality 
PLAT-40

Conflicts:
	common/lib/xmodule/xmodule/assetstore/__init__.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
 2014-10-27 10:04:09 -04:00
Mark Hoeber
0064d29dc4 Merge pull request #5684 from edx/markhoeber-documentation-doc3 
Fixed Text Input Template
 2014-10-27 09:21:53 -04:00
Mark Hoeber
7ad5561abd Fixed Text Input Template 2014-10-27 09:21:26 -04:00
Mark Hoeber
fa93a69283 Merge pull request #5692 from edx/markhoeber-doc935 
Fixed code sample for python grader
 2014-10-27 09:07:05 -04:00