Commit Graph

24688 Commits

Author SHA1 Message Date
polesye
4b87237825 BLD-193: Add template for checkboxes to studio. 2013-11-18 09:50:53 +02:00
Calen Pennington
9168798ff3 Merge pull request #1686 from cpennington/hotfix-max-empty-sequence
Assign a score of 0 to tasks with no attempts
2013-11-16 09:14:39 -08:00
Calen Pennington
43c0210889 Use correct set of OpenEndedChild states 2013-11-16 11:04:00 -05:00
Calen Pennington
e47e60f68b Assign a score of 0 to tasks with no attempts 2013-11-16 10:30:05 -05:00
dcadams
ddd9e0e451 Merge pull request #1643 from edx/dcadams/fix_invitation_emails
Email port to beta dash and new option for shibboleth courses
2013-11-15 13:49:36 -08:00
Julia Hansbrough
7fbd47ce2f Merge pull request #1662 from edx/flowerhack/fix/flash-camera-authorization
Fixed bug where Flash photo taker would fail
2013-11-15 13:00:26 -08:00
Julia Hansbrough
b075143d62 Small fix 2013-11-15 20:44:29 +00:00
Calen Pennington
347f0c7508 Centralize to a single GradingServiceError, so that it's caught when expected 2013-11-15 15:42:22 -05:00
Calen Pennington
4c21cb200f Teach OEE to consider old task_states when trying to recover from an xml mismatch 2013-11-15 14:13:19 -05:00
John Jarvis
2fed61814a fixing some typos 2013-11-15 13:35:55 -05:00
John Jarvis
2a31e3567e sending template pdf with certificate request 2013-11-15 13:35:54 -05:00
David Adams
ed980f2189 Port of invitation/enroll/unenroll email functionality
into beta dashboard.

Also includes new functionality, in both legacy and beta
dashboard, to include appropriate email text for a
Shibboleth course.
2013-11-15 10:10:04 -08:00
polesye
64c0a8c9d8 Merge pull request #1642 from edx/anton/video-player-improvements
Video player: improvements.
2013-11-15 08:38:43 -08:00
polesye
153bc25d8c BLD-502: Add improvements to Video player. 2013-11-15 18:12:51 +02:00
Julia Hansbrough
f950ea106d response to CR 2013-11-15 15:38:21 +00:00
polesye
50250d82d0 Merge pull request #1653 from edx/anton/video-add-test
Video: tests to check speed change
2013-11-15 07:12:49 -08:00
Christina Roberts
e2926a94e0 Merge pull request #1621 from edx/christina/item-create
Change save_item and create_item to be RESTful.
2013-11-15 06:16:54 -08:00
polesye
526f791800 BLD-424: Add test to check speed change. 2013-11-15 13:39:49 +02:00
Julia Hansbrough
e73489ec31 Response to CR 2013-11-14 22:34:18 +00:00
cahrens
569c86de74 Code review feedback. 2013-11-14 17:09:24 -05:00
David Baumgold
81e1d18de3 Merge pull request #1670 from antoviaque/hidden-module-unicode
hidden-module-unicode: Return unicode string to pass assertion
2013-11-14 14:02:07 -08:00
Brian Talbot
cb92b75343 Merge pull request #1647 from edx/talbs/fix-studio-notificationsie
Studio: Resolves Notifications UI showing in IE9 + CSS Split
2013-11-14 13:05:47 -08:00
cahrens
53a4016619 Utility method for converting string to bool. 2013-11-14 13:47:46 -05:00
Sarina Canelake
b1d91fad49 Merge pull request #1663 from edx/sarina/persist-student-answers-on-error
Sarina/persist student answers on error
2013-11-14 08:15:08 -08:00
cahrens
a170c6f4e7 Change save_item and create_item to RESTful URL.
Part of STUD-847.
2013-11-14 11:03:31 -05:00
Will Daly
dffbb8a37d Merge pull request #1667 from edx/will/really-fix-nav-test-issues
Fix for advanced settings failure
2013-11-14 07:22:48 -08:00
jsa
070ed1984c Merge branch 'release'
Conflicts:
	cms/djangoapps/contentstore/views/item.py
2013-11-14 09:24:52 -05:00
Oleg Marshev
52b71de810 Merge pull request #1605 from edx/oleg/fix-rearrange-bug-in-problems
Oleg/fix rearrange bug in problems
2013-11-14 05:57:57 -08:00
Xavier Antoviaque
0293727220 hidden-module-unicode: Return unicode string to pass assertion
XBlock Fragments expect unicode strings, and fail on an assertion when
it isn't:

