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

1757 Commits

Author SHA1 Message Date
Calen Pennington
d4377d4ada Make imports into the CMS ignore broken modules, while still loading bad xml as error modules in the LMS 2012-09-25 10:10:44 -04:00
Calen Pennington
33f9eae3e8 Set data_dir based on parent data_dir when cloning new content in the CMS 2012-09-25 10:10:44 -04:00
Calen Pennington
d8736914d4 Display an error descriptor for a preview when a descriptor can be loaded but a module can't 2012-09-25 10:10:44 -04:00
Calen Pennington
7d8095cd97 Initial port of templates into filesystem based storage 2012-09-25 10:10:44 -04:00
Calen Pennington
2554413291 Hook up link to create modules from templates 2012-09-25 10:10:44 -04:00
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
f81f94ec67 Allow location url_names to contain ':', mapping to / on file load 
* New format: {tag}://{org}/{course}/{category}/{name}[@{revision}]
* Updated tests, code
* Added test chapter with : in url_name in toy course
* added test html page with : in url_name
* added a note to docs
 2012-08-27 11:37:22 -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
3b6f33f5a7 Fix github_sync tests 
* CMS no longer syncs, it just imports when it gets a commit note
  from github
 2012-08-02 14:26:24 -04:00
Calen Pennington
477b7062d4 Merge pull request #335 from MITx/feature/cale/cms-no-roundtrip 
Only import from github when changes are made, rather than exporting. Th...
 2012-08-02 10:39:01 -07:00
Calen Pennington
052ae88111 Only import from github when changes are made, rather than exporting. This prevents bugs in the cms from preventing changes via git 2012-08-02 09:19:25 -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
Victor Shnayder
10054e95ce add message to import command 2012-08-01 11:40:11 -04:00
Calen Pennington
2f95a8e1d0 Re-add __init__.py for contentstore that was accidentally deleted in 05add5818b 2012-07-31 09:29:14 -04:00
Calen Pennington
89b5f5b2be Minor review notes 2012-07-30 16:11:35 -04:00
Calen Pennington
7ae0836f77 Add some more tests of github_sync 2012-07-30 13:50:50 -04:00
Calen Pennington
05add5818b Return a custom error for duplicate elements, and ignore it when loading into mongo 2012-07-30 13:16:21 -04:00
Calen Pennington
6bd9cd6c28 Add management command for syncing with github 2012-07-30 12:59:28 -04:00
Calen Pennington
39e5a7762e Make github_sync use a namedtuple for repo settings 2012-07-30 12:59:28 -04:00
Victor Shnayder
3c3bbd114e minor formatting tweaks 2012-07-27 16:08:24 -04:00
Victor Shnayder
60cba3d95f Move import_from_xml to xmodule/modulestore 2012-07-27 16:08:23 -04:00
Victor Shnayder
e5117dba13 Mostly fix tests. 
* change custom tags in test/data/full to new single-tag format
* fix broken file references
* fix argument to import_from_xml
* error_handler fix in mongo.py in next commit
 2012-07-27 16:08:23 -04:00
Calen Pennington
29cf09763f Fixing up cms tests to only use data in common/test/data 2012-07-25 10:09:25 -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
9458e53988 Adding stripped down 6002x course for testing, along with CMS test for edit pages for same 2012-07-24 16:13:51 -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
1aba46de55 Be consistent with the metadata key name for the data directory 2012-07-24 15:05:07 -04:00