Commit Graph

6731 Commits

Author SHA1 Message Date
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
Chris Dodge
3d67c9606e fix bug where activation page was blank 2012-10-15 13:52:41 -04:00
chrisndodge
54176bfd19 Merge pull request #916 from MITx/feature/tomg/code-mirror-background
added white background to codemirror
2012-10-15 09:17:05 -07:00
Tom Giannattasio
4cae93a22e changed default form focus on new course 2012-10-15 12:10:47 -04:00
Tom Giannattasio
8b8d96123d added white background to codemirror 2012-10-15 12:01:39 -04:00
chrisndodge
979f8f873b Merge pull request #914 from MITx/feature/tomg/cas-cleanup-2
removed section dates; fixed fly in dragging
2012-10-15 08:55:10 -07:00
Tom Giannattasio
551b879207 fixed component drag fly in glitch 2012-10-15 11:50:35 -04:00
Tom Giannattasio
200792ebfb temporarily removed dates from sections 2012-10-15 11:50:35 -04:00
Tom Giannattasio
c885fce798 removed expand/collapse from new section form 2012-10-15 11:50:35 -04:00
chrisndodge
851616d25b Merge pull request #913 from MITx/fix/cdodge/signup-tweeks
Fix/cdodge/signup tweeks
2012-10-15 08:29:47 -07: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
chrisndodge
16720f517d Merge pull request #911 from MITx/feature/tomg/cas-import-progress
polished import progress bar
2012-10-15 08:25:38 -07: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
chrisndodge
d56fb287e1 Merge pull request #905 from MITx/fix/cdodge/cas-tab-fixes
fix preview draft link. We need to generate the link target url directly...
2012-10-14 20:40:19 -07: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
chrisndodge
a45861e290 Merge pull request #904 from MITx/fix/cdodge/cas-tab-fixes
always hide the pages button. We don't want it appearing in case someone...
2012-10-14 19:47:07 -07: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
chrisndodge
5931a8d9bc Merge pull request #903 from MITx/fix/cdodge/broken-path-to-view-subsection
when calling jump_to when location=<id-of-sequential> then Position is b...
2012-10-14 18:33:43 -07:00
Chris Dodge
a47b2be8df set position=0 when position=None. Discuss with Dave O. 2012-10-14 21:31:45 -04:00
Chris Dodge
4ac1a74117 when calling jump_to when location=<id-of-sequential> then Position is being computed as None. The redirect then yields a 404. Force Position to be 0 when Position=None 2012-10-14 21:29:00 -04:00
chrisndodge
f4b61e8f47 Merge pull request #901 from MITx/fix/cdodge/multiple-choice
remove the &mdash; from the HTML, this apparently is causing the CAS and...
2012-10-14 12:44:49 -07:00
Chris Dodge
d34075ff89 remove the &mdash; from the HTML, this apparently is causing the CAS and LMS to barf on staging, but strangly not on dev 2012-10-14 15:43:16 -04:00
chrisndodge
f845cc4e08 Merge pull request #898 from MITx/fix/cdodge/multiple-choice
remove HTML comment from schematiceditor template
2012-10-13 20:44:06 -07:00
Chris Dodge
8f1336d87a remove HTML comment from schematiceditor template 2012-10-13 23:27:37 -04:00
chrisndodge
bdbeec9ad5 Merge pull request #895 from MITx/fix/cdodge/multiple-choice
fix exception in LMS when rendering newly create multiple choice problem...
2012-10-13 19:21:21 -07:00
Chris Dodge
444d4b1054 fix exception in LMS when rendering newly create multiple choice problems. The capa module is barfing on the HTML comment which was in there and the XML parser couldn't handle it. 2012-10-13 22:19:48 -04:00
chrisndodge
1b4f569c08 Merge pull request #894 from MITx/fix/cdodge/cas-bugs
Fix/cdodge/cas bugs
2012-10-13 18:53:48 -07: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
chrisndodge
91fe7da44a Merge pull request #883 from MITx/fix/cale/edge-bugs
Fix/cale/edge bugs
2012-10-13 18:46:05 -07: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
chrisndodge
edb31c97b6 Merge pull request #890 from MITx/feature/cdodge/cas-new-course
Feature/cdodge/cas new course
2012-10-12 18:34:40 -07:00
Chris Dodge
a12baec599 add new files 2012-10-12 20:55:16 -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