Skip to content
Snippets Groups Projects
  1. Nov 15, 2013
  2. Nov 14, 2013
    • cahrens's avatar
      Code review feedback. · 569c86de
      cahrens authored
      569c86de
    • David Baumgold's avatar
      Merge pull request #1670 from antoviaque/hidden-module-unicode · 81e1d18d
      David Baumgold authored
      hidden-module-unicode: Return unicode string to pass assertion
      81e1d18d
    • Brian Talbot's avatar
      Merge pull request #1647 from edx/talbs/fix-studio-notificationsie · cb92b753
      Brian Talbot authored
      Studio: Resolves Notifications UI showing in IE9 + CSS Split
      cb92b753
    • cahrens's avatar
      Utility method for converting string to bool. · 53a40166
      cahrens authored
      53a40166
    • Sarina Canelake's avatar
      Merge pull request #1663 from edx/sarina/persist-student-answers-on-error · b1d91fad
      Sarina Canelake authored
      Sarina/persist student answers on error
      b1d91fad
    • cahrens's avatar
      Change save_item and create_item to RESTful URL. · a170c6f4
      cahrens authored
      Part of STUD-847.
      a170c6f4
    • Will Daly's avatar
      Merge pull request #1667 from edx/will/really-fix-nav-test-issues · dffbb8a3
      Will Daly authored
      Fix for advanced settings failure
      dffbb8a3
    • jsa's avatar
      Merge branch 'release' · 070ed198
      jsa authored
      Conflicts:
      	cms/djangoapps/contentstore/views/item.py
      070ed198
    • Oleg Marshev's avatar
      Merge pull request #1605 from edx/oleg/fix-rearrange-bug-in-problems · 52b71de8
      Oleg Marshev authored
      Oleg/fix rearrange bug in problems
      52b71de8
    • Xavier Antoviaque's avatar
      hidden-module-unicode: Return unicode string to pass assertion · 02937272
      Xavier Antoviaque authored
      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
      ```
      02937272
    • Oleg Marshev's avatar
      BLD-449: Fix rearrange bug in problems. · 128846f6
      Oleg Marshev authored
      128846f6
    • David Ormsbee's avatar
      Merge pull request #1669 from edx/hotfix/revert_grading_manual_tx · 4815181a
      David Ormsbee authored
      Revert "more granular transactions in grading [LMS-1480]"
    • David Ormsbee's avatar
      Revert "more granular transactions in grading [LMS-1480]" · a1778a17
      David Ormsbee authored
      This reverts commit 19dd49f3.
      a1778a17
  3. Nov 13, 2013
Loading