Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,089 Commits 1 Branch 0 Tags
baba8d3a369be6ccfd4968f539cc642d27c1906e
Commit Graph

10089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vik Paruchuri
baba8d3a36 Add collapse action into staff grading view 2013-02-07 12:42:05 -05:00
Vik Paruchuri
3457b86bd0 Fix JS, style student response box 2013-02-07 12:36:57 -05:00
Vik Paruchuri
c195fe65cd Restyle rubric list, submission container 2013-02-07 11:10:29 -05:00
Vik Paruchuri
198885f7e0 Move elements around, do some restyling 2013-02-07 10:40:15 -05:00
Vik Paruchuri
aa699905d6 Feedback and view only rubric restyle 2013-02-07 10:32:39 -05:00
Vik Paruchuri
f22849ebdd Re-arrange feedback, fix rubric HTML issue 2013-02-07 10:29:58 -05:00
Vik Paruchuri
b30407d7c8 Work on showing results properly 2013-02-07 10:22:33 -05:00
Vik Paruchuri
de8e1e9472 Change around some names, restyle rubric 2013-02-07 09:57:41 -05:00
Vik Paruchuri
03a6572bbe Restyle status, get rubric to work properly 2013-02-07 09:49:56 -05:00
Vik Paruchuri
9a5a988116 Revert peer grading problem to master version 2013-02-07 09:29:24 -05:00
Vik Paruchuri
2542b6cb72 Merge remote-tracking branch 'origin/master' into feature/vik/improve-oe-ui 2013-02-07 09:26:40 -05:00
Vik Paruchuri
6a6962df9e Alter rubric list, restyle rubric 2013-02-07 09:26:27 -05:00
David Ormsbee
a6b35853f9 Merge pull request #1455 from MITx/hotfix/dave/youtube_object 
Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue.
 2013-02-06 19:47:25 -08:00
David Ormsbee
976776643b Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue. 2013-02-06 22:46:22 -05:00
Victor Shnayder
37b735d708 Merge pull request #1454 from MITx/hotfix/dave/youtube_object 
Hack to disable YouTube <iframe> API when they break it.
 2013-02-06 19:41:12 -08:00
David Ormsbee
a470a62d12 Hack to disable YouTube <iframe> API when they break it. 2013-02-06 22:37:41 -05:00
Victor Shnayder
18ddd1ee56 Merge pull request #1453 from MITx/victor/protex 
Victor/protex
 2013-02-06 18:03:53 -08:00
jmclaus
2627a2f12c Protex now loads correctly in every scenario 2013-02-06 20:49:23 -05:00
jmclaus
98865bb7c0 Loading bug fixed by ugly hack 2013-02-06 20:49:16 -05:00
jmclaus
85b92f30de GWT now does no set any target shape in onModuleLoad() 2013-02-06 20:49:06 -05:00
jmclaus
e27b1e04a7 Fixed small alighment pb, decreased font size of text box 2013-02-06 20:48:57 -05:00
jmclaus
3bd7e1b703 Crisper AA letters, canvases non-selectable 2013-02-06 20:48:48 -05:00
jmclaus
ef232c5976 Few bug fixes 2013-02-06 20:48:40 -05:00
jmclaus
f6dacff41e Fixed layout, increased size of markers on proteins 2013-02-06 20:48:32 -05:00
jmclaus
5737f58b95 Added GWT Protex - reads target shape from xml writes answer to hidden input field 2013-02-06 20:48:25 -05:00
Victor Shnayder
e4819a1b55 Merge pull request #1452 from MITx/silly/victor/revert-forums-merge 
Silly/victor/revert forums merge
 2013-02-06 17:41:14 -08:00
Victor Shnayder
2af06ef1d4 Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes" 
This reverts commit 66889b8724, reversing
changes made to 0dd9c24e74.

This was merged too early--it's still missing the filtering and display-your-cohort changes.
Will need to revert this revert later.
 2013-02-06 20:29:17 -05:00
