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
Martyn James
1d4c781e9b Merge pull request #5799 from edx/hotfix_candidate/2014-10-30 
Merging Hotfix candidate/2014 10 30 as per release process
 2014-10-31 13:37:48 -04: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
Chris Dodge
684d67654b add missing file 2014-10-31 09:22:53 -04:00
muhammad-ammar
fcaa783e43 Unit Test Improvements 
TE-489
 2014-10-31 11:55:13 +00:00
muhammad-ammar
ac8c6d18ca Correct script exit status 
TE-567
 2014-10-31 07:48:56 +00:00
Chris Dodge
6fcfb2a6a3 allow for a customized region on the receipt page that is microsite brand specific 2014-10-30 22:17:02 -04:00
Chris Dodge
8b25a4c1cb fix the link in the button on the receipt page 2014-10-30 21:10:22 -04: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
Diana Huang
8d7d9d212f Merge pull request #5762 from edx/diana/enrollment-integration 
WIP: Combined Login/Registration: Set up basic enrollment infrastructure.
 2014-10-30 17:18:07 -04:00
Diana Huang
47979e5bcf Add tests for the enrollment_interface 2014-10-30 17:15:26 -04:00
Diana Huang
fc468bf696 Set up basic enrollment infrastructure. 2014-10-30 17:15:26 -04: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
David Baumgold
2a669e57b9 re-add search-icon.png 2014-10-30 16:25:36 -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
Renzo Lucioni
471f513566 Merge pull request #5770 from edx/renzo/logistration-i18n 
i18n logistration
 2014-10-30 14:20:08 -04:00
Renzo Lucioni
4157e5c0f6 i18n logistration 2014-10-30 14:09:15 -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
David Baumgold
7141e4851b content-types is no longer around 2014-10-30 13:52:31 -04:00
David Baumgold
1b49dd0e6d Deleted some unused images under common 2014-10-30 13:49:45 -04:00
David Baumgold
6577138dff Removed more files from cms 2014-10-30 13:41:30 -04:00
David Baumgold
766fac735f Remove extra large-FOO-icon.png files 2014-10-30 13:34:53 -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
Chris Dodge
fea9432b50 Add the ability for course staff to specify a Survey and make it required so that a student must fill it out before starting the course 2014-10-30 13:11:02 -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
David Baumgold
22ed23ae8d deleting more things 2014-10-30 12:07:58 -04:00
Brian Talbot
ee368e8740 Studio: cleaning up/removing unused sass 
* removing unused font-family-centric Sass variables
* removing unused graphic images and Sass references
* clean up of style removal fallout
 2014-10-30 12:07:52 -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
AlasdairSwan
ff753f2bcb Merge pull request #5784 from edx/alasdair/rwd-header-and-footer 
Alasdair/rwd header and footer
 2014-10-30 09:21:21 -04:00
AlasdairSwan
0c22db688f ECOM-406 removed commented out code, moved colours to variables and fixed hover state for mobile menu 2014-10-30 09:20:48 -04:00
Muhammad Ammar
1be908d29b Correct test file path for bok-choy 2014-10-30 12:23:04 +05:00
Nimisha Asthagiri
994ac6da6d Fixes for MOB-836 and MOB-766 and MA-96. 2014-10-29 22:06:42 -04:00