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

26606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Jarvis
2f0f011a21 config refactor wip 2014-11-26 21:14:39 +00:00
Sarina Canelake
f76288c042 Merge pull request #5726 from edx/sarina/fix-wording-reset-button 
Update wording per Doc
 2014-10-31 13:27:51 -04:00
Jesse Zoldak
71f237d361 Revert "Fix lettuce css_fill method for devstack" 
This reverts commit 471abb8c28.
 2014-10-31 11:51:28 -04:00
Jesse Zoldak
471abb8c28 Fix lettuce css_fill method for devstack 2014-10-31 11:48:35 -04:00
Adam
47c445db4e Merge pull request #5794 from edx/adam/shorten-title-width 
courseware header bar should not overflow shopping cart button TNL-722
 2014-10-31 10:52:38 -04:00
Muhammad Ammar
b82167f783 Merge pull request #5806 from edx/ammar/te-567 
Correct script exit status
 2014-10-31 19:18:34 +05:00
frances botsford
6986715951 Merge pull request #5750 from edx/frances/fix/receipt-layout-fixes 
Verified Receipt page layout fixes
 2014-10-31 10:09:34 -04:00
Feanil Patel
7d2a2f896c Merge pull request #5291 from fmyzjs/s3_storgae 
When s3fs cannot be accessed replaced with osfs
 2014-10-31 09:52:02 -04:00
Calen Pennington
b4562ffe6b Merge pull request #5783 from cpennington/proxy-through-module-system-to-descriptor-system 
Fix PLAT-191
 2014-10-31 09:31:13 -04:00
muhammad-ammar
ac8c6d18ca Correct script exit status 
TE-567
 2014-10-31 07:48:56 +00:00
Jesse Zoldak
074c09687c Merge pull request #5803 from Stanford-Online/caijim/resetbutton 
Commenting out flaky string input test case
 2014-10-30 17:37:19 -04:00
Jim
3ceb0e5c6a Commenting out flaky string input test case 2014-10-30 14:33:36 -07:00
Jesse Zoldak
7ca78d6e43 Merge pull request #5724 from edx/zoldak/improve-rerun-test 
Improve rerun test
 2014-10-30 16:27:29 -04:00
Carol Tong
97d9d95663 Merge pull request #5765 from edx/carol/docs/DOC-1100 
Add email template for verified certificate date
 2014-10-30 15:25:24 -04:00
Carol Tong
41b16452b4 Add email template for verified certificate date 2014-10-30 15:23:12 -04:00
Calen Pennington
4007d5ebcb Wrap ModuleSystem and DescriptorSystem into a single object, to continue holding up the XModule house of cards 
[PLAT-191]
 2014-10-30 14:23:16 -04:00
Adam
75fab0ccfd Merge pull request #5538 from edx/adam/generalized-draft-import-export-2 
Adam/generalized draft import export 2
 2014-10-30 13:53:57 -04:00
Daniel Friedman
355a3b45ad Merge pull request #5764 from edx/dan-f/highlight-active-unit-in-outline 
Highlight active unit in studio container page's outline
 2014-10-30 13:13:34 -04:00
Sarina Canelake
3d7ce0bb07 Merge pull request #5792 from edx/sarina/i18n 
Fix i18n and quality errors in course_groups/views.py
 2014-10-30 13:09:51 -04:00
Alison Hodges
fc2906da14 Merge pull request #5769 from edx/ahodges/doc/DOC491 
Corrected link to Developer's guide
 2014-10-30 12:24:48 -04:00
Alison Hodges
fc89ccaa6d Corrected link to Developer's guide 
@mhoeber , @stroilova
 2014-10-30 12:23:10 -04:00
Adam Palay
a6c31fc46b generalize draft import/export TNL-574 
add test for videomodule

Import drafts handles modules w/o xml_attributes
and ones using the old parent_sequential_url pointer

Handle drafts for modules which don't define nor extract xml_attributes

Support  and  in get_items qualifiers

Unit test for   value query
 2014-10-30 12:22:05 -04:00
Adam Palay
6a40ed1d74 courseware header bar should not overflow shopping cart button TNL-722 2014-10-30 12:16:56 -04:00
Sarina Canelake
1b6d1b3730 Fix i18n and quality errors in course_groups/views.py 2014-10-30 11:10:57 -04:00
Daniel Friedman
3b3b3dcd9e Show current unit in unit outline. 
TNL-291
 2014-10-30 11:08:49 -04:00
Brian Talbot
a4e1cc483b Studio: correcting minor Sass indent and property syntax issues 2014-10-30 11:08:49 -04:00
Brian Talbot
d88dcfbd7e Studio: visually styling current unit on course unit/container view's mini outline 2014-10-30 11:08:49 -04:00
Daniel Friedman
8b73de9123 Merge pull request #5728 from edx/dan-f/grade-export-split-test 
Verify grade export works for problems in split tests
 2014-10-30 11:04:54 -04:00
Daniel Friedman
9bf22ea9fe Verify grade export works for problems in split tests 
TNL-41
 2014-10-30 09:58:16 -04:00
Muhammad Ammar
1be908d29b Correct test file path for bok-choy 2014-10-30 12:23:04 +05:00
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
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
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
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