Commit Graph

25 Commits

Author SHA1 Message Date
Chris Dodge
f17b48fff3 fix problem introduced when rebasing master and manually resolving conflicts 2012-10-01 15:19:05 -04:00
Chris Dodge
ea8e875d7d fix url mapping bug in url.py and include import reference to remove_user_from_course_group 2012-10-01 15:14:16 -04:00
Chris Dodge
27016465f4 support some simple authorization scheme to view/edit courses 2012-10-01 15:13:19 -04:00
Chris Dodge
85e6c23386 work-in-flight for uploading/serving of static content for courses 2012-09-27 10:24:53 -04:00
Calen Pennington
2554413291 Hook up link to create modules from templates 2012-09-25 10:10:44 -04:00
Bridger Maxwell
14a35b9605 Upgrading to django 1.4. 2012-08-08 11:57:15 -04:00
Calen Pennington
0a79130b11 Make problem previews work by saving problem state in the current request session 2012-07-24 16:14:04 -04:00
Calen Pennington
5f86fcfbff Standardize how Problem and Video modules are loaded in the LMS and CMS preview pane 2012-07-24 16:14:00 -04:00
Calen Pennington
15ac476781 Display preview html on the module edit page. Javascript for previews doesn't yet function 2012-07-24 15:05:07 -04:00
Victor Shnayder
c176a7fe92 Add account creation and login to CMS
* connect up views from student app
* Add initial @login_required decorators on the protected views
* Add tests for some of the basic functionality
2012-07-16 13:34:04 -04:00
Victor Shnayder
ff59c9bfa9 Initial connection of student module with cms.
* Enable account creation
* Some code cleanups
* Fix access to nonexistent fields in the account creation view
* Formatting fixes
2012-07-13 11:51:32 -04:00
Calen Pennington
0e05d092ca Remove temporary export url in favor of export round trip test 2012-07-11 22:18:40 -04:00
Calen Pennington
6d246f0685 Merge remote-tracking branch 'origin/master' into ps-cms-backbone
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/coffee/unit.coffee
	cms/templates/index.html
	cms/templates/widgets/sequence-edit.html
2012-07-10 08:55:45 -04:00
Prem Sichanugrist
f60af340ea Add Jasmine suite to CMS 2012-07-05 18:44:56 -04:00
Calen Pennington
d99d98670e Point at root url for save_item 2012-07-03 18:57:35 -04:00
Calen Pennington
a5d861d298 Make course index page read from url for org, course, name 2012-07-03 14:29:50 -04:00
Calen Pennington
10add56660 Add url to point git service hooks at in order to trigger an import from github 2012-07-03 13:43:56 -04:00
Calen Pennington
1e8acbefac Add a temporary url for testing xml export triggering 2012-07-02 10:49:05 -04:00
Calen Pennington
72eef72d8b Html Module can now be editing, saved, and re-opened 2012-06-22 10:58:18 -04:00
Calen Pennington
1853b99861 Work in progress editing. Committing to allow kfiedler to work in parallel 2012-06-20 11:14:25 -04:00
Calen Pennington
58085f8ed9 Remove unused urls 2012-06-19 11:29:14 -04:00
Calen Pennington
a333612cce Add templates directly from cms_proto/ui_prototype 2012-06-13 11:54:17 -04:00
Calen Pennington
b9befbafcd Add contentstore from cms proto as a baseline for importing and views for the cms 2012-06-13 11:42:50 -04:00
Calen Pennington
dc85e46315 Allow login in the cms, and read a particular course from mongo 2012-06-08 16:55:38 -04:00
Calen Pennington
8134bcbc3d Get the cms up to the point of rendering a template 2012-06-08 14:01:41 -04:00