Commit Graph

7928 Commits

Author SHA1 Message Date
kimth
7c5879a1a5 Use os.path.join 2012-08-27 19:50:47 -04:00
kimth
3051c6aca7 Access system.xqueue properly as dict 2012-08-27 19:41:35 -04:00
kimth
26051f9939 Waittime passed through ModuleSystem.xqueue 2012-08-27 19:39:33 -04:00
kimth
572e88d5b2 Adjust wait message 2012-08-27 19:20:50 -04:00
David Ormsbee
57c6bfc3a6 commenting out the pre-loading of modules until we get a better way in place (that doesn't hang on deploy) 2012-08-27 18:46:13 -04:00
David Ormsbee
d524062652 Put quick check so we don't load course modules on init unless we're actually running in Django 2012-08-27 17:47:37 -04:00
David Ormsbee
d2e64d1354 Merge pull request #551 from MITx/feature/victor/slash-in-url_names
Allow location url_names to contain ':', mapping to / on file load
2012-08-27 13:34:52 -07:00
Calen Pennington
01d0697165 Eagerly load modulestores on server startup 2012-08-27 16:26:35 -04:00
kimth
ff38f5b390 Debugging correctmap state 2012-08-27 14:50:03 -04:00
kimth
b50f9759e1 Catch queuekey --> queuestate KeyError in conversion 2012-08-27 14:08:57 -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
7e2e90cfa5 move comment into function re: #549 2012-08-27 11:29:13 -04:00
Calen Pennington
5bd919b5dc Merge pull request #549 from MITx/feature/victor/unique-names
Feature/victor/unique names
2012-08-27 08:25:31 -07:00
Matthew Mongeau
8d747e4423 Conditionally show calculator 2012-08-27 10:15:30 -04:00
kimth
f7c87aa7a1 Anonymous student id is a property of ModuleSystem 2012-08-25 09:03:47 -04:00
kimth
27459efcf7 Update CodeResponse test 2012-08-25 08:06:17 -04:00
Victor Shnayder
7a67fdc4ed Fix url_name loading
- cleaned up name loading
- clear fallbacks, including hashing content if no name specified
- log errors in error tracker for content devs to see
2012-08-24 13:58:14 -04:00
kimth
088d204d9c Added CodeResponse tests 2012-08-24 11:09:27 -04:00
kimth
97ab53e786 Queuekey --> Queuestate in tests 2012-08-24 08:28:47 -04:00
kimth
fdecaef7ef Fix datetime name conflict 2012-08-24 08:23:46 -04:00
kimth
95a7a5b08b Student must wait XQUEUE_WAITTIME_BETWEEN_REQUESTS between queueing submissions 2012-08-23 18:39:57 -04:00
kimth
77f928d118 Queuestate records both secret key and time of queue request 2012-08-23 17:24:59 -04:00
Tom Giannattasio
5950520e71 tweaked sequence nav and discussion profile sidebar 2012-08-23 11:11:22 -04:00
Tom Giannattasio
a2372e659c Merge branch 'master' into feature/tomg/fall-design 2012-08-23 10:04:17 -04:00
Carlos Andrés Rocha
ad2fff2900 Retrieving video information from YouTube using https instead of http. 2012-08-23 09:24:51 -04:00
Tom Giannattasio
163eb9d49f fixed bottom sequence nav buttons and firefox outling bug 2012-08-23 08:24:54 -04:00
Arjun Singh
cd1bc95efe adding the ability to override the sidebar name 2012-08-22 20:40:59 -07:00
Tom Giannattasio
c1befd5fd4 Merge branch 'master' into feature/tomg/fall-design 2012-08-22 17:06:03 -04:00
Tom Giannattasio
1a7b5b8564 fixed tutorial sequence nav bug 2012-08-22 17:05:42 -04:00
Calen Pennington
e206bf2ffc Merge pull request #505 from MITx/feature/tomg/fall-design
Feature/tomg/fall design
2012-08-22 13:34:39 -07:00
Tom Giannattasio
a05cf05462 Merge branch 'master' into feature/tomg/fall-design 2012-08-22 16:09:30 -04:00
Tom Giannattasio
2c827c46f9 fixed firefox outline bugs 2012-08-22 16:09:09 -04:00
kimth
f46607710f Merge master 2012-08-22 15:25:07 -04:00
kimth
960cf5792b Dynamically disable syllabus per-course 2012-08-22 15:12:49 -04:00
Calen Pennington
2eb0de99eb Merge pull request #494 from MITx/feature/arjun/course_specific_css
Feature/arjun/course specific css
2012-08-22 11:55:20 -07:00
Calen Pennington
d735190570 Merge pull request #499 from MITx/feature/bridger/new_wiki
Added optional <wiki> tag to course to specify an alternative wiki page.
2012-08-22 11:54:39 -07:00
Arjun Singh
23e3d371ef adding more details about the state of course.css_class 2012-08-22 11:49:26 -07:00
Bridger Maxwell
788c74e07a Added optional <wiki> tag to course to specify an alternative wiki page. 2012-08-22 14:25:05 -04:00
Calen Pennington
f580bafdfe Merge pull request #496 from MITx/kimth/fix-choiceresponse
Fix for 500 on showanswer for choiceresponse
2012-08-22 10:07:42 -07:00
Calen Pennington
aa933cb38f Merge pull request #497 from MITx/feature/victor/catch-module-errors
Catch errors in module load
2012-08-22 10:05:08 -07:00
Victor Shnayder
365495521e Catch errors in module load
* if error is in xmodule_constructor(), catch and return an ErrorModule
* if error is somewhere else in get_module(), return None
2012-08-22 12:58:46 -04:00
kimth
edefa04de1 Workaround for 500 on showanswer for choiceresponse 2012-08-22 12:41:30 -04:00
Arjun Singh
9a21c5d4a8 Adding reasoning for adding a new metadata field 2012-08-22 05:00:39 -07:00
Arjun Singh
0b6bf77373 Adding a course-specific css class to body so that we can have course-targeted styles as a last resort 2012-08-22 05:00:39 -07:00
Tom Giannattasio
bbc95cb589 fixed accordion nav glitch 2012-08-21 19:25:32 -04:00
Tom Giannattasio
bd536f8aec Merge branch 'master' into feature/tomg/fall-design 2012-08-21 18:13:40 -04:00
Tom Giannattasio
e762844c35 new sequence nav functionality - accommodates an infinite number of items 2012-08-21 18:12:59 -04:00
Victor Shnayder
d3f1f0f8b6 comment out debug messages 2012-08-21 16:09:48 -04:00
Calen Pennington
dca434ad34 Merge pull request #448 from MITx/feature/ichuang/add-gitreload-to-migrate
add gitreload to lms-migration code
2012-08-21 12:52:52 -07:00
Victor Shnayder
b97a2af2a2 Show policy, grading policy, and top-level errors
* Save errors for courses that failed to load in modulestore
* global staff can see course errors on their dashboard
* put policy loading errors into the error trackers
* add has_access(user, 'global', 'staff'), which is equiv to user.is_staff for now
2012-08-21 15:00:21 -04:00