Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

77 Commits

Author SHA1 Message Date
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Don Mitchell
85faab1dc6 Swallow event calls to squash 404 errors (and remove an unused var in 
another function)
 2013-01-30 15:18:51 -05:00
Chris Dodge
7f32aae47d rename method to something that actually better reflects what it is doing. Also rename a variable to help with readability 2013-01-30 11:50:11 -05:00
Chris Dodge
28a2dd9a18 support reordering of static tabs in studio 2013-01-28 16:33:28 -05:00
Chris Dodge
239b118abe add service entry point to generate tar.gz file and return to caller. Use of the NamedTemporaryFile will auto cleanup. 2012-12-27 15:31:12 -05:00
Brian Talbot
ed3f3b02d6 studio - course export UI alpha - roughing in states/views 2012-12-26 09:10:05 -05:00
Don Mitchell
e0849e8b5a Cache to debug other branch 2012-12-13 16:34:58 -05:00
Don Mitchell
0a91a98dd0 Merge remote-tracking branch 'origin/feature/cale/cms-master' into 
feature/dhm/cms-settings

Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/course_info.js
	cms/static/js/template_loader.js
	cms/static/js/views/course_info_edit.js
	cms/templates/base.html
	cms/templates/course_info.html
	cms/urls.py
 2012-12-11 10:55:10 -05:00
Don Mitchell
39024a7fee Grading mostly working 2012-12-10 16:32:33 -05:00
Chris Dodge
130de49b49 support the editing of course handouts via a generic editor until we have implemented the Rich HTML editor completed 2012-12-07 09:45:12 -05:00
Don Mitchell
111e8521db Hopefully the course-info changes I had made w/o link destruction 2012-11-30 10:40:19 -05:00
Don Mitchell
f0c94a2c7e Beginning test of details tab. 2012-11-21 15:17:18 -05:00
Don Mitchell
7fecf1f212 Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into 
feature/dhm/cms-settings

Conflicts:
	cms/static/sass/_settings.scss
	cms/templates/settings.html
 2012-11-19 16:20:12 -05:00
Don Mitchell
a9233dfd44 Merge branch 'course-info' into feature/dhm/cms-settings 
Conflicts:
	cms/djangoapps/contentstore/views.py
 2012-11-19 16:00:27 -05:00
Don Mitchell
91a91f4ddb Hopefully the course-info changes I had made w/o link destruction 2012-11-19 10:38:58 -05:00
Don Mitchell
fbc48026f2 Hopefully the course-info changes I had made w/o link destruction 2012-11-16 12:51:31 -05:00
Brian Talbot
6014a7a299 Merge remote-tracking branch 'origin/feature/cale/cms-master' into feature/btalbot/cms-settings 
Conflicts:
	cms/djangoapps/contentstore/views.py
 2012-11-15 16:51:53 -05:00
Chris Dodge
b432db1aba Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/static-tab-edit 2012-11-08 09:55:56 -05:00
Chris Dodge
9cc1af5052 first pass at static tab editing. Doesn't yet support drag/drop as well as new tab creation, which needs to modify the policy on the course 2012-11-07 15:27:44 -05:00
Tom Giannattasio
d68945de33 started adding settings page 2012-10-30 15:04:21 -04:00
Calen Pennington
6d5a1264b9 Move jasmine tests to their own environment 2012-10-30 10:58:38 -04:00
Calen Pennington
0f043f35d7 Remove unused github_sync app 2012-10-23 13:40:49 -04:00
Chris Dodge
4e4b6accda wip: create new course 2012-10-12 16:11:55 -04:00
Calen Pennington
02a325b018 First stab at an import page. Needs styling 2012-10-12 11:58:43 -04:00
Chris Dodge
14a1a7da31 allow importing of .tar.gz packages of courseware 2012-10-12 10:33:31 -04:00
Calen Pennington
5ae34aa4ed Add heartbeat to cms 2012-10-11 12:32:23 -04:00
Tom Giannattasio
5ae11b8e11 changed edge course url 2012-10-11 12:29:40 -04:00
Tom Giannattasio
f4bdb46493 changed edge url 2012-10-11 12:29:40 -04:00
Tom Giannattasio
fec710abde added edge logo; added edge temp landing page 2012-10-11 12:29:14 -04:00
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