marco
ab81000665
visual styling changes to staff grading and peer grading, along with additional instances of the use of the baseline variable instead of pixel definitions for padding and margins.
2013-08-13 14:42:34 -04: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
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
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
Vik Paruchuri
bd9097596c
Remove annoying rubric parsing error, redo how notifications work
2013-08-08 13:16:32 -04: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
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
Vik Paruchuri
306649f6ad
Fix test
2013-08-08 08:34:39 -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
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
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
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
Peter Fogg
ae517fee01
Merge pull request #455 from edx/peter-fogg/remove-videoalpha-xml
...
Peter fogg/remove videoalpha xml
2013-08-06 11:06:46 -07:00
chrisndodge
c4d6102af6
Merge pull request #584 from edx/fix/cdodge/allow-courseware-links-in-capa-module
...
tie in the normal courseware link url rewriting in capa module since tha...
2013-08-06 10:55:46 -07:00
Peter Fogg
9c84440501
PR comment cleanup.
2013-08-06 13:23:33 -04:00
Peter Fogg
08c5f955aa
Unstyled prototype for new list editor design.
2013-08-06 13:23:33 -04:00
Peter Fogg
f317244ac4
Convert Video Alpha to metadata-only.
2013-08-06 13:23:33 -04:00
Adam Palay
d894600207
template fixes on instructor dash
2013-08-06 10:16:57 -04:00
Adam Palay
4a99b7bfd6
update edge.html
2013-08-05 18:45:54 -04:00
Adam Palay
5d0328aa3e
creates "edge" case
2013-08-05 18:08:32 -04:00
Adam Palay
cac6a3195d
add university_profile/edge.html for edge landing page
2013-08-05 17:26:47 -04:00
David Baumgold
ef4220ee43
Add unit tests to exercise common_exceptions_400 decorator
2013-08-05 16:54:56 -04:00
Adam Palay
f85cfc11fa
redirects lms landing page to student.views.index if there is no marketing site
...
resets the cms edge redirect to '/'
2013-08-05 16:05:12 -04:00
Chris Dodge
9e96b9525b
tie in the normal courseware link url rewriting in capa module since that presents HTML via an Ajax callbacks and not via module_render.py
2013-08-05 15:24:19 -04:00
David Baumgold
7b01147c1a
Translate messages early
2013-08-05 13:51:47 -04:00
