Jay Zoldak
385e9de1fd
Modify auto_auth to accept parameters for overriding created user attributes.
2013-08-08 12:08:24 -04:00
Peter Fogg
92f5246c41
Merge pull request #543 from edx/peter-fogg/test-video-content
...
Add acceptance test for XML-only video content.
2013-08-08 09:07:06 -07:00
Peter Fogg
587d86bfb2
Add acceptance test for XML-only video content.
...
Since we've had issues with the default video being incorrectly shown,
this creates an XML-only video and ensures that the correct
(non-default) Youtube ID is sent to the client.
2013-08-08 10:48:07 -04:00
Christina Roberts
36b889349d
Merge pull request #610 from edx/christina/popup-css
...
Workaround for popup CSS path being wrong (tinymce).
2013-08-08 07:40:16 -07:00
Vik Paruchuri
17c77dd157
Merge pull request #392 from edx/fix/vik/answer-unknown
...
Simplify save_grade and pass through answer_unknown
2013-08-08 07:28:03 -07:00
cahrens
1bb29e5414
Workaround for popup CSS path being wrong (tinymce).
...
STUD-178
2013-08-08 09:50:54 -04:00
chrisndodge
ece4ec3f57
Merge pull request #533 from edx/fix/cdodge/use-static-shorthand-for-asset-urls
...
To increase portability of courses, have the Asset Index page display the classic /static/... URL shorthand.
2013-08-08 06:32:35 -07:00
Vik Paruchuri
c9ddcd7868
Fix some pep8 violations
2013-08-08 08:34:40 -04:00
Vik Paruchuri
62c7255ac4
Use getlist
2013-08-08 08:34:40 -04:00
Vik Paruchuri
8b228dd64b
Fix bad key naming
2013-08-08 08:34:39 -04:00
Vik Paruchuri
306649f6ad
Fix test
2013-08-08 08:34:39 -04:00
Vik Paruchuri
018601777b
Simplify peer grading service calibration
2013-08-08 08:34:39 -04:00
Vik Paruchuri
dadb128bf8
Simplify save_grade and pass through answer_unknown
2013-08-08 08:34:39 -04:00
Sef Kloninger
fcb215a6df
Merge pull request #547 from edx/sef/peer-eval-xmodule-date-error-master
...
fix crash in peer eval xmodule
2013-08-07 20:51:37 -07:00
Chris Dodge
c1e037918c
add docstring on StaticContent utility method
2013-08-07 21:07:51 -04:00
Chris Dodge
bffec584f7
add docstring
2013-08-07 21:01:14 -04:00
Peter Fogg
8ae3341667
Merge pull request #605 from edx/peter-fogg/fix-videoalpha-acceptance
...
Fix VideoAlpha acceptance test.
2013-08-07 12:07:15 -07:00
Sarina Canelake
d11d761704
Merge pull request #585 from edx/sarina/update-xblock-version
...
Update XBlock version
2013-08-07 11:45:36 -07:00
Peter Fogg
df024b0bb1
Fix VideoAlpha acceptance test.
2013-08-07 13:25:53 -04:00
Sarina Canelake
3a34529958
Need to call .save when modifying descriptor
2013-08-07 13:14:30 -04:00
Sarina Canelake
b6bab0a121
Update XBlock version
2013-08-07 13:14:30 -04:00
Jonah Stanley
ead87d1fde
Merge pull request #602 from edx/jonahstanley/fix-acceptance-template
...
Changed css_selector
2013-08-07 10:12:06 -07:00
JonahStanley
ed620e635b
Reset the file within the test itself
2013-08-07 13:07:38 -04:00
JonahStanley
a38f71cdbc
Fixed the upload test
2013-08-07 13:06:25 -04:00
Christina Roberts
2191a11151
Merge pull request #598 from edx/christina/email-studio-request
...
Send e-mail to STUDIO_REQUEST_EMAIL when user requests course creator privileges
2013-08-07 09:51:14 -07:00
David Baumgold
6e784d606f
Merge pull request #596 from edx/db/ff-subsection-datetime-bug
...
Fix Firefox subsection datetime bug
2013-08-07 09:25:17 -07:00
JonahStanley
5919456f24
Fixed some course-team bugs and other css stuff
2013-08-07 12:03:25 -04:00
Alexander Kryklia
2c78f0623c
Merge pull request #603 from edx/alex/fix-videoalpha-importing-from-xml
...
Fix videoalpha import from xml
2013-08-07 08:47:42 -07:00
cahrens
bbd8d84a28
Include the URL to the course creator admin table.
2013-08-07 11:34:51 -04:00
JonahStanley
5941f5b795
Fixed the other places that the css occurs
2013-08-07 11:30:50 -04:00
Vasyl Nakvasiuk
56244783fd
Merge pull request #591 from edx/vaxxxa/word_cloud_acceptance_tests
...
Add "Word Cloud" acceptance tests
2013-08-07 08:08:12 -07:00
David Baumgold
97aaab9cc6
Created a new lettuce test to catch bug, updated other lettuce tests
2013-08-07 11:03:19 -04:00
Alexander Kryklia
495b5a366f
Fix videoalpha import from xml
...
VideoAlphaDescriptor inherits from EmptyDataRawDescriptor.
EmptyDataRawDescriptor is used for modules which might not have any
XML data, but require XmlDescriptor's functionality for
export/import. Without it, VideoAlphaModule would cause a crash on
export if any modules had an empty `self.data` field.
Don't use default video if HTML5 sources are given.
2013-08-07 18:00:59 +03:00
JonahStanley
9e93d5588c
Changed css_selector
2013-08-07 10:14:50 -04:00
David Baumgold
18be93c3d9
Don't ignore null datetimes on subsection settings
...
Clicking "Sync to <course>" should send an AJAX request with the datetimes
set to null, so that the server resets them.
2013-08-07 09:45:48 -04:00
David Baumgold
57f8d21869
Merge pull request #599 from edx/db/fix-studio-login-next
...
Assign isExternal JS function to window object
2013-08-07 06:24:49 -07:00
Vasyl Nakvasiuk
ae8b2c883c
add Word Cloud acceptance tests
2013-08-07 15:46:27 +03:00
Kristin
16b5b95128
Merge pull request #506 from edx/ksteph/bugfix_offline_gradecalc
...
Fix offline_gradecalc
2013-08-06 14:53:30 -07:00
David Baumgold
10344905ba
Abstracted functionality to get datetime into separate JS function
2013-08-06 17:09:12 -04:00
David Baumgold
eefed18b7c
Scoped pad2 function to the one place that it's called
2013-08-06 16:48:09 -04:00
David Baumgold
2d534a35af
Removed unused JS functions
2013-08-06 16:47:23 -04:00
David Baumgold
82ac56068e
Assign isExternal JS function to window object
...
When JS functions are defined with names, they are local variables, and inaccessible
if defined inside a closure. Django-Pipeline concatenates all of our JS into one
big closure. This function explicitly assings the function to a property of the
`window` object, so that it is accessible to other JS functions.
2013-08-06 16:39:04 -04:00
cahrens
e6f15bf611
Send notification to admin when a user enters 'pending' state.
...
Also fixes a bug where message was not sent to user when entering 'denied'
state unless the user was previously in 'granted'.
Send notification to admin when a user enters 'pending' state.
Pylint cleanup.
2013-08-06 16:26:33 -04:00
cahrens
55f2cbc92f
Split up event notification, make sorting on username work.
2013-08-06 15:58:55 -04:00
Christina Roberts
4c95078eb0
Merge pull request #578 from edx/christina/autoenroll
...
Auto-enroll course staff to fix "View Live".
2013-08-06 12:33:56 -07:00
Adam
147f7ed959
Merge pull request #573 from edx/fix/adam/ORA-load-image
...
tz fix in openendedchild
2013-08-06 12:15:54 -07:00
David Baumgold
b69be70f65
Merge pull request #575 from edx/db/integrate-jsonresponse
...
Integrate JsonResponse into lms/djangoapps/instructor/views/api.py
2013-08-06 11:55:49 -07:00
David Baumgold
714d3b9662
pylint fixes
2013-08-06 14:36:13 -04:00
David Baumgold
a0123d3a27
Fixed Jasmine tests
2013-08-06 14:30:19 -04:00
Adam
08bb13edb4
Merge pull request #595 from edx/adam/i18n-bug-fixes
...
template fixes on instructor dash
2013-08-06 11:25:36 -07:00
