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

195 Commits

Author SHA1 Message Date
Chris Dodge
bb46c5f909 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-import 2012-10-11 12:51:37 -04:00
Chris Dodge
ab1decd97b import static assets. Also consolidate asset import/thumbnail generation into a single code base 2012-10-11 12:51:33 -04:00
Tom Giannattasio
19f8266b6a removed dup edge def and changed to university_profile/edge template 2012-10-11 12:30:03 -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
Chris Dodge
6b5b6342d2 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-import 
Conflicts:
	common/lib/xmodule/xmodule/contentstore/content.py
 2012-10-11 12:11:48 -04:00
Chris Dodge
a84ef1b243 wip: static asset import 2012-10-11 12:10:28 -04:00
Lyla Fischer
f06c67ef08 added embeddable links 2012-10-11 11:59:17 -04:00
Lyla Fischer
0bd5446f80 fixed date display 2012-10-11 11:58:49 -04:00
Chris Dodge
115d7358fa fix up commenting after refactoring. Also, don't reraise an exception during thumbnail generation - we just want to swallow the exception, log, and continue. 2012-10-11 11:57:56 -04:00
Chris Dodge
2153aae62c schema change to better normalize asset->thumbnail relationships 2012-10-11 11:57:56 -04:00
Lyla Fischer
6378682201 thumnail image is a thumnail image 2012-10-11 11:57:56 -04:00
Lyla Fischer
83eeb1961a fixed erroneous order 2012-10-11 11:57:30 -04:00
Lyla Fischer
f26a4af75c thinks work, they just don't display prettily, and it is hard to actually use the assets due to links 2012-10-11 11:57:14 -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
Chris Dodge
b77298b2ec a 'section' is actually a 'chapter' in previous nomenclature 2012-10-11 09:49:07 -04:00
Chris Dodge
7107e3ee66 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cas-crud-section-subsection 
Conflicts:
	cms/static/js/base.js
 2012-10-10 13:50:22 -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
Chris Dodge
de3037558a Add basic section/subsection CRUD on the overview page 2012-10-10 13:45:36 -04:00
Calen Pennington
bfb49133d1 Merge pull request #843 from MITx/feature/cdodge/subsection-edit-page 
Feature/cdodge/subsection edit page
 2012-10-10 10:26:27 -07:00
Calen Pennington
7c3d5d58b7 Fix up how parent locations interact w/ draft mode when creating new units 2012-10-10 12:49:53 -04:00
Calen Pennington
2f675be20d Coerce location to Location when generating LMS link 2012-10-10 12:49:53 -04:00
Calen Pennington
5f0e237ab0 Store the id of the publishing user on publish 2012-10-10 12:49:53 -04:00
Calen Pennington
208857ed4f Fix bug from rebase 2012-10-10 12:49:52 -04:00
Calen Pennington
ebf2f7de60 Make enum for unit states 2012-10-10 12:49:52 -04:00
Calen Pennington
9d6a7ffed1 Link release dates message to correct subsection edit page 2012-10-10 12:49:52 -04:00
Calen Pennington
e99aa117d7 Make publish and unpublish recursive operations 2012-10-10 12:49:51 -04:00
Calen Pennington
310f26a6de Basic implementation of draft, public and private modes 2012-10-10 12:49:51 -04:00
Calen Pennington
2b030f7aaf Clean up how tests use modulestores 2012-10-10 12:49:51 -04:00
Calen Pennington
05c02f0d5f Fixing tests from changes around draft mode 2012-10-10 12:49:51 -04:00
Calen Pennington
1328fc5ac0 Store published date in module metadata, and display it on draft pages 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
Calen Pennington
75f8b7c98d Add Draft module store that is used whenever any item is update in the CAS (but not during import, and not for templates) 2012-10-10 12:42:14 -04:00
Chris Dodge
a80e8ce3d5 respond to Cale pull request comments. Update access.py (LMS) to use the same 'check for legacy group name first' logic. Add SECRET_KEY setting to the CAS project so that auth tokens from CAS are accepted in the LMS 2012-10-09 15:11:07 -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
ef1fb321b8 allow for adding/deleting of new 'policy' metadata in the edit subsection page 2012-10-08 16:46:25 -04:00
Chris Dodge
0cf6a1179a wip - trigger display message when release data is different than parent release date 2012-10-08 10:43:46 -04:00
Chris Dodge
d55769861e check if 'delete metadata field' is not in the list of system metadata 2012-10-05 14:45:07 -04:00
Chris Dodge
95e15c4455 time/date setting on Release Date and Due date 2012-10-05 13:17:51 -04:00
Chris Dodge
758c446929 wip on setting date/times on subsection page 2012-10-05 09:56:07 -04:00
Chris Dodge
fe42f6fd22 address pull request feedback 2012-10-04 14:00:25 -04:00
Chris Dodge
29c142e3dc need to wire through the new unit template location to the edit unit page 2012-10-04 11:09:28 -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
chrisndodge
ab7377dc98 Merge pull request #819 from MITx/feature/cale/cas-unit-location-view 
Wire up the unit location display
 2012-10-04 07:57:11 -07: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