Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,817 Commits 1 Branch 0 Tags
82afc477fac467e477fc74b71ac0cd2bdd42c79e
Commit Graph

3574 Commits

Author SHA1 Message Date
David Ormsbee
fae51815d8 Merge pull request #1420 from MITx/debug/dave/sass 
Force it to do expanded mode, because it's still generating compressed CSS output
 2013-02-04 15:04:03 -08:00
David Ormsbee
aeaad6f58d Force it to do expanded mode, because it's still generating compressed CSS output 2013-02-04 18:03:05 -05:00
Diana Huang
fb777de18d Merge pull request #1401 from MITx/feature/vik/peer-grading-flagging 
Feature/vik/peer grading flagging
 2013-02-04 14:45:59 -08:00
Vik Paruchuri
1dab4aba96 Fix accidental commit of dev.py 2013-02-04 17:44:09 -05:00
Vik Paruchuri
e8803985f2 Fix JS on after event handling 2013-02-04 17:41:44 -05:00
David Ormsbee
9f634aba3c Remove compressed flag from SASS call in pipeline so we can diff the generated CSS 2013-02-04 17:33:26 -05:00
Vik Paruchuri
d89ab000d2 Fix a function call 2013-02-04 17:30:45 -05:00
Vik Paruchuri
eb049bda9e Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-flagging 2013-02-04 17:18:59 -05:00
Vik Paruchuri
7f96fbb3d1 Address review comments 2013-02-04 17:15:07 -05:00
Vik Paruchuri
8bd7b60aca Add in key to mock peer grading service 2013-02-04 10:50:07 -05:00
Vik Paruchuri
c991c0489c Fix open ended test with flagging 2013-02-04 10:26:25 -05:00
ichuang
363ca7031e add coffeescript/js for conditional module, does XModule.loadModules 2013-02-03 18:53:51 -05:00
ichuang
19051e40d2 use ajax for doing conditional_module 2013-02-03 18:53:51 -05:00
ichuang
8db96abb18 conditional_module.html 2013-02-03 18:53:51 -05:00
VikParuchuri
01fab2ec68 Merge pull request #1346 from MITx/feature/vik/combined-xmodule-changes 
Feature/vik/combined xmodule changes
 2013-02-01 15:46:33 -08: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
John Jarvis
f525b17b1a pep8 cleanup 2013-02-01 13:13:16 -05:00
Christina Roberts
14ca42a5dc Merge pull request #1405 from MITx/style/btalbot/lms-courseinfolists 
temporary style sync up for course info lists
 2013-02-01 06:51:35 -08:00
Brian Talbot
61de4c028a temporary style sync up for course info lists - more work needs to be done once xmodule renders this HTML (in Studio backlog) 2013-02-01 09:41:51 -05:00
e0d
969737c58e service variant code for loading different config 2013-01-31 21:43:35 -05:00
Brian Talbot
f6cd4c75b8 lms - revising xmodule HTML display styles and overwriting some to retain old syllabus table styling 2013-01-31 18:15:20 -05:00
Vik Paruchuri
b22bad7fa1 Add in some removed imports (fix tests) 2013-01-31 17:11:44 -05:00
Vik Paruchuri
01cdc6e7f8 Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes 
Conflicts:
	common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
 2013-01-31 16:50:10 -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
Jay Zoldak
6fe209b0cf Merge pull request #1392 from MITx/tests/diana/update-oe-unit-tests 
New tests for OpenEndedGrading
 2013-01-31 08:34:06 -08:00
Vik Paruchuri
78f9f63466 Add in notification type for flagged submissions 2013-01-31 11:19:15 -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
Vik Paruchuri
4c16479569 Working on frontend JS for posting 2013-01-30 21:22:59 -05:00
Vik Paruchuri
17fce100bb Add in ban actions to table 2013-01-30 21:10:48 -05:00
Vik Paruchuri
b248a09572 Work on adding in ban actions 2013-01-30 21:06:54 -05:00
Vik Paruchuri
f89e36b5b9 Flagged list renders properly 2013-01-30 20:54:02 -05:00
Vik Paruchuri
e89196e0dd Add in flagged problem list return 2013-01-30 20:47:00 -05:00
Vik Paruchuri
b6f77f6f8e Fix rendering for flagged problems view 2013-01-30 20:43:57 -05:00
Vik Paruchuri
dd72297f73 Wire up flagged problem list 2013-01-30 20:39:53 -05:00
Vik Paruchuri
78696c62b8 Work on open ended flagged problems 2013-01-30 20:36:09 -05:00
Vik Paruchuri
5f538f078b Pass flag through from LMS to grading controller 2013-01-30 19:50:36 -05:00
Victor Shnayder
bc1452f288 Merge pull request #1390 from MITx/press/7.00x 
7.00x press release
 2013-01-30 15:35:51 -08:00
Calen Pennington
c4f56620df Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic" 
This reverts commit ab437b9463, reversing
changes made to 7a8e87c789.
 2013-01-30 16:49:49 -05:00
Vik Paruchuri
2ba194a4f6 Change step names to human names 2013-01-30 16:44:40 -05:00
Diana Huang
36d8b8768c Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-30 16:41:18 -05:00
Victor Shnayder
0353cb98e1 7.00x press release 2013-01-30 16:07:47 -05:00
Victor Shnayder
f2944334ab Merge pull request #1387 from MITx/feature/zoldak/courseware-unit-tests 
Add unit tests for lms courseware access
 2013-01-30 12:51:50 -08:00
Calen Pennington
ab437b9463 Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic 
Don't run collectstatic on course content
 2013-01-30 12:07:47 -08:00
Jay Zoldak
91b8a95ed7 Add unit tests for lms courseware access 2013-01-30 15:03:43 -05:00