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
Will Daly
618de5df25
Fixed import error for histogram.coffee
2013-03-11 11:27:49 -04:00
Will Daly
20b04c9bf2
Fixed broken calculator test in lms coffee scripts
2013-03-11 11:27:49 -04:00
Diana Huang
f9667849b8
Fix some minor bugs in event handling and add enter key support
2013-02-22 09:47:50 -05:00
Diana Huang
3ecafa9b42
Add hot keys to rubrics
2013-02-22 09:47:50 -05:00
Diana Huang
3a8b7156a0
Merge branch 'master' into diana/click-tracking
2013-02-21 10:19:35 -05:00
Diana Huang
18a56005b0
Address code review feedback
...
- make category a data field of an input
- namespace event types
- don't try to use the track function when it doesn't exist
- generate event types if it doesn't match a pre-existing pattern
2013-02-21 10:17:08 -05:00
Diana Huang
13d4cfa4d4
Merge branch 'master' into diana/click-tracking
2013-02-20 11:40:14 -05:00
Vik Paruchuri
72d069825d
Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed
...
Conflicts:
lms/templates/instructor/staff_grading.html
2013-02-19 15:21:09 -05:00
Diana Huang
f4addddf42
Merge pull request #1484 from MITx/feature/vik/improve-oe-ui
...
Feature/vik/improve oe ui
2013-02-19 07:27:29 -08:00
Vik Paruchuri
00bc8deefa
Minor work on errors shown within the JS
2013-02-13 18:45:34 -05:00
Diana Huang
93f2bf194c
Log showing and hiding of questions.
2013-02-13 16:48:58 -05:00
Diana Huang
943a565717
Log rubric selection clicks
2013-02-13 16:48:58 -05:00
Vik Paruchuri
4e071d086f
Fix staff grading ML error info a bit
2013-02-11 11:31:26 -05:00
Diana Huang
d3d3a03c61
Add checkbox and make sure to uncheck it after submission
2013-02-11 09:23:55 -05:00
Diana Huang
f3bb429915
Get and pass the new submission flagged information through
...
the controller to the backend.
2013-02-11 09:23:55 -05:00
Vik Paruchuri
5ef4af5afd
Fix peer and staff grading interfaces
2013-02-07 12:54:36 -05:00
Vik Paruchuri
ade44c330d
Make staff grading interface much nicer
2013-02-07 12:45:08 -05:00
Vik Paruchuri
baba8d3a36
Add collapse action into staff grading view
2013-02-07 12:42:05 -05:00
Diana Huang
51db547a63
Merge branch 'master' into diana/rubric-ui-improvements
...
Conflicts:
common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
2013-02-05 16:18:56 -05:00
Diana Huang
f3be02d772
Merge branch 'master' into diana/rubric-ui-improvements
2013-02-05 09:13:14 -05:00
Vik Paruchuri
bf97a6a9a9
Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule
...
Conflicts:
lms/djangoapps/open_ended_grading/peer_grading_service.py
2013-02-04 17:55:55 -05:00
Vik Paruchuri
e8803985f2
Fix JS on after event handling
2013-02-04 17:41:44 -05:00
Vik Paruchuri
d89ab000d2
Fix a function call
2013-02-04 17:30:45 -05:00
Vik Paruchuri
7f96fbb3d1
Address review comments
2013-02-04 17:15:07 -05:00
Vik Paruchuri
6cf2742e32
Trim unneeded files
2013-02-04 14:22:57 -05:00
Vik Paruchuri
d9517877a4
Merge branch 'feature/vik/combined-xmodule-changes' into feature/vik/peer-grading-flagging
2013-02-01 18:32:48 -05:00
Diana Huang
71c233af15
Fix bug in the callback
2013-02-01 15:15:42 -05:00
Diana Huang
1c5c54c862
Make the rubric for self-assessment selectable and remove the
...
separate grade selection.
2013-02-01 15:15:42 -05:00
Diana Huang
745c052775
Remove duplicate Javascript and remove total grade selection.
2013-02-01 15:15:42 -05:00
Diana Huang
92b7dbdc69
Refactor rubric JS so that we don't have to keep duplicating this code.
2013-02-01 15:15:42 -05:00
Vik Paruchuri
f3f509da3b
Fix input area styling
2013-01-31 12:45:48 -05:00
Vik Paruchuri
63d4ac8c44
Working on some flagging coffeescript
2013-01-31 12:17:21 -05:00
Diana Huang
32524727ce
Create a test framework and make it so that we force a mock backend
...
when we don't have an ajax url
2013-01-31 09:00:06 -05:00
Vik Paruchuri
b0e4608558
Fix callback alert
2013-01-30 21:56:52 -05:00
Vik Paruchuri
2affd4760b
Add in wiring for unflag action
2013-01-30 21:53:33 -05:00
Vik Paruchuri
b4c80da224
Trim whitespace
2013-01-30 21:50:24 -05:00
Vik Paruchuri
8e9ec501a7
Implement flagging, fix urls
2013-01-30 21:44:21 -05:00
Vik Paruchuri
10c7155d4d
Add open ended to JS pipeline
2013-01-30 21:28:42 -05:00
