4229 Commits

Author	SHA1	Message	Date
Chris Dodge	90861c22d0	improvements on asset upload refresh. Now we don't need to refresh the whole page, just insert the table tow	2012-10-17 12:26:56 -04:00
Chris Dodge	5964ecc70c	remove work in progress regarding convert datetime to localtime	2012-10-17 10:34:23 -04:00
Chris Dodge	170694e580	fix/cdodge/asset-upload-tweeks	2012-10-17 10:31:18 -04:00
chrisndodge	b91f1886b1	Merge pull request #924 from MITx/fix/cdodge/manage-users ... fix 403 error when editors visit page (make read only). Don't allow user...	2012-10-16 13:20:16 -07:00
Chris Dodge	ed2febe44e	fix 403 error when editors visit page (make read only). Don't allow user to remove him/herself. Rewire up the remove user callback.	2012-10-16 13:17:41 -04:00
chrisndodge	0b83366041	Merge pull request #896 from MITx/feature/ichuang/cms-input-filter-latex2edx ... Add "high level source" editing capability for problems & html; provides latex2edx I/F	2012-10-16 06:44:55 -07:00
chrisndodge	5b179ccf83	Merge pull request #908 from MITx/feature/tomg/cas-new-course-style ... polished new course form	2012-10-15 08:07:43 -07:00
chrisndodge	08f59d62d6	Merge pull request #909 from MITx/fix/cdodge/signup-tweeks ... don't show courses/create new course if account has not been activated. ...	2012-10-15 07:50:35 -07:00
Chris Dodge	2aee549a76	don't show courses/create new course if account has not been activated. Also better error messaging on failed logins. Also redirect to index after signup.	2012-10-15 10:48:01 -04:00
Tom Giannattasio	168fccf7ae	polished new course form	2012-10-15 10:21:39 -04:00
Chris Dodge	eab5bd4c3e	fix preview draft link. We need to generate the link target url directly rather than using jump_to. I think jump_to is not properly finding the draft objects and needs more investigation	2012-10-14 23:38:43 -04:00
ichuang	09d7d6d688	add AUTH_USE_MIT_CERTIFICATES feature flag to CMS, and @ssl_login_shortcut	2012-10-14 16:40:04 -04:00
Chris Dodge	13e23cbbab	Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/cas-bugs ... Conflicts: cms/templates/widgets/header.html	2012-10-13 21:49:05 -04:00
Chris Dodge	ebf6d74776	Merge branch 'feature/cale/cms-master' into fix/cale/edge-bugs ... Conflicts: cms/static/js/base.js	2012-10-13 21:44:15 -04:00
Chris Dodge	258a467fa6	make delete unit delete both the draft and non-draft versions	2012-10-13 20:55:49 -04:00
Chris Dodge	271fa6956a	save_item should also do proper 'is this element draft aware' logic so that incorrect versioning occurs on elements which do not support versioning at this point in time (aka courses, sections, and subsections).	2012-10-13 18:53:32 -04:00
Chris Dodge	cbc619f8af	hack patch to at least keep the unit.html page from blowing up	2012-10-13 16:09:33 -04:00
Chris Dodge	2e43d2ebcc	don't display a broken thumbnail image if a thumbnail is not available	2012-10-13 15:43:50 -04:00
Chris Dodge	a58e6ce9e4	create course. Quick review on import. Add progress bar stuff to import as well as redirect	2012-10-12 20:54:27 -04:00
Chris Dodge	26e735b178	Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cas-new-course	2012-10-12 16:11:59 -04:00
Chris Dodge	4e4b6accda	wip: create new course	2012-10-12 16:11:55 -04:00
Calen Pennington	a160f6144f	Fix date display in unit page	2012-10-12 15:16:44 -04:00
Calen Pennington	607b99dece	Make separate links for lms_preview and lms as needed	2012-10-12 15:03:06 -04:00
Calen Pennington	d10f56dd08	Only try to remove a directory if it exists during import	2012-10-12 14:10:32 -04:00
Calen Pennington	ab913cb5ac	Fix edit_unit header to point to the correct course module	2012-10-12 13:22:53 -04:00
Calen Pennington	90a847cb26	Fix context course on edit subsection	2012-10-12 13:19:25 -04:00
Calen Pennington	c70f29e83a	Wire up import to the frontend, and make sure that it puts it into the already extant course	2012-10-12 12:40:03 -04:00
Calen Pennington	02a325b018	First stab at an import page. Needs styling	2012-10-12 11:58:43 -04:00
Calen Pennington	ac71da1535	Make header tabs work	2012-10-12 11:18:40 -04:00
Calen Pennington	3c8de11f09	Standardize on how we bypass the draft-aware modulestore	2012-10-12 11:10:12 -04: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	14a1a7da31	allow importing of .tar.gz packages of courseware	2012-10-12 10:33:31 -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	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
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
Tom Giannattasio	19f8266b6a	removed dup edge def and changed to university_profile/edge template	2012-10-11 12:30:03 -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	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