Commit Graph

4005 Commits

Author SHA1 Message Date
Tom Giannattasio
c885fce798 removed expand/collapse from new section form 2012-10-15 11:50:35 -04:00
Chris Dodge
aa4361b3f0 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/signup-tweeks 2012-10-15 11:26:53 -04:00
Chris Dodge
4d439bbe03 add a confirmation when deleting components 2012-10-15 11:24:34 -04:00
Tom Giannattasio
500738d189 polished import progress bar 2012-10-15 11:19:34 -04:00
Chris Dodge
57df208930 return after warning user that not all create new course fields have been filled out 2012-10-15 11:09:16 -04:00
chrisndodge
60d431aa69 Merge pull request #910 from MITx/feature/tomg/cas-toast-alerts
changed save unit alerts to toast
2012-10-15 08:08:10 -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
Tom Giannattasio
1cfde391ff changed save unit alerts to toast 2012-10-15 10:54:58 -04: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
44283497a8 removed log 2012-10-15 10:30:00 -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
Chris Dodge
6fc07ab45e always hide the pages button. We don't want it appearing in case someone types a 'w' 2012-10-14 22:42:36 -04:00
ichuang
8742ba76a3 improved latex problem template; hls codemirror box autosizes height;
capa responsetypes can now include "inline='1'" for their span to be inline
2012-10-14 20:19:14 -04:00
ichuang
12869ecedd fix hls modal window style (it now autosizes properly) 2012-10-14 17:48:45 -04:00
ichuang
69bfdac49f minor change in dev_ike for cms-master 2012-10-14 16:58:11 -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
ichuang
bf959d8fc3 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/ichuang/cms-input-filter-latex2edx 2012-10-13 22:54:14 -04:00
ichuang
f846f4c2ad add import filter capability to html & problem editing; provides latex2edx interface 2012-10-13 22:33:41 -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
f1517fefa6 hide search button on asset index page 2012-10-13 10:45:52 -04:00
Chris Dodge
8151b1030f remove wip on Import header button 2012-10-13 10:42:49 -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
64240c441f Add date display when subsection date is set and section date isn't 2012-10-12 16:00:03 -04:00
Calen Pennington
623c756b9f Enable section and subsection reordering (with no drag between them) 2012-10-12 15:59:46 -04:00
Calen Pennington
a160f6144f Fix date display in unit page 2012-10-12 15:16:44 -04:00
Calen Pennington
4005cbf455 Hide/show wips w/ press of 'w' key 2012-10-12 15:11:02 -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
fb48a4fb8f Remove scheme on jquery.form.js load so that it works over https 2012-10-12 14:02:51 -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
Tom Giannattasio
3d2a1c2493 removed red import button – drawing too much attention; this will be reworked onto a different page at some point anyways 2012-10-12 11:58:43 -04:00
Tom Giannattasio
c7cdaf8080 styled import page 2012-10-12 11:58:43 -04:00
Calen Pennington
c2abd4b537 Add import page template 2012-10-12 11:58:43 -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
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
Calen Pennington
3c8de11f09 Standardize on how we bypass the draft-aware modulestore 2012-10-12 11:10:12 -04: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