Commit Graph

19464 Commits

Author SHA1 Message Date
Diana Huang
fc46efb6c7 Fix bug in grabbing course enrollments.
LMS-1475
2013-11-19 14:03:05 -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
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
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
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
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
Calen Pennington
061a46beef Formalize various access roles as objects
This centralizes the logic for group membership, and means that we
don't need to make queries to find out whether the legacy groups names exist.
2013-11-13 13:42:37 -05:00
David Baumgold
6bdff09a5c Removed old release script 2013-11-13 13:23:17 -05:00
Giulio Gratta
943dd9704e Three more A11Y fixes (medium priority ones).
- Make email field in forgot password modal aria-required = true
- Added Transcript skip links to both before and after the transcript
- Add language code to main.html so that screenreaders know what language/region to speak for
2013-11-13 10:22:12 -08:00
Don Mitchell
99e7daf796 RESTful refactoring for course_info updates and handouts.
html page and update access use 2 different urls
GET update can get an individual update
STUD-944
2013-11-13 13:16:41 -05:00
Adam Palay
19dd49f355 more granular transactions in grading [LMS-1480]
remove field_data_cache from grades.grade and grades.progress_summary

cleans grading code by adding wrappers
2013-11-13 13:04:47 -05:00
Will Daly
ce6ac6538c Merge pull request #1657 from edx/will/devstack-logger-silence
Silence noisy loggers in the devstack
2013-11-13 08:44:54 -08:00
Will Daly
e6f0203aab Silence noisy loggers in the devstack 2013-11-13 10:52:03 -05:00
Diana Huang
32bc26c678 Merge pull request #1618 from edx/diana/certs-dashboard-update
Certificates Dashboard Updates
2013-11-13 07:16:15 -08:00
Will Daly
01b07abdfc Merge pull request #1650 from edx/will/wait-for-settings-menu
Added wait for JS before clicking nav menus
2013-11-13 07:06:23 -08:00
Will Daly
b84a3fdf28 Merge pull request #1654 from edx/will/disable-latex-test
Disabled LaTeX acceptance test
2013-11-13 06:30:10 -08:00
Calen Pennington
68c182c055 Optimize and cache the query to find the list of groups a user is in 2013-11-13 09:03:02 -05:00
Will Daly
2a6754b8a6 Disabled LaTeX acceptance test 2013-11-13 08:05:21 -05:00
Usman Khalid
e370fb9585 Merge pull request #1502 from edx/usman/lms1355-wiki-permissions
Stricter permissions for the wiki
2013-11-13 02:44:14 -08:00