Commit Graph

9424 Commits

Author SHA1 Message Date
Chris Dodge
a7b7fd52d9 Support editing of metadata on Sequences 2012-09-21 13:56:53 -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
d7dffb034b Merge pull request #721 from MITx/feature/cale/cms-remove-wips
Feature/cale/cms remove wips
2012-09-18 12:44:08 -07:00
Calen Pennington
da4206f170 Remove scratch pad ui WIPs, until we decide we actually want it 2012-09-18 15:31:32 -04:00
Calen Pennington
1e54023d36 Don't make bottom save & update button as wip 2012-09-18 15:28:43 -04:00
Calen Pennington
07d4f43f80 Use display names for module edit links in the cms 2012-09-18 15:26:37 -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
c1ce5a87ac Move sequence nav into xmodule 2012-09-18 13:19:01 -04:00
Calen Pennington
0492c8e3bd Enable wip flag 2012-09-18 13:17:52 -04:00
Calen Pennington
0758d21d6a Re-enable wip markers in cms css 2012-09-18 10:44:12 -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
Victor Shnayder
6017aa698b add ENABLE_DISCUSSION_SERVICE: "False" to cms config 2012-09-06 17:28:12 -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
Kyle Fiedler
8a112b0cca Added fix for cms sass 2012-08-21 16:01:48 -04:00
Kyle Fiedler
20d9e6e86d Made save buttons blue, finished remaining askbot bugs, and removed all instances of -red 2012-08-20 15:45:05 -04:00
Calen Pennington
3b36fbf914 Move mitxmako out of common lib, and pass template rendering function into MongoModuleStore 2012-08-16 12:49:42 -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
Calen Pennington
c4bed2c128 Add basic authentication support for requests made to the xqueue server 2012-08-14 11:59:47 -04:00
Calen Pennington
91b6bb649c Move queue interface url and auth into configuration, rather than hardcoding it 2012-08-14 11:59:46 -04:00
Calen Pennington
bd95c03d9b Merge pull request #396 from MITx/feature/ichuang/xqa-and-patches
Provide content QA (quality assessment) interface
2012-08-13 06:55:05 -07:00
David Ormsbee
510435ada5 Sketchy adding of test dbs to the cms test.py config file -- these are required for the Student (shared django app) tests to run 2012-08-13 00:35:51 -04:00
ichuang
4240830e68 cms also needs replace_static_urls call fixed 2012-08-10 15:25:41 -04:00
Calen Pennington
42fe35aa63 Merge pull request #368 from MITx/feature/victor/cms-drag-and-drop
Feature/victor/cms drag and drop
2012-08-09 07:15:18 -07:00
Calen Pennington
6abc2d733f Merge pull request #370 from MITx/feature/bridger/django1.4
Feature/bridger/django1.4
2012-08-08 12:52:33 -07:00
Bridger Maxwell
7ae0005afd Fixed CMS setting for 1.4 transition. 2012-08-08 13:30:43 -04:00
Victor Shnayder
523cb334a0 Hook up reordering children in the browser.
* NOTE: the new order is NOT saved to the server!
2012-08-08 13:15:05 -04:00
Victor Shnayder
77175872cc Fix some of the CMS jasmine tests.
* still a few that I haven't tracked down...
2012-08-08 13:14:54 -04:00
Bridger Maxwell
14a35b9605 Upgrading to django 1.4. 2012-08-08 11:57:15 -04:00
Calen Pennington
80b8529f2f Merge branch 'hotfix/1.0.4'
Conflicts:
	common/djangoapps/util/middleware.py
2012-08-08 11:05:26 -04:00
Calen Pennington
8059008bde Switch from exception logging middleware to a django signal handler, so that we no longer swallow Http404 exceptions and turn them into 500 errors 2012-08-06 10:13:12 -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
Kyle Fiedler
6c3ec99f9e Start to change to ems and remove all of cream 2012-08-01 17:36:10 -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
46775386d3 make CACHE_TIMEOUT messages go away 2012-08-01 11:40:12 -04:00
Victor Shnayder
10054e95ce add message to import command 2012-08-01 11:40:11 -04:00
ichuang
381d247589 djangoapps/student/views.py now uses soup.getText, which needs beautifulsoup4 2012-07-31 21:43:29 -04:00
Victor Shnayder
f3567ddd66 Change absolute paths to relative in scss
* makes collectstatic happy
2012-07-31 16:15:49 -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
1fce1dbe34 Make sure that django-pipelined css and js don't collide between the cms and lms 2012-07-30 14:04:39 -04:00
Calen Pennington
7ae0836f77 Add some more tests of github_sync 2012-07-30 13:50:50 -04:00