JonahStanley
214ccaab5f
Fixed notification and code mirror for firefox
2013-08-08 13:24:25 -04:00
JonahStanley
7056c80319
Fixed most of the lms tests to work on firefox
2013-08-08 13:24:25 -04:00
Miles Steele
fab16f37da
fix display name for profile distributions
2013-08-08 13:16:49 -04:00
Miles Steele
7fe9f70ab3
fix test mocking
2013-08-08 13:16:49 -04:00
Miles Steele
a15c2d7381
change to .text() extraction of template, fix SafeWaiter error handling
2013-08-08 13:16:48 -04:00
Miles Steele
e0760d95ab
add onExit handler, fix task polling, cleanup
2013-08-08 13:16:48 -04:00
Miles Steele
4afde4dd79
add proxied analytics graphs, refactor analytics
2013-08-08 13:16:48 -04:00
Miles Steele
fb8c84a516
add analytics proxy endpoint
2013-08-08 13:16:47 -04:00
Miles Steele
35ffb1b347
add spacing to student admin section
2013-08-08 13:16:47 -04:00
Vik Paruchuri
bd9097596c
Remove annoying rubric parsing error, redo how notifications work
2013-08-08 13:16:32 -04:00
Vik Paruchuri
45d94c17f7
Add in next button, get rid of error with deleted peer grading module
2013-08-08 12:46:43 -04:00
Jonah Stanley
a867676ebb
Merge pull request #612 from edx/jonahstanley/fix-upload-test
...
Fixed upload test. Also added information to testing.md
2013-08-08 09:40:52 -07:00
Vik Paruchuri
203b1176cd
Don't check for ETA, or check peer grading data in self assessment
2013-08-08 12:14:57 -04:00
Jay Zoldak
cd9d2085b6
Merge pull request #608 from edx/zoldak/auto-auth-acceptance
...
Auto auth can now accept parameters for user attributes.
2013-08-08 09:09:34 -07:00
Jay Zoldak
006b90af9f
Modify cms acceptance tests to use auto_auth workflow.
2013-08-08 12:08:25 -04:00
Jay Zoldak
8414ef022f
Modify lms acceptance test to use auto_auth.
2013-08-08 12:08:25 -04:00
Jay Zoldak
e78edf8ef9
Rename MITX_SETTING AUTOMATIC_AUTH_FOR_LOAD_TESTING -> AUTOMATIC_AUTH_FOR_TESTING because it will be used for acceptance testing also.
2013-08-08 12:08:25 -04:00
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
JonahStanley
e8b2789409
Fixed upload test. Also added information to testing.md
2013-08-08 11:32:30 -04: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
Miles Steele
090f8d812f
add migration to remove index
2013-08-08 10:39:51 -04:00
Miles Steele
aaceb288a7
fix mysql indexing validity in migrations
2013-08-08 10:39:51 -04: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
David Baumgold
32f76988c6
Update docstring
2013-08-08 09:53:19 -04:00
David Baumgold
7aec95c310
Removed get_module_previews function
...
According to @cpennington, no modules return anything for `get_sample_state`,
so this function is extraneous.
2013-08-08 09:52:41 -04:00
Vik Paruchuri
4b5aba29ca
Fix defaults
2013-08-08 09:52:13 -04:00
cahrens
1bb29e5414
Workaround for popup CSS path being wrong (tinymce).
...
STUD-178
2013-08-08 09:50:54 -04:00
David Baumgold
a87a1bfcda
Docstrings
2013-08-08 09:46:15 -04:00
David Baumgold
baa9bd5bdc
Make sure to return the content, not the fragment
2013-08-08 09:46:15 -04:00
David Baumgold
3fa990ea60
Made some tests more general, less fragile
2013-08-08 09:46:15 -04:00
David Baumgold
8a95d7e6f0
XBlock integration: replaced get_html with runtime.render()
...
Currently calls the same machinery, but re-routes the logic in preparation of
deeper integration with XBlock
2013-08-08 09:46:15 -04:00
David Baumgold
9634e222be
Refactored get_module_previews function
2013-08-08 09:46:15 -04:00
David Baumgold
be103dfa0d
improving code style
2013-08-08 09:46:15 -04:00
David Baumgold
4896444d10
Clean up item views, use JsonResponse class
2013-08-08 09:46:15 -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
Vik Paruchuri
1be6ce3ee3
Add in and route control options
2013-08-08 08:34:08 -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
marco
3667fe8bd0
Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui
2013-08-07 16:35:32 -04:00
marco
56dee21142
partial cleanup for submitted rubric state, along with sass format cleanup for rubric.scss
2013-08-07 16:35:14 -04:00
Feanil Patel
e942e93f9d
Merge branch 'release' into master
...
Conflicts:
common/lib/xmodule/xmodule/videoalpha_module.py
2013-08-07 16:14:21 -04:00
