1. 19 Nov, 2013 4 commits
  2. 18 Nov, 2013 14 commits
  3. 15 Nov, 2013 10 commits
  4. 14 Nov, 2013 12 commits
    • Response to CR · e73489ec
      Julia Hansbrough committed
    • Code review feedback. · 569c86de
      cahrens committed
    • Merge pull request #1670 from antoviaque/hidden-module-unicode · 81e1d18d
      hidden-module-unicode: Return unicode string to pass assertion
      David Baumgold committed
    • Merge pull request #1647 from edx/talbs/fix-studio-notificationsie · cb92b753
      Studio: Resolves Notifications UI showing in IE9 + CSS Split
      Brian Talbot committed
    • Merge pull request #1663 from edx/sarina/persist-student-answers-on-error · b1d91fad
      Sarina/persist student answers on error
      Sarina Canelake committed
    • Change save_item and create_item to RESTful URL. · a170c6f4
      Part of STUD-847.
      cahrens committed
    • Merge pull request #1667 from edx/will/really-fix-nav-test-issues · dffbb8a3
      Fix for advanced settings failure
      Will Daly committed
    • Merge branch 'release' · 070ed198
      Conflicts:
      	cms/djangoapps/contentstore/views/item.py
      jsa committed
    • Merge pull request #1605 from edx/oleg/fix-rearrange-bug-in-problems · 52b71de8
      Oleg/fix rearrange bug in problems
      Oleg Marshev committed
    • hidden-module-unicode: Return unicode string to pass assertion · 02937272
      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
      ```
      Xavier Antoviaque committed