Commits · e2be559ab04ced67528eb94cb05a56d095b41b15 · edx / edx-platform · GitLab

12 Oct, 2012 4 commits
- Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/cas-bugs · e2be559a
  Chris Dodge committed Oct 11, 2012
  
  e2be559a Browse Files
- Merge pull request #869 from MITx/fix/cdodge/cas-logger-crash · 64c3bbdc
```
fix up dev.py to include the new flag
```
  chrisndodge committed Oct 11, 2012
  64c3bbdc Browse Files
- fix up dev.py to include the new flag · e27dea0f
  Chris Dodge committed Oct 11, 2012
  
  e27dea0f Browse Files
- Fix regression on creating new sections and subsections. They were being set… · 466e4cbd
```
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
```
  Chris Dodge committed Oct 11, 2012
  466e4cbd Browse Files
11 Oct, 2012 36 commits
- Minor bug fixes from edge-configs merge · d21c5761
  Calen Pennington committed Oct 11, 2012
  
  d21c5761 Browse Files
- Merge pull request #856 from MITx/feature/cale/edge-configs · 68014125
```
Configuration changes to get edge running on AWS
```
  chrisndodge committed Oct 11, 2012
  68014125 Browse Files
- Set SESSION_COOKIE_DOMAIN from env.json · cf19a432
  Calen Pennington committed Oct 11, 2012
  
  cf19a432 Browse Files
- Mark is_draft as system metadata, so that users don't edit it · 9239da67
  Calen Pennington committed Oct 11, 2012
  
  9239da67 Browse Files
- Add heartbeat to cms · 5ae34aa4
  Calen Pennington committed Oct 11, 2012
  
  5ae34aa4 Browse Files
- Make the lms running alongside the CAS in dev point to the same contentstore,… · 284f0d6a
```
Make the lms running alongside the CAS in dev point to the same contentstore, and server up static content
```
  Calen Pennington committed Oct 11, 2012
  284f0d6a Browse Files
- Read contentstore from auth.json · d4405375
  Calen Pennington committed Oct 11, 2012
  
  d4405375 Browse Files
- Always import logsettings after common, so that paths are set · 658bb622
  Calen Pennington committed Oct 11, 2012
  
  658bb622 Browse Files
- Move logsettings to common, so that it's shared between cms and lms · bc69ed8c
  Calen Pennington committed Oct 11, 2012
  
  bc69ed8c Browse Files
- Use the right config as the base for lms.envs.cms.aws · 20f84b20
  Calen Pennington committed Oct 11, 2012
  
  20f84b20 Browse Files
- Put in an empty contentstore for the LMS by default · eece835d
  Calen Pennington committed Oct 11, 2012
  
  eece835d Browse Files
- Read CONTENTSTORE from auth.json in lms · 46668d26
  Calen Pennington committed Oct 11, 2012
  
  46668d26 Browse Files
- Remove more askbot remnants · 0162e4c0
  Calen Pennington committed Oct 11, 2012
  
  0162e4c0 Browse Files
- Remove all askbot common settings · f5a63f73
  Calen Pennington committed Oct 11, 2012
  
  f5a63f73 Browse Files
- Enable specification of modulestore in LMS aws config · 1114f66a
  Calen Pennington committed Oct 11, 2012
  
  1114f66a Browse Files
- Enable authentication in mongo modulestore and contentstore · 8eb4390d
  Calen Pennington committed Oct 11, 2012
  
  8eb4390d Browse Files
- Merge pull request #842 from MITx/feature/tomg/edge · e2d3ca6f
```
added edge logo; added edge temp landing page
```
  Calen Pennington committed Oct 11, 2012
  e2d3ca6f Browse Files
- Remove duplicate template definition · af44d1c1
  Calen Pennington committed Oct 11, 2012
  
  af44d1c1 Browse Files
- removed dup edge def and changed to university_profile/edge template · 19f8266b
  Tom Giannattasio committed Oct 11, 2012
  
  19f8266b Browse Files
- added edge template to university folder · 86f32bb3
  Tom Giannattasio committed Oct 11, 2012
  
  86f32bb3 Browse Files
- added studio logo to log in and sign up pages · a1a13eb4
  Tom Giannattasio committed Oct 11, 2012
  
  a1a13eb4 Browse Files
- tweaked window style for consistency · 5dba4fd6
  Tom Giannattasio committed Oct 11, 2012
  
  5dba4fd6 Browse Files
- changed edge course url · 5ae11b8e
  Tom Giannattasio committed Oct 11, 2012
  
  5ae11b8e Browse Files
- tweaked edge template to target students only · 6da378e7
  Tom Giannattasio committed Oct 11, 2012
  
  6da378e7 Browse Files
- changed edge url · f4bdb464
  Tom Giannattasio committed Oct 11, 2012
  
  f4bdb464 Browse Files
- added edge logo; added edge temp landing page · fec710ab
  Tom Giannattasio committed Oct 11, 2012
  
  fec710ab Browse Files
- Merge pull request #864 from MITx/bug/lyla/numericalresponse · 38f5761a
```
quick bug fix
```
  Calen Pennington committed Oct 11, 2012
  38f5761a Browse Files
- quick bug fix · 1bd2cb4f
  Lyla Fischer committed Oct 11, 2012
  
  1bd2cb4f Browse Files
- Merge pull request #848 from MITx/feature/cas/lyla/asset-store-integration · f0108757
```
Feature/cas/lyla/asset store integration
```
  Calen Pennington committed Oct 11, 2012
  f0108757 Browse Files
- added embeddable links · f06c67ef
  Lyla Fischer committed Oct 11, 2012
  
  f06c67ef Browse Files
- fixed date display · 0bd5446f
  Lyla Fischer committed Oct 11, 2012
  
  0bd5446f Browse Files
- fix up commenting after refactoring. Also, don't reraise an exception during… · 115d7358
```
fix up commenting after refactoring. Also, don't reraise an exception during thumbnail generation - we just want to swallow the exception, log, and continue.
```
  Chris Dodge committed Oct 11, 2012
  115d7358 Browse Files
- schema change to better normalize asset->thumbnail relationships · 2153aae6
  Chris Dodge committed Oct 11, 2012
  
  2153aae6 Browse Files
- thumnail image is a thumnail image · 63786822
  Lyla Fischer committed Oct 11, 2012
  
  63786822 Browse Files
- fixed erroneous order · 83eeb196
  Lyla Fischer committed Oct 11, 2012
  
  83eeb196 Browse Files
- thinks work, they just don't display prettily, and it is hard to actually use… · f26a4af7
```
thinks work, they just don't display prettily, and it is hard to actually use the assets due to links
```
  Lyla Fischer committed Oct 11, 2012
  f26a4af7 Browse Files