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
Anton Stupak
dad9f26a99
Make VideoAlpha out of Alpha.
2013-08-12 14:31:48 +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
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
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
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
Miles Steele
4afde4dd79
add proxied analytics graphs, refactor analytics
2013-08-08 13:16:48 -04:00
Miles Steele
35ffb1b347
add spacing to student admin section
2013-08-08 13:16:47 -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
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
9c84440501
PR comment cleanup.
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
cac6a3195d
add university_profile/edge.html for edge landing page
2013-08-05 17:26:47 -04:00
Adam
ad73feb7e3
Merge pull request #565 from edx/adam/i18n-bug-fixes
...
more template fixes for faq, press, and help
2013-08-05 08:25:29 -07:00
Adam Palay
d0a36076c3
more template fixes for faq, press, and help
2013-08-05 11:24:25 -04:00
Vasyl Nakvasiuk
a52964a786
Hotfix world cloud functionality
2013-08-05 17:14:11 +03:00
chrisndodge
85267e6a73
Merge pull request #535 from edx/feature/cdodge/add-display-org-and-coursenum
...
add display_coursenumber and display_organization fields on the CourseModule
2013-08-04 18:00:29 -07:00
Chris Dodge
18458bd94b
wrong accessor
2013-08-02 21:45:51 -04:00
Chris Dodge
eaeaf3a520
fix formatting error
2013-08-02 21:44:48 -04:00
Chris Dodge
192d51bf7a
touch-ups per review feedback
2013-08-02 21:37:27 -04:00
Vik Paruchuri
ea2b9191c1
Allow student to switch between rubrics, tell user once peer grading required amount is done
2013-08-02 15:30:17 -04:00
marco
478fa18beb
merge edit cleanup, nothing new
2013-08-02 14:30:04 -04:00
Vik Paruchuri
aa09006247
Hide and show multiple rubrics
2013-08-02 13:53:07 -04:00
Adam
553512ba0a
Merge pull request #560 from edx/adam/i18n-bug-fixes
...
template errors
2013-08-02 10:45:58 -07:00
marco
ec99e20a35
styled rubric, dividers between sections
2013-08-02 13:37:53 -04:00
