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

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Dodge
466e4cbd17 Fix regression on creating new sections and subsections. They were being set into 'draft' when we are not currently supporting draft modes for those areas of the hierarchy 2012-10-11 20:48:45 -04:00
Victor Shnayder
c420c67b82 Actually implement exact vs factors-don't-matter comparisons in chemcalc 2012-10-11 17:40:26 -04:00
Tom Giannattasio
648792b7d3 changed studio to edge in emails 2012-10-11 16:25:39 -04:00
Chris Dodge
82abdd07dc respond to some of Cale's comments 2012-10-11 16:23:28 -04:00
Tom Giannattasio
5f66be503c changed edx to edx studio in email templates (hopefully this is right) 2012-10-11 14:53:45 -04:00
Tom Giannattasio
8da5087de8 polished policy styles 2012-10-11 14:53:45 -04:00
Tom Giannattasio
c3e2a544da tweaks to datepicker and calendar 2012-10-11 14:53:45 -04:00
Tom Giannattasio
fcc725e76d finished calendar styles 2012-10-11 14:53:45 -04:00
Tom Giannattasio
b685af44eb started calendar styles 2012-10-11 14:53:45 -04:00
Tom Giannattasio
427462348d tweaked published messaging styles 2012-10-11 14:53:45 -04:00
Tom Giannattasio
093d8385f7 removed search 2012-10-11 14:53:44 -04:00
Tom Giannattasio
df09990a0a removed dropdown in header 2012-10-11 14:53:44 -04:00
Tom Giannattasio
51a19b3d7e transferred edge styles from cms to lms 2012-10-11 14:02:13 -04:00
Chris Dodge
bf392e360a on import set course metadata to hide the progress tab since we don't yet support grading policies 2012-10-11 13:52:15 -04:00
Chris Dodge
a521ea239f baseline working for importing courseware and static assets 2012-10-11 13:41:16 -04:00
David Ormsbee
9c0e554992 Merge pull request #855 from MITx/bug/tomg/nested-hints 
tweaked collapsible selector to target the proper section
 2012-10-11 10:25:21 -07:00
David Ormsbee
d0668043a5 Merge pull request #861 from MITx/feature/ichuang/dump_grades 
add django management command for dumping grades to CSV file
 2012-10-11 10:24:19 -07:00
David Ormsbee
c6c51cf19a Merge pull request #865 from MITx/bugfix/victor/progress-tab-crash 
Check for None to fix 3.091 progress tab crash
 2012-10-11 10:22:28 -07:00
Calen Pennington
096d6853eb Allow for branding subdomains that are longer than a single . 2012-10-11 13:18:27 -04:00
Calen Pennington
9e9825cb88 Enable the edge virtual university landing page in the lms 2012-10-11 13:18:01 -04:00
Victor Shnayder
a5dcdcb705 Check for None to fix 3.091 progress tab crash 
- get_module() contract says it can return None (e.g. if access control check failed)
 2012-10-11 13:08:05 -04:00
Chris Dodge
bb46c5f909 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-import 2012-10-11 12:51:37 -04:00
Chris Dodge
ab1decd97b import static assets. Also consolidate asset import/thumbnail generation into a single code base 2012-10-11 12:51:33 -04:00
David Ormsbee
4b16a7b422 Merge pull request #863 from MITx/bug/lyla/numerical-tolerance-default 
fixed default tolerance on numericalresponse
 2012-10-11 09:51:29 -07:00
Calen Pennington
d21c5761df Minor bug fixes from edge-configs merge 2012-10-11 12:49:48 -04:00
chrisndodge
6801412557 Merge pull request #856 from MITx/feature/cale/edge-configs 
Configuration changes to get edge running on AWS
 2012-10-11 09:39:59 -07:00
Calen Pennington
cf19a43268 Set SESSION_COOKIE_DOMAIN from env.json 2012-10-11 12:32:23 -04:00
Calen Pennington
9239da678a Mark is_draft as system metadata, so that users don't edit it 2012-10-11 12:32:23 -04:00
Calen Pennington
5ae34aa4ed Add heartbeat to cms 2012-10-11 12:32:23 -04:00
Calen Pennington
284f0d6a22 Make the lms running alongside the CAS in dev point to the same contentstore, and server up static content 2012-10-11 12:31:52 -04:00
Calen Pennington
d4405375e5 Read contentstore from auth.json 2012-10-11 12:31:52 -04:00
Calen Pennington
658bb622ba Always import logsettings after common, so that paths are set 2012-10-11 12:31:52 -04:00
Calen Pennington
bc69ed8c9e Move logsettings to common, so that it's shared between cms and lms 2012-10-11 12:31:52 -04:00
Calen Pennington
20f84b2055 Use the right config as the base for lms.envs.cms.aws 2012-10-11 12:31:52 -04:00
Calen Pennington
eece835d9b Put in an empty contentstore for the LMS by default 2012-10-11 12:31:52 -04:00
Calen Pennington
46668d2634 Read CONTENTSTORE from auth.json in lms 2012-10-11 12:31:51 -04:00
Calen Pennington
0162e4c031 Remove more askbot remnants 2012-10-11 12:31:51 -04:00
Calen Pennington
f5a63f7375 Remove all askbot common settings 2012-10-11 12:31:51 -04:00
Calen Pennington
1114f66a98 Enable specification of modulestore in LMS aws config 2012-10-11 12:31:51 -04:00
Calen Pennington
8eb4390def Enable authentication in mongo modulestore and contentstore 2012-10-11 12:31:51 -04:00
Calen Pennington
e2d3ca6f23 Merge pull request #842 from MITx/feature/tomg/edge 
added edge logo; added edge temp landing page
 2012-10-11 09:30:18 -07:00
Calen Pennington
af44d1c1cf Remove duplicate template definition 2012-10-11 12:30:03 -04:00
Tom Giannattasio
19f8266b6a removed dup edge def and changed to university_profile/edge template 2012-10-11 12:30:03 -04:00
Tom Giannattasio
86f32bb3d4 added edge template to university folder 2012-10-11 12:29:40 -04:00
Tom Giannattasio
a1a13eb4f2 added studio logo to log in and sign up pages 2012-10-11 12:29:40 -04:00
Tom Giannattasio
5dba4fd6c3 tweaked window style for consistency 2012-10-11 12:29:40 -04:00
Tom Giannattasio
5ae11b8e11 changed edge course url 2012-10-11 12:29:40 -04:00
Tom Giannattasio
6da378e735 tweaked edge template to target students only 2012-10-11 12:29:40 -04:00
Tom Giannattasio
f4bdb46493 changed edge url 2012-10-11 12:29:40 -04:00
Tom Giannattasio
fec710abde added edge logo; added edge temp landing page 2012-10-11 12:29:14 -04:00