Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
srpearce
4c9fa9d553 Merge pull request #5693 from edx/sylvia/docs/TNL-611 
Add info about course start time visibility
 2014-10-29 17:41:50 -04:00
Sylvia Pearce
15466c5daa Add info about course start time visibility 2014-10-29 17:40:55 -04:00
Mark Hoeber
49537c3693 Merge pull request #5767 from edx/markhoeber-doc-1141 
Release Notes 10/25/14
 2014-10-29 16:26:14 -04:00
Mark Hoeber
4ff8b0fc23 Release Notes 10/25/14 2014-10-29 16:25:47 -04:00
Mark Hoeber
85047a8976 Merge pull request #5740 from edx/carol/docs/DOC-1140 
Add doc for new Show Reset Button setting
 2014-10-29 16:14:42 -04:00
Martyn James
f61b968e01 Merge branch 'release' 2014-10-29 15:36:26 -04:00
Renzo Lucioni
63ea30da9f Merge pull request #5785 from edx/renzo/copy-changes 
Clean up logistration copy
 2014-10-29 15:11:47 -04:00
Renzo Lucioni
bcef7611d4 Clean up logistration copy 2014-10-29 14:42:57 -04:00
AlasdairSwan
e04a3ab32b ECOM-406 Added JS fil that will update DOM to make the header and footer responsive 
Made the header and footer responsive
 2014-10-29 14:00:54 -04:00
Calen Pennington
34d09085ab Remove proxying of resources_fs, and add a unittest that exposes the problem 
[PLAT-191]
 2014-10-29 13:48:57 -04:00
Carol Tong
f3ae9e1417 Add doc for new Show Reset Button setting 2014-10-29 13:48:51 -04:00
Clinton Blackburn
13579ca9a8 Updates to Demographics Display 
- Gating on feature enabled for Open edX users
- If feature disabled and Insights URL is set, displaying message pointing users to Insights
 2014-10-29 12:31:44 -04:00
Clinton Blackburn
7b88d3d0f6 Merge pull request #5707 from edx/remove-analytics-api 
Removed Analytics API Client
 2014-10-29 12:28:59 -04:00
Clinton Blackburn
a3171eb8d8 Removed Analytics API Client 
Instructors should use Insights instead.
 2014-10-29 10:25:18 -04: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
Will Daly
c553a47c26 Update third party auth on the logistration form 2014-10-28 17:00:48 -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
Diana Huang
13986d8475 Update tests to match new text. 2014-10-28 16:28:58 -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
Will Daly
48bc4776be Merge branch 'will/third-party-auth-fixes' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/third_party_auth/__init__.py
	common/djangoapps/third_party_auth/pipeline.py
 2014-10-28 15:16:27 -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
Diana Huang
9f441d22b0 Merge pull request #5745 from edx/will/third-party-auth-fixes 
Third Party Auth Fixes
 2014-10-28 13:06:40 -04:00
Tim Babych
306813674d Merge pull request #5761 from edx/tim/mktg-iframe-fix 
Do not show middle-click href in marketing iframe for logged in users
 2014-10-28 18:29:36 +02:00
Diana Huang
92b0bf10c1 Update tests to match new text. 2014-10-28 11:58:41 -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
Tim Babych
960f7b206a Fix to marketing iframe middle-click href: course does not always have openable url. 2014-10-28 17:20:57 +02: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
Usman Khalid
ee55948416 Merge pull request #5751 from edx/usman/tnl367-transaction-level-decorator-3 
Added commit_on_success_with_read_committed decorator to courseware.views.index
 2014-10-28 19:43:31 +05:00
David Baumgold
54049fa06a Merge pull request #5758 from edx/correct-doc-link 
Correct doc link
 2014-10-28 10:32:50 -04:00
Will Daly
f9b5a9173f Redirect users to the track selection page or ?next page when using third party auth 
Set marketing site logged in cookie from third party auth.
 2014-10-28 10:28:30 -04:00
AlasdairSwan
c47eb12ad3 Merge pull request #5757 from edx/alasdair/logistration-rwd 
Alasdair/logistration rwd
 2014-10-28 10:24:39 -04:00
AlasdairSwan
728df71acf ECOM-531 Updated style after review with Andy Waldrop 2014-10-28 10:20:44 -04:00