Victor Shnayder
884a7a61b9 Revert "Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes" 
This reverts commit 965e3b4c49, reversing
changes made to 1a7d2a06a8.

I accidentally merged this before it was ready.  This was silly, so now I'm undoing it.  We'll need to revert the revert later.
 2013-02-06 20:27:01 -05:00
Victor Shnayder
b6ec41cae0 Merge pull request #1432 from MITx/7012x-clean 
7012x clean
 2013-02-06 15:58:29 -08:00
Victor Shnayder
0141f31d33 add warning message to sample-post.py 2013-02-06 18:57:25 -05:00
Victor Shnayder
edf96036c8 Merge remote-tracking branch 'origin/master' into 7012x-clean 2013-02-06 18:53:14 -05:00
Victor Shnayder
2c1f3bd470 Merge pull request #1449 from MITx/fix/rocha/7012x-clean 
Fix/rocha/7012x clean
 2013-02-06 15:50:27 -08:00
Victor Shnayder
965e3b4c49 Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes 
addressed somme comments in pull request and instructor fixes and blank ...
 2013-02-06 15:40:33 -08:00
Carlos Andrés Rocha
536333cbb5 Refactor how editamolecule displays messages 2013-02-06 18:31:00 -05:00
Kevin Chugh
1dd0ef274d addressed somme comments in pull request and instructor fixes and blank group fix 2013-02-06 18:26:41 -05:00
Victor Shnayder
1a7d2a06a8 Merge pull request #1442 from MITx/marketing/reg-tweak 
Fix placeholder email in signup form
 2013-02-06 15:26:26 -08:00
Victor Shnayder
4b54e849ad Merge pull request #1448 from MITx/feature/ichuang/conditional-xmodule-icon-and-errortracker 
Conditional XModule: add errortracker msg for bad require & inherit icon from child
 2013-02-06 15:25:48 -08:00
ichuang
b5ba88f0af Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/conditional-xmodule-icon-and-errortracker 
Conflicts:
	common/lib/xmodule/xmodule/conditional_module.py
 2013-02-06 18:15:36 -05:00
ichuang
c16f688802 conditional xmod: add errortracker msg and inherit icon from child 2013-02-06 18:10:25 -05:00
Victor Shnayder
66889b8724 Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes 
Feature/kevin/groups ui changes
 2013-02-06 14:41:41 -08:00
Carlos Andrés Rocha
d4afa02b12 Modify editamolecule to load GWT scripts dynamically 2013-02-06 17:40:44 -05:00
Victor Shnayder
0dd9c24e74 Merge pull request #1447 from MITx/debug/dave/pearson_js_error 
Throw the error back up if we don't have a console to log it to.
 2013-02-06 14:16:44 -08:00
Kevin Chugh
55c205b9b4 merged master 2013-02-06 17:13:52 -05:00
David Ormsbee
e5fda33eff Throw the error back up if we don't have a console to log it to. 2013-02-06 17:13:22 -05:00
Victor Shnayder
92eb88d464 Merge pull request #1444 from MITx/feature/cale/dev-staticfiles 
Make local dev work by trying checking staticfiles_storage for both the ...
 2013-02-06 14:02:04 -08:00
Vik Paruchuri
83608fd983 Restyle lists 2013-02-06 16:58:59 -05:00
Vik Paruchuri
28a0e44120 Quick rubric restyle 2013-02-06 16:57:10 -05:00
Diana Huang
bbf37ef9d0 Merge pull request #1446 from MITx/fix/vik/peer-grading-images 
Fix/vik/peer grading images
 2013-02-06 13:51:05 -08:00
Vik Paruchuri
463f31618d Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images 2013-02-06 16:37:52 -05:00
VikParuchuri
c68b0d3cd0 Merge pull request #1439 from MITx/feature/vik/oe-versioning 
Feature/vik/oe versioning
 2013-02-06 13:36:06 -08:00