Commit Graph

6759 Commits

Author SHA1 Message Date
Chris Dodge
60cf22e4b2 work in progress: set start date 2012-10-17 13:46:40 -04:00
chrisndodge
b76556b932 Merge pull request #926 from MITx/fix/cdodge/asset-upload-tweeks
fix/cdodge/asset-upload-tweeks
2012-10-17 07:35:23 -07: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
chrisndodge
908a25d243 Merge pull request #925 from MITx/feature/cdodge/forgot-password
tie in 'forgot password' workflow in CAS LMS
2012-10-16 13:19:47 -07:00
Chris Dodge
554f179957 tie in 'forgot password' workflow in CAS LMS 2012-10-16 16:18:21 -04: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
146ad77cc1 Merge pull request #919 from MITx/feature/tomg/cas-import-text
tweaked import text; added check for .tar.gz
2012-10-15 11:46:03 -07:00
Tom Giannattasio
f10d1773c7 added open sans pull 2012-10-15 14:44:53 -04:00
Tom Giannattasio
c9abddc9a8 removed css comment 2012-10-15 14:37:05 -04:00
Tom Giannattasio
c542ac5bd6 added link to documentation 2012-10-15 14:35:44 -04:00
Tom Giannattasio
daee441153 client-side check for a .tar.gz extension 2012-10-15 14:34:30 -04:00
chrisndodge
158c000af1 Merge pull request #918 from MITx/feature/tomg/cas-tree-tweaks
Tweaks to the unit location pane
2012-10-15 10:54:02 -07:00
Chris Dodge
3d67c9606e fix bug where activation page was blank 2012-10-15 13:52:41 -04:00
Tom Giannattasio
83b32987e6 removed extra ol element from unit location pane 2012-10-15 13:07:53 -04:00
Tom Giannattasio
c3bffe3e21 update name in unit location pane whenever display name is changed 2012-10-15 13:04:06 -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
ichuang
557b79129b added image, solution, showhide examples to latex_problem template;
fixed x_module.py to only load *.yaml files as templates
TODO: Note that bad templates cause the CMS not to load; it should throw
exceptions instead of dying.
2012-10-14 23:26:46 -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
ichuang
a8cbcca9ab fix HTML display of math (it wasn't queueing mathjax) 2012-10-14 22:14:51 -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
ichuang
50f665311e update latex template problem; add template adaptive hint problem 2012-10-14 21:28:25 -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