Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

348 Commits

Author SHA1 Message Date
Lyla Fischer
6378682201 thumnail image is a thumnail image 2012-10-11 11:57:56 -04:00
Lyla Fischer
65e3982fd2 things now upload 2012-10-11 11:56:53 -04:00
Tom Giannattasio
782e5f51e9 template for 404 and 500 errors 2012-10-11 09:58:35 -04:00
Calen Pennington
6e4fe502c7 Merge pull request #845 from MITx/feature/tomg/cas-static-tabs 
added static tab templates
 2012-10-10 10:48:51 -07:00
Calen Pennington
310f26a6de Basic implementation of draft, public and private modes 2012-10-10 12:49:51 -04:00
Calen Pennington
1a8532d8ad Make it possible to create, edit, and publish a draft 2012-10-10 12:49:51 -04:00
Tom Giannattasio
eb2fadb639 added static page templates; urls will probably need some reworking, but i wanted to get the templates in there 2012-10-09 14:45:56 -04:00
Chris Dodge
68945fdc77 adhere to the naming conventions of user groups (instructor_* and staff_* of the LMS AuthZ implementation). While we're keeping our authz.py implementation - which is duplicative of LMS's access.py - in order to minimize code churn/risk-of-regression, there is data compatibility so the two systems will interpret the data the same way 2012-10-09 13:14:31 -04:00
Chris Dodge
fe42f6fd22 address pull request feedback 2012-10-04 14:00:25 -04:00
Chris Dodge
322c4c0ba6 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/templates/widgets/units.html
 2012-10-04 11:03:37 -04:00
Chris Dodge
45b82f3a45 update creating a new unit to use an empty template. Also twiddle the units.html and base.js where we put the unit Location on the <li> element 2012-10-04 10:58:48 -04:00
Tom Giannattasio
92e830df24 more explicit temporary status on landing page 2012-10-04 10:37:46 -04:00
Tom Giannattasio
6b4d9ba0cd setup landing template 2012-10-03 17:26:14 -04:00
Chris Dodge
1240325c69 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page 
Conflicts:
	cms/static/js/base.js
 2012-10-03 16:24:38 -04:00
Chris Dodge
5390a19fc0 delete unit in overview and subsection_edit pages 2012-10-03 16:19:14 -04:00
Calen Pennington
a6cf7cb0c2 Merge pull request #817 from MITx/feature/tomg/cms-library 
Feature/tomg/cms library
 2012-10-03 12:21:55 -07:00
Calen Pennington
d80c931772 Hook up the component delete button to the backend. Don't break if the process of updating a parent unit after deleting is interrupted (leaving a pointer to a missing module) 2012-10-03 14:24:11 -04:00
Tom Giannattasio
44d4a4b0d9 started asset library template -wip 2012-10-02 17:02:47 -04:00
Chris Dodge
a570702ae3 add a new subsection edit url map and reference it in the course summary page 2012-10-02 16:22:26 -04:00
Calen Pennington
aff44b1f11 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	cms/djangoapps/contentstore/views.py
 2012-10-02 12:12:55 -04:00
Calen Pennington
8ca10a8356 Separate unit page from vertical implementation for editing 2012-10-01 15:19:35 -04:00
Chris Dodge
f17b48fff3 fix problem introduced when rebasing master and manually resolving conflicts 2012-10-01 15:19:05 -04:00
Calen Pennington
82a28f069d Make overview page conform to section/subsection/unit format. Breaks CMS editing of existing courses 2012-10-01 15:18:50 -04:00
Calen Pennington
8a131446fe First pass at integrating the new unit editing wireframes with the CMS 2012-10-01 15:17:40 -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