Adam Palay
18a979bb4d
put wiki templates back into Django templating
2013-08-12 16:42:07 -04:00
ichuang
a5bb971c9b
add static_asset_path metadata to course, and honor its use in link rewriting
2013-08-12 20:26:20 +00:00
Adam Palay
13d54c0dd7
fix password reset templates
2013-08-12 15:57:27 -04:00
Adam Palay
431eb8f4e7
remove 'preview' from urls in enrollment emails sent while previewing a course
2013-08-12 14:28:15 -04:00
Adam
0db8ad28dc
Merge pull request #640 from edx/adam/i18n-bug-fixes
...
instructor dash fixes
2013-08-12 11:16:22 -07:00
Lyla Fischer
e817fb4ca1
Merge pull request #637 from edx/vaxxxa/videoalpha_to_video
...
Migration videoalpha module to one main video module
2013-08-12 10:56:12 -07:00
Miles Steele
e6d44f5ae7
Merge pull request #626 from edx/feature/msteele/instrdash
...
Enable beta dashboard, add copy, add i18n
2013-08-12 10:38:26 -07:00
Miles Steele
43afb9a940
fix i18n
2013-08-12 13:21:46 -04:00
Adam Palay
b2b574ffb6
instructor dash fixes
2013-08-12 11:36:26 -04:00
Miles Steele
b1074ff1ac
add i18n
2013-08-12 11:25:26 -04:00
Anton Stupak
74f3595d54
Add acceptance tests for checking rendering.
2013-08-12 14:32:15 +03:00
Peter Fogg
e20acee4c4
Working on Videoalpha test fix.
...
Fixed all common and LMS tests.
The tests were failing because XMLDescriptor adds in some attributes
to _model_data, such as `xml_attributes`, that aren't necessary. The
solution is to handle all XML parsing in VideoDescriptor. There's
still one test failing in CMS, which has to do with metadata being
saved. I'm still working out how to update it in such a way that it
doesn't fail, but still tests something meaningful.
2013-08-12 14:32:15 +03:00
Anton Stupak
d846462ce9
Migrate acceptance tests: old Video -> new Video.
2013-08-12 14:32:07 +03:00
Vasyl Nakvasiuk
b33b5c7bd4
Python: videoalpha -> video.
2013-08-12 14:31:48 +03:00
Anton Stupak
dad9f26a99
Make VideoAlpha out of Alpha.
2013-08-12 14:31:48 +03:00
Vasyl Nakvasiuk
28b0ba5e10
Migrate video tests to videoalpha tests, remove video tests.
2013-08-12 14:31:47 +03:00
marco
910523eee5
merge conflicts resolved
2013-08-09 18:45:54 -04:00
marco
68199da821
added oe-tools header areas to eventually consolitate all messaging
2013-08-09 18:44:15 -04:00
Giulio Gratta
464141c72a
changing http:// to // on intro video urls to prevent browsers from blocking video embeds
2013-08-09 14:13:41 -07:00
Vik Paruchuri
6543343388
Merge remote-tracking branch 'origin/feature/vik/oe-ui' into feature/vik/oe-ui
2013-08-09 14:51:13 -04:00
Vik Paruchuri
33da3ec1cf
Fix self assessment template
2013-08-09 14:50:57 -04:00
Miles Steele
e9aca13636
enable beta dashboard
2013-08-09 14:22:56 -04:00
Miles Steele
f6fc1aeed9
hide empty management list selector, add explanation text
2013-08-09 14:22:56 -04:00
Miles Steele
58c6b9bb61
add privilege copy
2013-08-09 14:22:55 -04:00
Miles Steele
8f8d70aeae
fix enroll multiple button, fix module_error report
2013-08-09 13:45:27 -04:00
Adam
abd17a2472
Merge pull request #623 from edx/adam/unicode-encode-error
...
make template string unicode
2013-08-09 10:35:32 -07:00
Miles Steele
25d45b8578
Merge pull request #574 from edx/feature/msteele/instrdash
...
Add cronjob analytics to instructor dashbaord
2013-08-09 10:26:50 -07:00
Adam Palay
893f05976d
make template string unicode
2013-08-09 12:25:14 -04:00
marco
166c4c6939
cleaned up merge issue in combined_open_ended.html
2013-08-09 11:31:33 -04:00
marco
e1cba4b0b4
cleaned up html structure for various pages, style fixed for show/hide prompt item
2013-08-09 11:26:59 -04:00
Vik Paruchuri
5d16bc9eb6
Remove ad-hoc patch for xblock issue
2013-08-09 11:24:07 -04:00
Vik Paruchuri
2612fc2bce
Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
2013-08-09 11:23:52 -04:00
Valera Rozuvan
1efea116f6
Removed unnecessary leading and trailing spaces from heading in template.
2013-08-09 10:26:18 +03:00
Valera Rozuvan
4c7250a000
Improved strings in template.
...
Only relevant part of string will go through the Python internationalization function.
2013-08-09 09:22:57 +03:00
Valera Rozuvan
f08394ac2c
Volume and speeds dialogs are fully extended.
...
When the controls receive focus not via mouse click or mouse hover, their appropriate
slider and selection menu are fully extended and shown to the user.
2013-08-09 09:22:57 +03:00
Valera Rozuvan
bc503c88c6
Making it possible to tab to captions.
...
When a VideoAlpha is present on the page, if the user tries to tab through out the entire page, eventually he will land on the VideoAlpha controls. The tab index order has been set up so that all control receive focus eventually in the order from left to right. When a control receives focus, it is hilighted. The last tab focuses the captions dialog. When the captions dialog has focus, the Up and Down arrows can scroll it up and down.
2013-08-09 09:22:56 +03:00
Vik Paruchuri
e39abe11db
Fix rubric with staff grading
2013-08-08 19:50:55 -04:00
Vik Paruchuri
e4bcfa5c21
Fix indents and copy behavior
2013-08-08 19:31:34 -04:00
Vik Paruchuri
687ab3ddae
Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
common/lib/xmodule/xmodule/peer_grading_module.py
lms/templates/combinedopenended/combined_open_ended.html
lms/templates/combinedopenended/combined_open_ended_status.html
lms/templates/combinedopenended/openended/open_ended.html
lms/templates/combinedopenended/openended/open_ended_rubric.html
lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html
2013-08-08 19:03:46 -04:00
Vik Paruchuri
a9926f0460
Display message to student when they cannot see their peer grading feedback yet.
2013-08-08 18:43:54 -04:00
Vik Paruchuri
900377e4ee
Return written feedback
2013-08-08 17:53:29 -04:00
Vik Paruchuri
d44b2e62a0
Proper partial credit checks
2013-08-08 17:19:06 -04:00
Vik Paruchuri
15b0e12068
Remove progress indicators, make rubric display properly
2013-08-08 14:02:33 -04:00
Vik Paruchuri
fd38223244
Fix grading submitted messages
2013-08-08 13:31:43 -04:00
JonahStanley
5a579921f2
Fixed stylistic things and no longer skipped tests in firefox
2013-08-08 13:24:28 -04:00
JonahStanley
38c2997fcf
Added a comment on the features that will not work on firefox
2013-08-08 13:24:27 -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
