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

2941 Commits

Author SHA1 Message Date
Kevin Chugh
6e108c7531 fix conflict 2012-12-10 19:30:04 -05:00
Victor Shnayder
df578de11f Merge pull request #1119 from MITx/diana/open-ended-response-styling 
Updates to the styling of open ended problems
 2012-12-10 11:36:04 -08:00
Victor Shnayder
c5c4305f9e Merge pull request #1110 from MITx/diana/instructor-grading-styling 
Updates to the instructor grading pages
 2012-12-10 10:39:19 -08:00
Diana Huang
cc72870aac Make oepn-ended responses and self-assessment answers use 
the same CSS
 2012-12-10 11:00:28 -05:00
Diana Huang
c9d399d3bd Update instructor grading message with more accurate information 2012-12-10 09:35:30 -05:00
Carlos Andrés Rocha
faae6a36dc Merge pull request #1107 from MITx/content/btalbot/new-universities 
Add Georgetown news announcement, landing page and updated FAQ

[Finished cd#40805397 #40805401]
 2012-12-10 03:32:41 -08:00
JM Van Thong
27b8f01ffa Added the following analyzers: StudentsActive, OverallGradeDistribution, StudentsDropoffPerDay. 2012-12-07 17:26:33 -05:00
Diana Huang
5030c9d35b Cleanup of the meta information styles and make 
the feedback box less important.
 2012-12-07 17:01:27 -05:00
Diana Huang
1026c64111 Fix up some more of the meta info container 2012-12-07 17:01:27 -05:00
Diana Huang
275c9ef7fd Update API with server and add new meta info box for meta information 2012-12-07 17:01:27 -05:00
Diana Huang
aee1e5e9a9 Updates to the list view and error container 2012-12-07 17:01:27 -05:00
Diana Huang
fcc1ab71f6 Update the formatting and layout of the Instructor Grading interface. 2012-12-07 17:01:27 -05:00
Diana Huang
b5f3386d27 Add breadcrumbing and clarify some of the text on the 
instructor grading interface.
 2012-12-07 17:01:27 -05:00
Diana Huang
94e1a9ffd3 Clean up some minor issues with list view 
and display some new information on the problem-specific page
 2012-12-07 17:01:26 -05:00
Kevin Chugh
368b59a9e6 updated tooltips 2012-12-07 15:39:53 -05:00
Carlos Andrés Rocha
cc68ba5bc9 Add Georgetown news announcement, landing page and updated FAQ 
[#40805397]
 2012-12-07 11:59:13 -05:00
David Ormsbee
7596deb40a Merge pull request #1094 from MITx/feature/victor/instructor-grading 
Feature/victor/instructor grading
 2012-12-07 08:44:58 -08:00
Calen Pennington
c917725ff0 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/static/sass/course.scss
	requirements.txt
 2012-12-07 11:17:41 -05:00
Brian Talbot
edbc12e1e3 homepage - added georgetown logo assets and resized other university logos to match 3x3 layout 2012-12-06 17:02:43 -05:00
Kevin Chugh
14b0cc019f remove debug placeholders, finalize render of comments, flagging working on posts, replies, and comments 2012-12-06 16:26:08 -05:00
Brian Talbot
cc870f8ecd homepage - changed partner university listing layout to handle 6 partners 2012-12-06 14:37:09 -05:00
Kevin Chugh
70b0b5beb8 update models 2012-12-06 10:43:51 -05:00
Kevin Chugh
28e86f9602 Merge branch 'master' into feature/kevin/flagging 2012-12-06 09:31:39 -05:00
JM Van Thong
b10b6e2b3f Added more analytics to instructor dashboard. 2012-12-05 23:21:00 -05:00
Your Name
3a7624d384 modify verbiage of flagging 2012-12-05 11:20:31 -05:00
Alexander Kryklia
97016d6168 video time frame support for xmodule 2012-12-05 17:18:35 +02:00
Your Name
8ad01c7340 fix comments and replies 2012-12-04 15:47:42 -05:00
Victor Shnayder
c57b9f3240 merge prompt and ml accuracy display 2012-12-04 14:44:23 -05:00
marco
64663c34dd added flag resources 2012-12-04 14:04:31 -05:00
Your Name
a0104f6526 add flagging interface to replies and comments 2012-12-04 11:35:20 -05:00
Carlos Andrés Rocha
4d6162b1df Fix incorrect Facebook URL for Wellesley news announcement 2012-12-04 09:58:50 -05:00
Carlos Andrés Rocha
e3d180505f Add Wellesley College news announcement and frontpage changes 2012-12-04 09:45:30 -05:00
JM Van Thong
1732fc4804 Improve analytics table style and added scroll. 2012-12-03 18:44:19 -05:00
Your Name
033ed6ce92 flagging done except returning abuse flaggers 2012-12-02 15:05:03 -05:00
Kevin Chugh
4dee832f35 convert flagging to one flag 2012-12-02 13:04:27 -05:00
Your Name
229a48db85 update location of flag abuse, and hook up firing 2012-12-01 13:43:27 -05:00
David Ormsbee
7ffb30d0c9 IE errors if you try to use 'return' as a dict key. 2012-11-30 18:22:37 -05:00
Your Name
ab262b4052 attempt to update front end with new assets 2012-11-30 17:12:06 -05:00
Vik Paruchuri
4e4bd4aba2 Altered staff grading to display message about ml grading performance. 2012-11-30 15:52:11 -05:00
Vik Paruchuri
6e75584d06 Convert templates to mako 2012-11-30 14:14:29 -05:00
Vik Paruchuri
9fb6c6f989 Debug template issues 2012-11-30 13:18:32 -05:00
Vik Paruchuri
2a0c9d0c70 Handle templating within lms 2012-11-30 12:48:13 -05:00
Vik Paruchuri
7330bef8e6 Changes to fix compatibility with controller feedback 2012-11-30 12:11:58 -05:00
Vik Paruchuri
51e148a7a7 Add in support for rendering feedback within lms 2012-11-30 11:42:24 -05:00
Victor Shnayder
d1b433dba5 add adaptive-max-score html to lms view 2012-11-30 10:03:30 -05:00
Victor Shnayder
d0e2b85e3c Refactor testing code, hook up frontend. 
- now getting requests from js to server and back, with mocked service.
 2012-11-30 10:02:20 -05:00
Victor Shnayder
7d1d135c16 Wire in some initial js. 2012-11-30 09:51:34 -05:00
Victor Shnayder
f5d9e963cc Initial wiring of a staff grading tab. 
- no actual functionality, but have a tab that renders static html via a view
 2012-11-30 09:51:33 -05:00
Kevin Chugh
9a19518fa7 flagging set up in css and thread template 2012-11-29 19:15:47 -05:00
Your Name
a22dd5ebb7 flagging interface updates 2012-11-29 17:31:40 -05:00