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

4229 Commits

Author SHA1 Message Date
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
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
55d6aff4c1 Wire up the unit location display 2012-10-03 14:54:17 -04: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
Calen Pennington
79a7cc9f03 Don't send back a preview when saving an item 2012-10-03 14:24:11 -04:00
Chris Dodge
711dc55c73 add subsection edit page to the project with a shared 'unit' widget that will render out unit lists. Both edit_subsection and overview.html will share this widget 2012-10-03 14:16:23 -04:00
Chris Dodge
a0b3fb0ec5 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page 2012-10-03 12:40:55 -04:00
Chris Dodge
e24dcaead6 initial subsection page converted from static HTML mockup 2012-10-03 10:44:20 -04:00
Chris Dodge
fb204084a2 for get_all_content_info_for_course(), return a list of the MongoDB query rather than a cursor object. Also add some documentation (in a comment) as to what a caller should expect 2012-10-03 09:24:48 -04:00
Chris Dodge
eb7d6c656c use better encapsulation for the naming convention behind thumbnails. Put it all in content.py rather than view.py. 2012-10-03 09:17:18 -04:00
Chris Dodge
84bc81f7eb refactor StaticContent id scheme to be the same as moduledata. Also expose a new 'get all content for course' which will be needed to support a asset management page. 2012-10-03 09:07:09 -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
Chris Dodge
e3d065a66a allow 'is_staff' flagged user accounts to run as super-admin, which means belonging to all groups 2012-10-02 12:33:05 -04:00
Calen Pennington
91eb2cf983 Merge pull request #804 from MITx/fix/cdodge/cms-multiple-edit-save-bug 
fix bug with editing HTML. The save() method should now return a diction...
 2012-10-02 09:14:41 -07: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