Chris Dodge
|
e2be559ab0
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/cas-bugs
|
2012-10-11 20:55:29 -04:00 |
|
chrisndodge
|
64c3bbdc7d
|
Merge pull request #869 from MITx/fix/cdodge/cas-logger-crash
fix up dev.py to include the new flag
|
2012-10-11 17:54:33 -07:00 |
|
Chris Dodge
|
e27dea0fec
|
fix up dev.py to include the new flag
|
2012-10-11 20:52:28 -04:00 |
|
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 |
|
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 |
|
Calen Pennington
|
38f5761a89
|
Merge pull request #864 from MITx/bug/lyla/numericalresponse
quick bug fix
|
2012-10-11 09:17:57 -07:00 |
|
Lyla Fischer
|
1bd2cb4f85
|
quick bug fix
|
2012-10-11 12:12:34 -04:00 |
|
Calen Pennington
|
f010875750
|
Merge pull request #848 from MITx/feature/cas/lyla/asset-store-integration
Feature/cas/lyla/asset store integration
|
2012-10-11 08:59:50 -07:00 |
|
Lyla Fischer
|
f06c67ef08
|
added embeddable links
|
2012-10-11 11:59:17 -04:00 |
|
Lyla Fischer
|
0bd5446f80
|
fixed date display
|
2012-10-11 11:58:49 -04:00 |
|
Chris Dodge
|
115d7358fa
|
fix up commenting after refactoring. Also, don't reraise an exception during thumbnail generation - we just want to swallow the exception, log, and continue.
|
2012-10-11 11:57:56 -04:00 |
|
Chris Dodge
|
2153aae62c
|
schema change to better normalize asset->thumbnail relationships
|
2012-10-11 11:57:56 -04:00 |
|
Lyla Fischer
|
6378682201
|
thumnail image is a thumnail image
|
2012-10-11 11:57:56 -04:00 |
|
Lyla Fischer
|
83eeb1961a
|
fixed erroneous order
|
2012-10-11 11:57:30 -04:00 |
|
Lyla Fischer
|
f26a4af75c
|
thinks work, they just don't display prettily, and it is hard to actually use the assets due to links
|
2012-10-11 11:57:14 -04:00 |
|
Lyla Fischer
|
7791a7c4aa
|
slight refactoring of the javascript
|
2012-10-11 11:56:53 -04:00 |
|
Lyla Fischer
|
d35ff48e5b
|
fixed up some of the ajax feedback to display to the user
|
2012-10-11 11:56:53 -04:00 |
|
Lyla Fischer
|
deca6e66b0
|
cleaned filenames
|
2012-10-11 11:56:53 -04:00 |
|
Lyla Fischer
|
65e3982fd2
|
things now upload
|
2012-10-11 11:56:53 -04:00 |
|
Calen Pennington
|
6a7fb1d53b
|
Merge pull request #859 from MITx/feature/tomg/cas-404
template for 404 and 500 errors
|
2012-10-11 08:40:47 -07:00 |
|
Tom Giannattasio
|
782e5f51e9
|
template for 404 and 500 errors
|
2012-10-11 09:58:35 -04:00 |
|
Calen Pennington
|
5eb0ca69e0
|
Merge pull request #858 from MITx/feature/cdodge/cas-crud-section-subsection
a 'section' is actually a 'chapter' in previous nomenclature
|
2012-10-11 06:55:12 -07:00 |
|
Chris Dodge
|
b77298b2ec
|
a 'section' is actually a 'chapter' in previous nomenclature
|
2012-10-11 09:49:07 -04:00 |
|
Calen Pennington
|
bdf8a55a47
|
Merge pull request #852 from MITx/feature/cdodge/cas-crud-section-subsection
Add basic section/subsection CRUD on the overview page
|
2012-10-11 05:44:47 -07:00 |
|
Calen Pennington
|
c8d267fb72
|
Fix minor typo in access.py
|
2012-10-10 22:03:08 -04:00 |
|