kimth
86409a2a26
Adjust comments for Sequence js
2012-08-29 22:11:26 -04:00
kimth
bb55a76379
Allow courseware to navigate to specific tabs of a sequence
2012-08-29 22:01:16 -04:00
Arjun Singh
5d6bed863a
Fix discussions in xmodules
2012-08-29 16:41:01 -07:00
kimth
1fd2f0c601
Fix double show answer bug
2012-08-29 18:02:37 -04:00
Arjun Singh
5c5d11409a
Temporary fix to make uncaptioned videos display reasonably. Will replace with proper solution.
2012-08-29 13:58:22 -07:00
David Ormsbee
e55bbbc736
Remove __grading_policy related items, which got in here accidentally
2012-08-29 10:58:40 -04:00
David Ormsbee
50c682e459
Merge pull request #583 from MITx/rocha/master
...
[#35065403 ] Lets video player work if subtitles cannot be loaded
2012-08-29 07:01:58 -07:00
Arjun Singh
ac65e47e21
Getting rid of an alert. People don't like alerts.
2012-08-29 03:15:30 -07:00
Victor Shnayder
fe50f94437
Fix inline html bug.
...
* problem was in trying to remove the outer <html> + </html> tags.
* cleaned up the stringify function to be less magical, and more
obviously correct.
[Fix #35136297 ]
2012-08-28 19:54:57 -04:00
Carlos Andrés Rocha
aa063d5729
[ #35065403 ] Lets video player continue to work if subtitles cannot be loaded
2012-08-28 18:18:37 -04:00
Arjun Singh
6a6b24af79
Disable jsresponse file compilation; done manually for now.
2012-08-28 12:40:49 -07:00
David Ormsbee
88e485315d
Merge pull request #571 from MITx/feature/arjun/contextualize_js_params
...
Contextualizing javascript parameters
2012-08-28 11:07:49 -07:00
kimth
bad24df842
Adjust tests to reflect XML requirement for external grader messages
2012-08-28 13:31:06 -04:00
kimth
fb5501855c
Merge master
2012-08-28 12:37:24 -04:00
Victor Shnayder
9277f5df8e
Minor cleanups to url name checking
...
* better error messages
* better fallback names
* architectural TODO for later...
2012-08-28 11:27:47 -04:00
David Ormsbee
231b8c6aa4
Merge pull request #548 from MITx/kimth/limit-queue-dos
...
Kimth/limit queue dos
2012-08-28 08:03:02 -07:00
Arjun Singh
8ed9ab44e7
Contextualizing javascript parameters
2012-08-27 23:49:07 -07:00
kimth
377b09e170
Adjust comments
2012-08-27 20:07:54 -04:00
kimth
82a0d065a7
Use enumerate in loops
2012-08-27 20:04:48 -04:00
kimth
297df37fc0
Drop unnecessary iterator index
2012-08-27 19:59:22 -04:00
kimth
6302283183
Drop unnecessary .keys()
2012-08-27 19:57:46 -04:00
kimth
b4b8f6bc7d
Use with open(file) structure
2012-08-27 19:55:21 -04:00
kimth
2919389d8e
Use os.path.join -- all of them...
2012-08-27 19:53:10 -04:00
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
