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

27986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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