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

7051 Commits

Author SHA1 Message Date
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
47ed02c9ea Remove more merge badness 2012-12-07 11:30:21 -05: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
Victor Shnayder
44a8f31d06 Change are-we-logged-in detection to be less hackish. 
- has matching changes in controller staff_grading view.
 2012-12-07 10:35:45 -05:00
Victor Shnayder
730cdd3b4f minor changes from pull request comments 
- comments
- more info in log msg
- better error
 2012-12-07 10:35:44 -05:00
Victor Shnayder
53580af952 fix aws setting name 2012-12-07 10:35:44 -05:00
Kevin Chugh
258b1fe9a5 thread responses create fixed 2012-12-06 22:12:17 -05:00
David Ormsbee
61c17cabfa Merge pull request #1100 from MITx/fix/brian/nonascii-html-xmodule 
Fix/brian/nonascii html xmodule
 2012-12-06 15:33:21 -08: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
marco
8a6a0673e6 Merge branch 'feature/kevin/flagging' of github.com:MITx/mitx into feature/kevin/flagging 2012-12-06 16:43:19 -05:00
marco
00d1a7c73b added flag icons back in with proper transparency 2012-12-06 16:42:15 -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
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
Kevin Chugh
c4be2b514a update coffee 2012-12-05 13:25:22 -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
Alexander Kryklia
97016d6168 video time frame support for xmodule 2012-12-05 17:18:35 +02: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
Diana Huang
90076c39e6 add in some new mock responses for our staff grading API 2012-12-05 09:25:05 -05:00
Victor Shnayder
40f34d19a3 add initial mock of get_problems call 2012-12-04 17:46:34 -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
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
Brian Wilson
70f35b2e15 remove skipped tests that use mongo 2012-12-04 13:46:32 -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
Carlos Andrés Rocha
c702bbcd85 Modify Wellesley rollover logo 2012-12-04 10:27:23 -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
Brian Wilson
1d44ebb10c Add more non-ascii characters to full dataset, and make fixes in xmodule code. 2012-12-03 16:22:25 -05:00
Ashley Penney
e36cffa86f Merge pull request #1096 from MITx/feature/cale/bad-newrelic-logging 
Don't try and send exceptions to newrelic with a busted logging interfac...
 2012-12-03 11:35:53 -08:00
Calen Pennington
251f552e64 Don't try and send exceptions to newrelic with a busted logging interface 2012-12-03 14:30:36 -05:00
Victor Shnayder
cb9c71000f Merge pull request #1095 from MITx/vik/modify_open_ended 
Altered staff grading to display message about ml grading performance.
 2012-12-03 11:27:36 -08:00
Victor Shnayder
97fbd02cb5 Merge pull request #1090 from MITx/vik/modify_open_ended 
Vik/modify open ended
 2012-12-03 06:10:01 -08:00