Commit Graph

651 Commits

Author SHA1 Message Date
Vik Paruchuri
26a301f42e Merge pull request #504 from edx/feature/vik/oe-ui
Feature/vik/oe ui
2013-08-22 12:23:29 -07:00
Vik Paruchuri
a06801432e Fix staff grading test 2013-08-22 14:12:12 -04:00
Miles Steele
cb7a3ad8eb switch from log_event to Logger.log
keep log_event for compatibility
2013-08-20 16:52:18 -04:00
Vik Paruchuri
4f3ec68fb7 Scroll to top in peer and staff grading, preserve line breaks in submissions 2013-08-16 14:12:37 -04:00
Vik Paruchuri
be3291eeb0 Proper scoping, show status to staff, fix line break issues, multiple self assessments on one page work 2013-08-16 13:22:34 -04:00
Vik Paruchuri
9211a38374 Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
2013-08-15 11:36:11 -04:00
Miles Steele
f6fc1aeed9 hide empty management list selector, add explanation text 2013-08-09 14:22:56 -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
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
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
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
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
Vik Paruchuri
12a2c06fb1 Remove console.log statements 2013-07-25 15:57:21 -04:00
Vik Paruchuri
3509aea2b1 Redo js 2013-07-19 14:21:01 -04:00
Renzo Lucioni
42efd33cfa Refactor Segment.io integration with sequentials and instructor dashboard pages 2013-07-02 13:49:33 -04:00
Arthur Barrett
ade6d4085d turn off notes js debugging 2013-05-06 19:35:41 -04:00
Arthur Barrett
04e75485ba merged master branch into feature/abarrett/lms-notes-app. resolved conflicts in lms/envs/common.py and lms/templates/static_htmlbook.html. 2013-05-06 13:40:38 -04:00
Calen Pennington
771937b3da Remove duplicate libraries used while jasmine testing the LMS (as they are also defined in vendor) 2013-04-30 14:09:42 -04:00
Calen Pennington
8dc0df3e6b Don't ignore the old directories for xmodule sass and coffeescript 2013-04-29 07:32:16 -04:00
Vik Paruchuri
9acc592279 Comments for hotkeys 2013-04-16 10:23:08 -04:00
Vik Paruchuri
d0ecbbb4cf Fix hotkeys in peer and staff grading to use ctrl prefix 2013-04-10 15:10:48 -04:00
Arthur Barrett
63349dab9c fixed update/delete responses 2013-03-25 19:04:23 -04:00
Arthur Barrett
131c63b697 refactored model and api to search/filter by page uri 2013-03-25 18:47:28 -04:00
Arthur Barrett
0574eb49ad initialize annotator on any element by note:init event 2013-03-25 13:36:38 -04:00
Arthur Barrett
7120998938 refactoring notes js 2013-03-21 17:18:45 -04:00
Will Daly
9d8c023acb Removed calls to Navigation.bind() and Calculator.bind()
that were causing phantomjs interpreter to fail
with undefined method error.
2013-03-11 15:58:31 -04:00
Will Daly
a777a9e6e3 Updated broken tabs.js Jasmine tests. 2013-03-11 11:27:49 -04:00