Commit Graph

15584 Commits

Author SHA1 Message Date
Vik Paruchuri
61d62f274e Fix issue with parsing of open ended list 2013-01-29 19:30:03 -05:00
Vik Paruchuri
f4574c75db Proper config dictionary generation for controller query 2013-01-29 19:30:03 -05:00
Vik Paruchuri
693337593e Properly parse url for grading controller 2013-01-29 19:30:03 -05:00
Vik Paruchuri
e6dd07a41e Fix parameter passing 2013-01-29 19:30:03 -05:00
Vik Paruchuri
b0599ea133 Fix queries and some controller query stuff 2013-01-29 19:30:03 -05:00
Vik Paruchuri
2191f3e228 Add in open ended problems view 2013-01-29 19:30:03 -05:00
Vik Paruchuri
fe77bb00c4 Fix naming for overall need to check 2013-01-29 19:25:56 -05:00
Vik Paruchuri
5e63a4690b Work on getting combined notifications 2013-01-29 19:25:56 -05:00
Vik Paruchuri
d28228639e Add in controller query stuff 2013-01-29 19:25:56 -05:00
Vik Paruchuri
c62ce7822e Add in service support for getting the grading status list 2013-01-29 19:23:36 -05:00
Vik Paruchuri
43783e4ff0 Add in an item to check for combined notifications 2013-01-29 19:23:36 -05:00
Vik Paruchuri
7b65f56121 Add service to query controller for eta of submission and to check if name is unique 2013-01-29 19:23:36 -05:00
Diana Huang
b5508b0123 Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-29 17:36:54 -05:00
David Ormsbee
c487e026f3 Merge pull request #1380 from MITx/press/bostonX
BostonX press release
2013-01-29 14:35:17 -08:00
Diana Huang
f1973dc660 minor update to new jasmine test 2013-01-29 17:34:54 -05:00
Your Name
5bfd2c33b0 send cohort to post view context 2013-01-29 17:34:52 -05:00
Victor Shnayder
19c46d224f BostonX press release 2013-01-29 17:33:06 -05:00
Don Mitchell
b8c1dba1cb Catch save error and throw it in the user's face (bug 147). May need to
add catches in more places or put in $.ajaxSetup?
2013-01-29 17:31:12 -05:00
Your Name
43d4661c3f Merge branch 'master' into feature/kevin/groups_ui_changes 2013-01-29 17:23:29 -05:00
Your Name
3404011f16 update front end to support selection and display of cohort ids 2013-01-29 17:23:08 -05:00
David Ormsbee
40d59faa68 Merge pull request #1330 from MITx/diana/open-ended-ui-updates
Rubric Integration and other UI improvements
2013-01-29 14:10:18 -08:00
jarv
0b9262a478 Merge pull request #1378 from MITx/feature/jarv/certificate-restriction
Minor update to embargo text
2013-01-29 13:48:05 -08:00
John Jarvis
615e6da2f4 Minor update to embargo text 2013-01-29 16:47:09 -05:00
Diana Huang
f7424eb8d6 Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-29 16:44:15 -05:00
cahrens
26cb1c5a25 Fixes for https://edx.lighthouseapp.com/projects/102637/tickets/144 (progress tab not updating). 2013-01-29 16:30:41 -05:00
Jay Zoldak
3669ea5c97 Merge pull request #1375 from MITx/diana/fix-requirejs-jasmine-xmodule
Add missing requirejs for xmodule jasmine tests
2013-01-29 13:26:36 -08:00
Calen Pennington
cb66ac7192 Merge pull request #1376 from MITx/fix/zoldak/cms-requirejs
Add RequireJS.js to files.json so that the cms jasmine tests will run
2013-01-29 13:26:02 -08:00
Jay Zoldak
c3eba0d2da Add RequireJS.js to files.json so that the cms jasmine tests will run without erroring when importing RequireJS. 2013-01-29 16:22:37 -05:00
jarv
877f757f94 Merge pull request #1369 from MITx/feature/jarv/certificate-restriction
Feature/jarv/certificate restriction
2013-01-29 13:14:41 -08:00
Diana Huang
cb77209d3c Add missing requirejs for xmodule jasmine tests 2013-01-29 16:09:27 -05:00
Diana Huang
585f1c41d6 New jasmine tests for combined open ended problems. 2013-01-29 16:04:43 -05:00
Deena Wang
3858362157 more tests 2013-01-29 15:53:20 -05:00
Christina Roberts
424cfd3cd7 Merge pull request #1372 from MITx/feature/dhm/drag
Auto expand on hover of drag&drop unit
2013-01-29 12:10:38 -08:00
Your Name
15a2890795 Merge branch 'master' into feature/marco/group 2013-01-29 15:05:38 -05:00
Don Mitchell
574d6e8e28 Simple zIndex rather than fancy stack works best. 2013-01-29 15:00:49 -05:00
Jay Zoldak
1a398980d0 Add tests for diango-comment-client middleware 2013-01-29 14:47:05 -05:00
Jay Zoldak
053547453e Add tests for django-comment-client models 2013-01-29 14:45:35 -05:00
Jay Zoldak
d81da9df4d Add tests for django comment client mustache helpers 2013-01-29 14:44:37 -05:00
Jay Zoldak
593b038780 Add tests for django-comment-client helpers 2013-01-29 14:43:28 -05:00
Diana Huang
efc572c24d Fix navigation jasmine tests 2013-01-29 14:36:27 -05:00
Jay Zoldak
1f049410ae Add tests for django comment client utils 2013-01-29 14:34:02 -05:00
Deena Wang
4f58e9c177 Merge branch 'master' into feature/deena/testing to get factory files 2013-01-29 14:33:54 -05:00
Don Mitchell
63d269acf1 draggable is not the collapsed item :-( but ui.helper seems to be. 2013-01-29 14:31:14 -05:00
Jay Zoldak
e745087455 Fix permissions bug and add test cases for django comment client permissions. 2013-01-29 14:30:15 -05:00
Deena Wang
d9fdccb567 testing testing tests 2013-01-29 14:23:55 -05:00
Chris Dodge
855c8bb7e7 add unit test for tab reordering 2013-01-29 13:44:42 -05:00
Don Mitchell
87d8598abe subsection drag 2013-01-29 13:43:58 -05:00
John Jarvis
3f740976bc Adding dashboard text for certificate restriction 2013-01-29 13:24:17 -05:00
Don Mitchell
b3d7dc779d Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag 2013-01-29 13:17:15 -05:00
Don Mitchell
5fcb6bfcd4 Remove debug code 2013-01-29 13:16:21 -05:00