Commit Graph

2064 Commits

Author SHA1 Message Date
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
e39abe11db Fix rubric with staff grading 2013-08-08 19:50:55 -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
Miles Steele
fab16f37da fix display name for profile distributions 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
35ffb1b347 add spacing to student admin section 2013-08-08 13:16:47 -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
marco
ec99e20a35 styled rubric, dividers between sections 2013-08-02 13:37:53 -04:00
Miles Steele
f88b266c2b add member list widget, add segment.io call for section view 2013-08-02 09:53:21 -04:00
Miles Steele
588a307de5 add dangerous button confirmation popup 2013-08-02 09:53:21 -04:00
Miles Steele
8e923deca0 fix unicode comparisons, fix 404 access exception, fix initial link handling, fix forum access modification permissions 2013-08-02 09:53:20 -04:00
Miles Steele
a9749f38df add reset attempts all button click handler, increase polling interval, add slick grid refresh 2013-08-02 09:53:20 -04:00
Miles Steele
7905e7d289 add csv & enrollment & access api tests, disallow instructors from un-instructoring themselves, rename mode to action for access 2013-08-02 09:53:20 -04:00
Miles Steele
fa0f56ec7d remove buggy styling 2013-08-02 09:53:20 -04:00
Miles Steele
7392a888ce cleanup, fix permissions, rename functions, add more api tests 2013-08-02 09:53:20 -04:00
Miles Steele
1e8cb7df25 clean & comment coffeescript, add util.coffee 2013-08-02 09:53:20 -04:00
Miles Steele
e05d0f97d8 fix permissions, fix ENABLE_INSTRUCTOR_BACKGROUND_TASKS usage, fix csv download 2013-08-02 09:53:19 -04:00
Miles Steele
94ac02e8b4 refactor enrollment action reporting 2013-08-02 09:52:17 -04:00
Miles Steele
b83e72c7a0 comb scss 2013-08-02 09:52:16 -04:00
Miles Steele
96fb19d28e add hover hint for auto-enroll 2013-08-02 09:52:16 -04:00
Miles Steele
7432b0e840 add visual indicator to revoke access 'buttons' 2013-08-02 09:52:16 -04:00
Miles Steele
5704b42407 add danger buttons 2013-08-02 09:52:16 -04:00
Miles Steele
fd1cfab020 add course info toggle arrow 2013-08-02 09:52:16 -04:00
Miles Steele
a4608df866 make year_of_birth graph bigger, add display names to analytics, remove extra context, fix typos & formatting 2013-08-02 09:52:15 -04:00
Miles Steele
23c961d9e4 visual cleanup, page error presentation cleanup, factor out common exceptions 2013-08-02 09:52:14 -04:00
Miles Steele
dd43d6635f add instructor tasks 2013-08-02 09:52:14 -04:00
Miles Steele
9bdff7485a cleanup
- rename list copy
- add beta list
- fix forum and admin API's to be more similar
- add auto-enroll checkbox
- fix list reload
- remove extra js logging
- add course errors visibility toggle
- add underscore.js check
2013-08-02 09:52:13 -04:00
Miles Steele
83ff497e42 add beta to endpoint, rename endpoint 2013-08-02 09:52:13 -04:00
Miles Steele
0a657befdb add forum list management 2013-08-02 09:52:13 -04:00
Miles Steele
bc9cce5733 add instructor dash version switch 2013-08-02 09:52:13 -04:00
Miles Steele
5cdf3fb86a add staff management subsection, add student_admin subsection, refactor sections 2013-08-02 09:52:12 -04:00
Miles Steele
cc737cb1b2 rename enrollment section to membership 2013-08-02 09:52:12 -04:00
Miles Steele
02432e05cc integrate slickgrid, add instructor.enrollment, add instructor.access, refactor & clean 2013-08-02 09:52:12 -04:00
Miles Steele
5d4a5fcdb0 add slickgrid assets 2013-08-02 09:52:12 -04:00
Miles Steele
daeabb06bf add instructor dashboard beta (partial) (view, template, coffeescript, api endpoints) 2013-08-02 09:52:12 -04:00
Anton Stupak
65aa7d4f2e Fixes bug with Fullscreen mode and more.
Fixes subtitles hiding on slidermove and their height.
2013-08-01 20:50:16 +03:00
marco
b7d6d77464 visual cleanup for email icon and discussion context label post branch merge 2013-07-29 17:49:34 -04:00
Your Name
4afa5481dd set and get settings and fix discussion.css post-variable-apocalypse 2013-07-29 16:11:59 -04:00
Your Name
7507921929 merge with Marcos new design 2013-07-29 13:58:08 -04:00
Your Name
13ca61ba7f fix merge conflict with _variables.scss 2013-07-29 13:32:54 -04:00
Brian Talbot
d61e4e50ec edx.org: abstracting new edx.org button extends and colors with other themes in mind 2013-07-29 10:21:54 -04:00
Brian Talbot
049794463a edx.org: revising base link color variable to use darker value for accessibility 2013-07-29 10:21:54 -04:00
Brian Talbot
76b0a03bc2 edx.org: revises iframe-based register/status buttons to match revised styles 2013-07-29 10:21:54 -04:00
Brian Talbot
10964eec88 edx.org: handles letter-spacing on buttons 2013-07-29 10:21:54 -04:00
Brian Talbot
69c792f5e9 edx.org: applies edx.org visual changes (with overrides/new mixins) 2013-07-29 10:21:53 -04:00
Brian Talbot
71c3f5e5a7 edx.org: adds in variables/mixins to support edx.org visual changes 2013-07-29 10:21:53 -04:00
Vik Paruchuri
12a2c06fb1 Remove console.log statements 2013-07-25 15:57:21 -04:00