Commit Graph

14212 Commits

Author SHA1 Message Date
Tom Giannattasio
6c75a71e8c cleaned up subsection and unit page 2012-12-06 16:34:13 -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
Tom Giannattasio
1a40209082 cleaned up editor styles; cleaned up static tabs page 2012-12-06 14:25:30 -05:00
Kevin Chugh
deb3888a84 thread response flagging 2012-12-06 14:13:54 -05:00
Kevin Chugh
70b0b5beb8 update models 2012-12-06 10:43:51 -05:00
Kevin Chugh
4139f702ff debugging thread 2012-12-06 10:30:06 -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
Kevin Chugh
50db11a647 urls and views for comment flagging 2012-12-05 17:08:29 -05:00
Tom Giannattasio
6d89835245 more defined header, new icons, cleaner static tabs page 2012-12-05 17:01:29 -05:00
Kevin Chugh
c4be2b514a update coffee 2012-12-05 13:25:22 -05:00
Vik Paruchuri
1eaf424c20 Change some things to use format 2012-12-05 13:17:16 -05:00
Vik Paruchuri
e813dc3514 Address format issue and exception 2012-12-05 12:08:26 -05:00
Tom Giannattasio
ad84a961da new header styles; collapse all button added to courseware 2012-12-05 12:05:14 -05:00
Your Name
70d0fd11b7 Merge branch 'feature/kevin/flagging' of github.com:MITx/mitx into feature/kevin/flagging 2012-12-05 11:21:16 -05:00
Your Name
3a7624d384 modify verbiage of flagging 2012-12-05 11:20:31 -05:00
Victor Shnayder
3795b3a785 Address Dave's comments
- factor out some common code
- improve variable names
2012-12-05 10:56:12 -05:00
Victor Shnayder
3b3ee2bf52 Merge branch 'feature/victor/instructor-grading' of github.com:MITx/mitx into feature/victor/instructor-grading 2012-12-05 10:37:24 -05:00
Alexander Kryklia
97016d6168 video time frame support for xmodule 2012-12-05 17:18:35 +02:00
Victor Shnayder
a498377ad5 Merge pull request #1102 from MITx/diana/instructor-grading-styling
Diana/instructor grading styling
2012-12-05 06:49:47 -08:00
Diana Huang
5ebde2a93e fix comment 2012-12-05 09:42:30 -05:00
Diana Huang
cb6bb38f84 merge commit 2012-12-05 09:40:53 -05:00
Victor Shnayder
7887f556d9 Add docs on using a queue server on aws from a local LMS 2012-12-05 09:29:42 -05:00
Diana Huang
90076c39e6 add in some new mock responses for our staff grading API 2012-12-05 09:25:05 -05:00
Alexander Kryklia
7390015799 parameters in display video 2012-12-05 14:43:35 +02:00
Victor Shnayder
40f34d19a3 add initial mock of get_problems call 2012-12-04 17:46:34 -05:00
Victor Shnayder
1d87dab3a7 remove queueing spinner and polling logic, change message
- no polling, since instructors may take a long time to grade
2012-12-04 17:45:51 -05:00
Victor Shnayder
1d9d347df9 Merge pull request #1101 from MITx/bugfix/dave/remove_point_cap
Don't cap points coming back from CodeResponses
2012-12-04 13:59:06 -08:00
David Ormsbee
cee0781a20 Don't cap points coming back from CodeResponses -- let them be more than max_points if they want to award extra credit. 2012-12-04 15:51:36 -05:00
marco
13581bcfcb updated flag icons to have proper transparency 2012-12-04 15:47:58 -05:00
Your Name
8ad01c7340 fix comments and replies 2012-12-04 15:47:42 -05:00
marco
81dae33f1c added flag-label coloring css 2012-12-04 14:58:28 -05:00
Tom Giannattasio
72ebf4c862 style tweaks to tabs and static pages; key bindings for new user form 2012-12-04 14:54:02 -05:00
Victor Shnayder
c57b9f3240 merge prompt and ml accuracy display 2012-12-04 14:44:23 -05:00
Victor Shnayder
d4a3e4d044 fix logger name 2012-12-04 14:44:23 -05:00
Your Name
a5a38c0116 fix conflict 2012-12-04 14:09:46 -05:00
Your Name
6a19f4e02a changes to underscore template 2012-12-04 14:08:39 -05:00
marco
64663c34dd added flag resources 2012-12-04 14:04:31 -05:00
Tom Giannattasio
7cba7c9b41 tweaked body color and window styles; adjusting new buttons 2012-12-04 13:49:07 -05:00
Brian Wilson
70f35b2e15 remove skipped tests that use mongo 2012-12-04 13:46:32 -05:00
Brian Wilson
c2d5c04d9d Merge branch 'master' into fix/brian/nonascii-html-xmodule 2012-12-04 13:26:37 -05:00
Brian Wilson
cde20758f8 cosmetic cleanup 2012-12-04 13:25:04 -05:00
JM Van Thong
39d48b1966 Change daily activity to be course specific. 2012-12-04 12:00:27 -05:00
Brian Wilson
dfb9913100 clean up lms tests, and fix export/import 2012-12-04 11:52:35 -05:00
Your Name
a0104f6526 add flagging interface to replies and comments 2012-12-04 11:35:20 -05:00
Tom Giannattasio
4e7d931d7e removed new course button on click to prevent multiple instantiations 2012-12-04 11:00:28 -05:00
Brian Talbot
63637579f4 added in additional tool tips for icon/graphic-based controls on overview 2012-12-04 10:55:08 -05:00
Carlos Andrés Rocha
94a12bddb6 Merge pull request #1099 from MITx/content/rocha/wellesley-announcmenent
Modify Wellesley rollover logo
2012-12-04 07:27:59 -08:00
Carlos Andrés Rocha
c702bbcd85 Modify Wellesley rollover logo 2012-12-04 10:27:23 -05:00