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
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
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
1d1a9173a4 Cleaning up pep8 violations 2012-07-23 14:44:40 -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
942ea2c7ba fix typo 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
339e9a68f4 Make end-to-end tests work again 
* NOTE: successfully running the tests depends on an updated version of
  django-pipeline, which fixes a unicode bug (efaba4ac63)

Config changes:
* Use separate db for the cms
* Run collectstatic before running tests--needed to get everything in the right place for loading pages
* fix some paths related to this
* Turn off JS compressor for CMS
* add empty test_root/uploads dir

Code changes:
* Add cms tests to check that home page and signup pages load
* Add cms account creation test
* Make github sync tests clean out repo dirs before running.
 2012-07-13 11:51:33 -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
Calen Pennington
386acbe1ff Add tests of the github_sync service hook view 2012-07-05 12:15:49 -04:00
Calen Pennington
ab851c0b1a Add tests for the core github_sync functionality 2012-07-05 11:54:43 -04:00
Calen Pennington
83da714a50 Add more docstring to import_from_github 2012-07-05 10:30:04 -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
9b134aadf4 Swallow attempts to create a new item where one already exists 2012-07-03 16:04:18 -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
4e599d4ab2 Extract import from xml into a separate function 2012-07-03 13:42:35 -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
79987666df Lazily load module definition and metadata as needed, rather than immediately 2012-07-02 10:50:27 -04:00
Calen Pennington
1e8acbefac Add a temporary url for testing xml export triggering 2012-07-02 10:49:05 -04:00