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 |
|
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
|
9239da678a
|
Mark is_draft as system metadata, so that users don't edit it
|
2012-10-11 12:32:23 -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
|
8eb4390def
|
Enable authentication in mongo modulestore and contentstore
|
2012-10-11 12:31:51 -04:00 |
|
Lyla Fischer
|
1bd2cb4f85
|
quick bug fix
|
2012-10-11 12:12:34 -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 |
|
Chris Dodge
|
2153aae62c
|
schema change to better normalize asset->thumbnail relationships
|
2012-10-11 11:57:56 -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
|
deca6e66b0
|
cleaned filenames
|
2012-10-11 11:56:53 -04:00 |
|
Calen Pennington
|
7c3d5d58b7
|
Fix up how parent locations interact w/ draft mode when creating new units
|
2012-10-10 12:49:53 -04:00 |
|
Calen Pennington
|
5f0e237ab0
|
Store the id of the publishing user on publish
|
2012-10-10 12:49:53 -04:00 |
|
Calen Pennington
|
0aa79ed479
|
Remove extraneous TODO comment
|
2012-10-10 12:49:52 -04:00 |
|
Calen Pennington
|
5dcf388b1c
|
Add line numbers and wrapping to xml, json, and html editors
|
2012-10-10 12:49:52 -04:00 |
|
Calen Pennington
|
b079b336db
|
Make updating children and data of a draft make the correct checks for whether the document is already a draft or not
|
2012-10-10 12:49:51 -04:00 |
|
Calen Pennington
|
310f26a6de
|
Basic implementation of draft, public and private modes
|
2012-10-10 12:49:51 -04:00 |
|
Calen Pennington
|
05c02f0d5f
|
Fixing tests from changes around draft mode
|
2012-10-10 12:49:51 -04:00 |
|
Calen Pennington
|
b6c93b61fd
|
Mark published_date as system metadata
|
2012-10-10 12:49:51 -04:00 |
|
Calen Pennington
|
1328fc5ac0
|
Store published date in module metadata, and display it on draft pages
|
2012-10-10 12:49:51 -04:00 |
|
Calen Pennington
|
1a8532d8ad
|
Make it possible to create, edit, and publish a draft
|
2012-10-10 12:49:51 -04:00 |
|
Calen Pennington
|
8da3723445
|
Clone the full item as a draft if it doesn't already exist when doing a draft editing operation
|
2012-10-10 12:42:15 -04:00 |
|
Calen Pennington
|
75f8b7c98d
|
Add Draft module store that is used whenever any item is update in the CAS (but not during import, and not for templates)
|
2012-10-10 12:42:14 -04:00 |
|
Chris Dodge
|
c3aa86f1fb
|
remove template_dir_name from Vertical and Sequence descriptors so that it uses the default template dir
|
2012-10-04 14:53:43 -04:00 |
|
Chris Dodge
|
45b82f3a45
|
update creating a new unit to use an empty template. Also twiddle the units.html and base.js where we put the unit Location on the <li> element
|
2012-10-04 10:58:48 -04:00 |
|
Calen Pennington
|
35d1966d9a
|
Merge pull request #813 from MITx/feature/cdodge/asset-id-change
add a 'safety switch' where we add new content into GridFS with a filena...
|
2012-10-03 11:29:16 -07:00 |
|
Calen Pennington
|
d80c931772
|
Hook up the component delete button to the backend. Don't break if the process of updating a parent unit after deleting is interrupted (leaving a pointer to a missing module)
|
2012-10-03 14:24:11 -04:00 |
|
Chris Dodge
|
ebf6d07607
|
add a 'safety switch' where we add new content into GridFS with a filename (which GridFS maintains an index on) in case any assumptions about our new id scheme proves to be false. We can query by filename (which is a /tag/org/course/category/name format) so it'll be unique
|
2012-10-03 12:36:35 -04:00 |
|
Calen Pennington
|
5e7699554e
|
Merge pull request #803 from MITx/feature/tomg/cms-editing
code mirror styling and a few small tweaks
|
2012-10-03 07:20:52 -07:00 |
|
Tom Giannattasio
|
e1fbe1e049
|
added code mirror styles
|
2012-10-03 09:47:19 -04:00 |
|
Chris Dodge
|
fb204084a2
|
for get_all_content_info_for_course(), return a list of the MongoDB query rather than a cursor object. Also add some documentation (in a comment) as to what a caller should expect
|
2012-10-03 09:24:48 -04:00 |
|
Chris Dodge
|
eb7d6c656c
|
use better encapsulation for the naming convention behind thumbnails. Put it all in content.py rather than view.py.
|
2012-10-03 09:17:18 -04:00 |
|
Chris Dodge
|
84bc81f7eb
|
refactor StaticContent id scheme to be the same as moduledata. Also expose a new 'get all content for course' which will be needed to support a asset management page.
|
2012-10-03 09:07:09 -04:00 |
|
Chris Dodge
|
a60ec13d3a
|
fix bug with editing HTML. The save() method should now return a dictionary, not a string
|
2012-10-02 11:58:24 -04:00 |
|
Calen Pennington
|
b305c0bae2
|
Make drag/drop save content immediately in seqs and verticals
|
2012-10-01 15:17:41 -04:00 |
|
Calen Pennington
|
fd7223bd87
|
Make editing work, building towards drag/drop saving
|
2012-10-01 15:17:41 -04:00 |
|
Calen Pennington
|
b91c2b6680
|
Add sequence and vertical js modules that add drag and drop
|
2012-10-01 15:17:41 -04:00 |
|
Calen Pennington
|
ce3638538c
|
Make inline editing save to mongo and then update the preview
|
2012-10-01 15:17:41 -04:00 |
|
Calen Pennington
|
dc062f5668
|
Make edit and delete buttons show up on cms unit editing page
|
2012-10-01 15:17:41 -04:00 |
|
Calen Pennington
|
05b9e6cab2
|
Standardize more of css between lms and cms
|
2012-10-01 15:17:40 -04:00 |
|
Calen Pennington
|
4381674ec5
|
Move common scss mixins to common/static/sass, and tweak the video player to have more in common between the cms and the lms
|
2012-10-01 15:17:40 -04:00 |
|
Calen Pennington
|
4ad22559c4
|
Standardize on the bourbon clearfix mixin for video player clearfixes
|
2012-10-01 15:17:40 -04:00 |
|
Calen Pennington
|
44805ca383
|
Make discussion js work for cms as well as lms so that inline discussion xmodules load
|
2012-10-01 15:16:54 -04:00 |
|
Victor Shnayder
|
d424fb8332
|
make codemirror use visible tabs
* this may not be optimal (compared to e.g. replacing tabs with spaces), but it's a lot better than mystery 'bad indentation' errors
|
2012-09-30 19:18:56 -04:00 |
|
Victor Shnayder
|
af6dd84af0
|
Merge pull request #789 from MITx/feature/bridger/course_grading
Feature/bridger/course grading
|
2012-09-30 11:52:36 -07:00 |
|
Bridger Maxwell
|
4ee0e258ea
|
Refactored a bit of the generating scores code.
|
2012-09-30 14:48:20 -04:00 |
|
Calen Pennington
|
9c859fd925
|
Merge pull request #780 from MITx/feature/cdodge/cms-static-content-management
Feature/cdodge/cms static content management
|
2012-09-29 07:39:50 -07:00 |
|
Bridger Maxwell
|
2e4ea1d49c
|
Added docstring for show_only_average parameter.
|
2012-09-28 23:19:46 -04:00 |
|