Commit Graph

2460 Commits

Author SHA1 Message Date
chrisndodge
5013ee3441 Merge pull request #931 from MITx/feature/cas/tomg/embed-links
Feature/cas/tomg/embed links
2012-10-17 12:34:03 -07:00
chrisndodge
24faac4f9d Merge pull request #929 from MITx/feature/cas/tomg/bigger-sign-up
Polished sign up
2012-10-17 12:33:17 -07:00
Chris Dodge
6047aae9fb get basics of set section date time. Need to pass to Tom for some styling considerations 2012-10-17 15:28:34 -04:00
Tom Giannattasio
a91a19e7a8 adjustments for newly inserted assets 2012-10-17 15:12:50 -04:00
Tom Giannattasio
e9b42d7a15 added embeddable xml input text to modal 2012-10-17 15:10:06 -04:00
Tom Giannattasio
edacd22c16 added xml embed text field to table 2012-10-17 15:07:44 -04:00
Chris Dodge
2fd86bd783 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/edit-section-info 2012-10-17 13:49:16 -04:00
chrisndodge
6011d6d333 Merge pull request #928 from MITx/fix/cdodge/asset-upload-tweeks
improvements on asset upload refresh. Now we don't need to refresh the w...
2012-10-17 10:47:47 -07:00
Chris Dodge
60cf22e4b2 work in progress: set start date 2012-10-17 13:46:40 -04:00
Tom Giannattasio
a961ac9331 more prominent log in link on sign up form 2012-10-17 12:51:48 -04:00
Tom Giannattasio
fed5a12b92 reworked log in page to emphasize sign up 2012-10-17 12:45:45 -04:00
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
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
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
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
Tom Giannattasio
500738d189 polished import progress bar 2012-10-15 11:19:34 -04: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
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
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
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
fb48a4fb8f Remove scheme on jquery.form.js load so that it works over https 2012-10-12 14:02:51 -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
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