Chris Dodge
|
14a1a7da31
|
allow importing of .tar.gz packages of courseware
|
2012-10-12 10:33:31 -04:00 |
|
Calen Pennington
|
4814f8c38e
|
Cleaning up logos for edge landing page
|
2012-10-12 10:31:46 -04:00 |
|
chrisndodge
|
b2d70e2801
|
Merge pull request #872 from MITx/feature/cale/edge-landing-page
Edge landing page, styled, not wired up yet
|
2012-10-12 06:27:19 -07:00 |
|
Calen Pennington
|
c814758715
|
Merge pull request #866 from MITx/feature/cdodge/cms-import
Feature/cdodge/cms import
|
2012-10-11 19:22:19 -07:00 |
|
Calen Pennington
|
d1b7bcef16
|
Merge pull request #867 from MITx/feature/tomg/cas-cleanup
various style updates
|
2012-10-11 19:21:10 -07:00 |
|
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 |
|
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 |
|
Tom Giannattasio
|
648792b7d3
|
changed studio to edge in emails
|
2012-10-11 16:25:39 -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
|
a521ea239f
|
baseline working for importing courseware and static assets
|
2012-10-11 13:41:16 -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 |
|
Calen Pennington
|
d21c5761df
|
Minor bug fixes from edge-configs merge
|
2012-10-11 12:49:48 -04:00 |
|
Calen Pennington
|
cf19a43268
|
Set SESSION_COOKIE_DOMAIN from env.json
|
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
|
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
|
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
|
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 |
|
Chris Dodge
|
6b5b6342d2
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-import
Conflicts:
common/lib/xmodule/xmodule/contentstore/content.py
|
2012-10-11 12:11:48 -04:00 |
|
Chris Dodge
|
a84ef1b243
|
wip: static asset import
|
2012-10-11 12:10:28 -04: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
|
65e3982fd2
|
things now upload
|
2012-10-11 11:56:53 -04: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 |
|