Commit Graph

19654 Commits

Author SHA1 Message Date
Sarina Canelake
878097d06e Provide language codes for i18n testing 2013-11-19 09:15:53 -05:00
Sarina Canelake
55590f321a Fix i18n:test rake task 2013-11-19 09:15:53 -05:00
polesye
fbf37c4c3d Merge pull request #1656 from edx/anton/fix-acceptance-test
Video player: fix acceptance test.
2013-11-19 05:16:05 -08:00
polesye
38163cf942 BLD-410: Add tests. 2013-11-19 14:37:14 +02:00
Manuel Freire
cdc3ad1cc4 298.15 K is 25 C, not 0 (0 is defined to be at 273.15)
Signed-off-by:  <manuel.freire@fdi.ucm.es>
2013-11-19 12:52:13 +01:00
Julia Hansbrough
41b73d8f48 Basic test fix 2013-11-18 23:03:18 +00:00
Giulio Gratta
f125a604a4 Adding a YAML file to demonstrate how to include anonymized user IDs in Studio elements. 2013-11-18 14:44:46 -08:00
David Baumgold
957f318485 Merge pull request #1594 from neurolit/csrf_accessibility
LMS: add CSRF token to register form
2013-11-18 12:41:02 -08:00
polesye
e9b1d2102d Merge pull request #1688 from edx/anton/add-template-checkboxes
Add template for checkboxes to studio.
2013-11-18 11:24:25 -08:00
Julia Hansbrough
1b7a871926 Fixed password reset message
LMS-1507
2013-11-18 18:34:50 +00:00
Giulio Gratta
c085b31e04 Merge pull request #1683 from edx/giulio/fix-video-links
Stop video skipping links from showing up when not needed and address the issue of skip links for multiple videos.
2013-11-18 09:44:20 -08:00
John Jarvis
07e1d3617f Merge pull request #1691 from edx/jarv/github-repo-root
adding override for GITHUB_REPO_ROOT
2013-11-18 08:52:39 -08:00
John Jarvis
399df1141e resolving merge conflicts 2013-11-18 11:52:26 -05:00
John Jarvis
7f0ba1b713 Merge pull request #1690 from edx/jarv/static-url
allow override for STATIC_URL
2013-11-18 08:50:13 -08:00
John Jarvis
f5a772135d adding override for GITHUB_REPO_ROOT
This is the base directory for course data
2013-11-18 11:24:45 -05:00
Giulio Gratta
122e0d4a7d Stop video skipping links from showing up when not needed and address the issue of skip links for multiple videos.
Fixes BLD-521
2013-11-18 08:12:06 -08:00
John Jarvis
5ec77010e3 allow override for STATIC_URL 2013-11-18 10:54:12 -05:00
Gabe Mulley
e1cc87c8d2 Merge pull request #1679 from mulby/gabe/fix-enrollment-events-from-cms
fix emission of enrollment events from the CMS
2013-11-18 06:44:41 -08:00
Gabe Mulley
fcd4ecfde0 Merge pull request #1678 from mulby/gabe/fix-cms-course-id-tracking
fix spammy log messages from course_id tracking in CMS
2013-11-18 06:44:16 -08:00
Gabe Mulley
9ad435a8b8 fix emission of enrollment events from the CMS
I suspect there are very few circumstances that an enrollment event is emitted from the CMS, but if it ever were to happen, it would bomb out because the "crum" middleware is not used in that app.  We are hoping to replace this request caching hack in the near future, but for now it is the best option we could come up with.

I noticed the stack appear when I created a new course in my dev environment.  Presumably the course author is automatically enrolled in the course, which, causes the tracking code to bomb out.  Luckily we catch the error and just log it, but we really should be capturing this type of enrollment event.
2013-11-18 08:48:46 -05:00
Gabe Mulley
4b1974cdbc fix spammy log messages from course_id tracking in CMS 2013-11-18 08:47:54 -05:00
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