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

262 Commits

Author SHA1 Message Date
Calen Pennington
57d0dd1b0b Pass location to get_containing_courses 2012-09-25 10:01:20 -04:00
Calen Pennington
335b4bb04b Add method to find courses that contain a particular module location 2012-09-25 09:23:07 -04:00
Calen Pennington
2223d2007b Only display the LMS link if it's set up, and don't error if it isn't 2012-09-25 09:18:54 -04:00
Calen Pennington
c7209a736e Add links from the editing page for the cms to the corresponding page in the lms 2012-09-25 09:18:54 -04:00
Chris Dodge
a85b255271 Define 'system metadata' which should not be editable by the end user. When posting back metadata edits, we need to fetch a copy of the existing metadata and apply the changes. 2012-09-24 16:54:46 -04:00
Chris Dodge
03fbacd4e1 Merge branch 'cdodge/meta-data-cms-editing' of github.com:MITx/mitx into cdodge/meta-data-cms-editing 
Conflicts:
	cms/static/coffee/src/models/module.coffee
 2012-09-21 15:24:09 -04:00
Chris Dodge
d51f127afa work-in-progress: As a problem author, I would like to be able to edit module metadata 2012-09-21 14:29:19 -04:00
Chris Dodge
1cd81a2a4f work-in-progress: As a problem author, I would like to be able to edit module metadata 2012-09-21 09:14:28 -04:00
Victor Shnayder
27cd9c9f82 Remove unused 'module' parameter from replace_{static,course}_urls 2012-09-20 01:12:33 -04:00
Calen Pennington
d7cbd1c814 Don't do extra json conversion/de-conversion for data/children going to the cms 2012-09-18 15:07:35 -04:00
Calen Pennington
bb06a926bb Make saving also save the children in the #sortable element (TODO: name the #sortable element better) 2012-09-18 13:19:30 -04:00
Calen Pennington
d17e2aada9 Remove trailing '/' from ajax_urls 2012-09-17 14:19:07 -04:00
Kyle Fiedler
7a248f0154 Added fixes to some style and one Cale fix to get things working properly 2012-09-11 14:05:07 -04:00
Calen Pennington
7702907662 Make module system handle not having a user, and pass a user in when previewing in the cms 2012-09-05 13:29:30 -04:00
Victor Shnayder
e4fb9ec63a Remove is_staff from ModuleSystem 
- now handling access control via get_module
 2012-08-14 23:30:37 -04:00
ichuang
4240830e68 cms also needs replace_static_urls call fixed 2012-08-10 15:25:41 -04:00
Victor Shnayder
b46172da9b Rename module.name and descriptor.name to url_name 
* update templates and code references
* also a display_name property that defaults to cleaned url_name
 2012-08-03 11:36:54 -04:00
Victor Shnayder
2f4bf5f606 Minor fixes to cms 
* make logging work properly in cms, dev
* fix a comment
 2012-08-01 19:25:47 -04:00
Victor Shnayder
119ab639d0 make cms users look like staff by default 
* so they get the staff view of problems
* does NOT actually set User.is_staff
 2012-08-01 11:48:18 -04:00
Victor Shnayder
c0cdff7071 Rename MalformedDescriptor to ErrorDescriptor 
* change references and tests
* add staff/non-staff display
* added is_staff to ModuleSystem
 2012-08-01 11:42:39 -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
408726e678 Standardize how JS XModules are instantiated 2012-07-24 16:14:04 -04:00
Calen Pennington
19a3c14ab9 Split out code to replace /static urls in get_html into a separate module so that it can be used in CMS previews 2012-07-24 16:14:01 -04:00
Calen Pennington
3cdceab16c Uniquify js fragments pulled from XModules, and load both XModuleDescriptor and XModule js into the cms 2012-07-24 16:13:59 -04:00
Calen Pennington
3fa636e060 Move module javascript into common/lib/xmodule. Still TODO: run jasmine tests in that directory 2012-07-24 16:13:59 -04:00
Calen Pennington
6bf0e093bc Add tests for the edit page for the toy course, and make sure that exporting to github sets up the git repo properly 2012-07-24 15:05:07 -04:00
Calen Pennington
39b59484a6 Re-add login requirement to save_item 2012-07-24 15:05:07 -04:00
Calen Pennington
6b28786784 Use the new name for item_id in contentstore.views.save_item 2012-07-24 15:05:07 -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
Calen Pennington
7a34a8c342 Fix failing tests 2012-07-23 13:49:11 -04:00
Victor Shnayder
f8ce11a6b5 Add fixes to notes in #182 
* use 'location' instead of 'id' in views.
* still need to change names in the coffeescript--quick fix didn't work
 2012-07-16 14:08:03 -04:00
Victor Shnayder
acd57fb7c5 Save author info in commit messages. 
* add optional author_str param to export_to_github
* pass the django user info to that param
 2012-07-16 13:34:04 -04:00
Victor Shnayder
3f356bfb1b Add basic framework for checking permissions 
* add dummy has_access(user, location) method
* re-organize views by type of access checking needed.
 2012-07-16 13:34:04 -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
ichuang
926fdd010e Merge pull request #173 from MITx/cpennington/pull-155-cleanup 
This cleans up remaining issues w/ https://github.com/MITx/mitx/pull/155
 2012-07-11 19:34:56 -07: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
f8e9313dad Minimize the number of roundtrips to mongo during cms save by prefetching children 2012-07-11 16:22:24 -04:00
Calen Pennington
6dd141247d Fixing github_sync to work with multiple course data directories 2012-07-10 14:58:27 -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
29e69db0dc Implement HTML module save 2012-07-05 09:38:51 -04:00
Calen Pennington
b0ff3053b9 Add development code for pushing CMS changes to github 2012-07-03 19:06:07 -04:00
Calen Pennington
5a2b2e0126 Add an index page that lists all courses 2012-07-03 14:44:41 -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
6612beab46 Acknowledge the fact that right now keystore is really just a module store. If we need a keystore that returns other objects, we can reexctract the base class into it's own module again 2012-07-02 11:15:37 -04:00
Calen Pennington
1e8acbefac Add a temporary url for testing xml export triggering 2012-07-02 10:49:05 -04:00
Calen Pennington
7ac8fecb38 Rename XModule[Descriptor].type to .category to be parallel to Location 2012-07-02 09:01:08 -04:00
Calen Pennington
5cd388d638 Have the CMS use the same XMLModuleStore for import that the LMS uses for reading content 2012-06-29 12:44:15 -04:00
Calen Pennington
e9a00ffc5a Parse XModuleDescriptors on import using from_xml 
Also:
Render all XModuleDescriptors in the cms the same way
Default them to editing raw xml, if there is no specific module for them
 2012-06-26 11:56:21 -04:00