Commit Graph

1422 Commits

Author SHA1 Message Date
Chris Dodge
a12baec599 add new files 2012-10-12 20:55:16 -04:00
Chris Dodge
4e4b6accda wip: create new course 2012-10-12 16:11:55 -04:00
Chris Dodge
d31a7c6d6b log and continue on thumbnail generation exception 2012-10-12 13:11:55 -04:00
Chris Dodge
b17836f232 swallow exceptions when generating thumbnails 2012-10-12 12:27:21 -04:00
chrisndodge
ff25d13256 Merge pull request #868 from MITx/fix/cdodge/cas-delete-regression
DraftMongoContentStore needs to both delete the draft *and* the non-draf...
2012-10-12 08:17:35 -07:00
chrisndodge
750e70e842 Merge pull request #878 from MITx/feature/cale/edge-landing-page
Feature/cale/edge landing page
2012-10-12 08:01:46 -07:00
Chris Dodge
281f194b2a per feedback, change back 'draft-aware' modulestore to not delete the published copy. In delete_item in views.py do the logic to determine whether we should be using a 'draft-aware' modulestore or not, based on the category type 2012-10-12 11:00:34 -04:00
Chris Dodge
1015b3a974 DraftMongoContentStore needs to both delete the draft *and* the non-draft entities 2012-10-12 11:00:34 -04:00
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
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
Chris Dodge
82abdd07dc respond to some of Cale's comments 2012-10-11 16:23:28 -04:00
Tom Giannattasio
c3e2a544da tweaks to datepicker and calendar 2012-10-11 14:53:45 -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
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
5ae34aa4ed Add heartbeat to cms 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
bfb49133d1 Merge pull request #843 from MITx/feature/cdodge/subsection-edit-page
Feature/cdodge/subsection edit page
2012-10-10 10:26:27 -07: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
0cf6a1179a wip - trigger display message when release data is different than parent release date 2012-10-08 10:43:46 -04:00
Chris Dodge
d55769861e check if 'delete metadata field' is not in the list of system metadata 2012-10-05 14:45:07 -04:00
Chris Dodge
758c446929 wip on setting date/times on subsection page 2012-10-05 09:56:07 -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