```
2013-11-14 07:55:50,774 ERROR 3788 [django.request] base.py:215 - Internal Server Error: /courses/TestU/TST101/now/courseware/41d55c576a574fde99319420228f7f88/5fef5794e34842f4a2d45ebcdeaa9a3a/
Traceback (most recent call last):
  File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/core/handlers/base.py", line 111, in get_response
    response = callback(request, *callback_args, **callback_kwargs)
  File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/contrib/auth/decorators.py", line 20, in _wrapped_view
    return view_func(request, *args, **kwargs)
  File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/utils/decorators.py", line 91, in _wrapped_view
    response = view_func(request, *args, **kwargs)
  File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/views/decorators/cache.py", line 75, in _cache_controlled
    response = viewfunc(request, *args, **kw)
  File "/edx/app/edxapp/edx-platform/lms/djangoapps/courseware/views.py", line 407, in index
    context['fragment'] = section_module.render('student_view')
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/core.py", line 156, in render
    return self.runtime.render(self, view, context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 903, in render
    return block.xmodule_runtime.render(to_render, view_name, context)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/runtime.py", line 356, in render
    frag = view_fn(context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/seq_module.py", line 77, in student_view
    rendered_child = child.render('student_view', context)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/core.py", line 156, in render
    return self.runtime.render(self, view, context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 903, in render
    return block.xmodule_runtime.render(to_render, view_name, context)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/runtime.py", line 356, in render
    frag = view_fn(context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/vertical_module.py", line 27, in student_view
    rendered_child = child.render('student_view', context)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/core.py", line 156, in render
    return self.runtime.render(self, view, context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 903, in render
    return block.xmodule_runtime.render(to_render, view_name, context)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/runtime.py", line 356, in render
    frag = view_fn(context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 464, in student_view
    return Fragment(self.get_html())
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/fragment.py", line 34, in __init__
    self.add_content(content)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/fragment.py", line 71, in add_content
    assert isinstance(content, unicode)
AssertionError
```
2013-11-14 13:57:08 +01:00
Oleg Marshev
128846f67d BLD-449: Fix rearrange bug in problems. 2013-11-14 13:44:58 +02:00
David Ormsbee
4815181a36 Merge pull request #1669 from edx/hotfix/revert_grading_manual_tx
Revert "more granular transactions in grading [LMS-1480]"
2013-11-13 22:23:35 -08:00
David Ormsbee
a1778a172f Revert "more granular transactions in grading [LMS-1480]"
This reverts commit 19dd49f355.
2013-11-13 22:22:58 -05:00
Will Daly
44dd3603eb Fix for advanced settings failure 2013-11-13 18:41:03 -05:00
Will Daly
3859baa726 Merge pull request #1665 from edx/will/disable-transcript-youtube-test
Disabled test making external calls to YouTube
2013-11-13 14:16:06 -08:00
Will Daly
a8f686ec6f Disabled test making external calls to YouTube 2013-11-13 16:30:05 -05:00
David Baumgold
a0355c8629 Merge pull request #1664 from edx/db/fix-test-spelling
Fix misspelled word in test name
2013-11-13 13:15:12 -08:00
David Baumgold
e80da13934 Fix misspelled word in test name 2013-11-13 16:13:26 -05:00
Sarina Canelake
9508b3f9b4 pep8/pylint fixes for capa 2013-11-13 16:12:25 -05:00
Julia Hansbrough
45e80f7eee Removed unused code 2013-11-13 20:57:19 +00:00
Julia Hansbrough
5a572bc0dd Fixed bug where Flash photo taker would fail
LMS-1487
2013-11-13 20:42:19 +00:00
David Baumgold
d404cbca78 Merge pull request #1658 from edx/db/remove-release-sh
Removed old release script
2013-11-13 12:29:49 -08:00
Will Daly
257021c63b Merge pull request #1661 from edx/will/certificate-test-fix
Added explicit wait for payment page to load
2013-11-13 12:10:44 -08:00
Calen Pennington
3d5aa2b5bc Merge pull request #1575 from cpennington/hotfix-memory-leaks
Improve memory profile during course grading runs
2013-11-13 12:07:36 -08:00
Jim Abramson
371f4c9d73 Merge pull request #1659 from edx/hotfix/revert-transcripts-protocol-validation
Revert "Don't allow users to enter video url's in http."
2013-11-13 12:02:36 -08:00
Will Daly
a758ec782a Added explicit wait for payment page to load 2013-11-13 14:48:10 -05:00
Giulio Gratta
6d6391db39 Merge pull request #1651 from edx/giulio/a11y-medium
Three more A11Y fixes (medium priority ones).
2013-11-13 11:29:04 -08:00
polesye
281d9c80cc Revert: Allow any part of protocol name to be lowercase or uppercase. 2013-11-13 21:19:29 +02:00
Sarina Canelake
862beafdd1 Persist student answers on input error
LMS-469
2013-11-13 14:15:52 -05:00
Jim Abramson
c8dc27820f Merge pull request #1655 from edx/adam/more-granular-grading-transactions
Adam/more granular grading transactions
2013-11-13 11:01:46 -08:00
Don Mitchell
c20f3dbc8c Merge pull request #1569 from edx/dhm/restful_course
restful course_info access
2013-11-13 10:46:16 -08:00