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

66833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Giannattasio
7b4cd3e4b3 added additional processing class 2012-08-13 10:20:54 -04:00
Calen Pennington
32924d8bfe Merge pull request #398 from MITx/kimth/partialgrading 
Partial scoring
 2012-08-13 07:19:50 -07:00
Tom Giannattasio
ee0cbf66f9 added a cleaner arrow implementation 2012-08-13 10:19:06 -04:00
Tom Giannattasio
4eefa73336 changed field border color 2012-08-13 10:19:06 -04:00
Tom Giannattasio
8b79d811d4 added spinner gif 2012-08-13 10:19:06 -04:00
Calen Pennington
95b7957491 Merge pull request #350 from MITx/arjun/javascript_response 
Adding a javascript-based response type
 2012-08-13 07:14:44 -07:00
kimth
1ff8e271f5 Partial scoring 2012-08-13 10:14:29 -04:00
Calen Pennington
801df37872 Merge remote-tracking branch 'origin/master' into arjun/javascript_response 
Conflicts:
	common/lib/xmodule/xmodule/js/src/capa/display.coffee
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/module_render.py
 2012-08-13 10:13:21 -04:00
Calen Pennington
bd95c03d9b Merge pull request #396 from MITx/feature/ichuang/xqa-and-patches 
Provide content QA (quality assessment) interface
 2012-08-13 06:55:05 -07:00
Calen Pennington
a3d7c4892d Merge pull request #397 from MITx/feature/server_split 
Model replication to course databases
 2012-08-13 06:39:03 -07:00
David Ormsbee
4ac7862975 Merge branch 'master' into feature/server_split 
Conflicts:
	lms/urls.py
 2012-08-13 09:21:02 -04:00
Calen Pennington
a984fbb65f Merge pull request #394 from MITx/feature/victor/hide-error-modules 
Hide errors from non-staff users
 2012-08-13 06:17:13 -07:00
Calen Pennington
fdee13e4c0 Merge pull request #393 from MITx/feature/victor/bad-content-warn-not-error 
Feature/victor/bad content warn not error
 2012-08-13 06:13:19 -07:00
Calen Pennington
8402d26901 Merge pull request #392 from MITx/feature/victor/dark-launch 
Feature/victor/dark launch
 2012-08-13 06:11:45 -07:00
Rocky Duan
d6f3492975 replaced comment client sym link 2012-08-12 22:55:55 -07:00
Rocky Duan
12897ffff0 added title & tag for new post & fixed error handling; reply button in generated thread doesn't work 2012-08-12 22:54:02 -07:00
David Ormsbee
3cabb2dea6 Remove the no-longer-used is_valid_course_id code 2012-08-13 01:00:55 -04:00
David Ormsbee
d24ee25615 Remove debug checking for UserProfile 2012-08-13 00:57:33 -04:00
David Ormsbee
0aad62d6a8 Remove extra braces that were causing mako syntax errors 2012-08-13 00:48:35 -04:00
David Ormsbee
c6ed6fc066 Merge branch 'master' into feature/server_split 2012-08-13 00:36:31 -04:00
David Ormsbee
510435ada5 Sketchy adding of test dbs to the cms test.py config file -- these are required for the Student (shared django app) tests to run 2012-08-13 00:35:51 -04:00
David Ormsbee
7711f81303 Add nginx.conf file for running a multi-server dev env 2012-08-12 23:35:50 -04:00
Rocky Duan
7b7164a101 fixed unicode bug 2012-08-12 17:12:16 -07:00
Rocky Duan
322828fbff removed unnecessary template 2012-08-12 16:41:16 -07:00
ichuang
47c48e9c66 fix student.views.create_account to handle errors from _do_create_account 2012-08-12 19:07:31 -04:00
ichuang
f072979a6c fix error in student views - js was undefined in _do_create_account 2012-08-12 18:45:24 -04:00
ichuang
da9742a88a reroute email on AWS test machine (dev_ike) 2012-08-12 18:39:39 -04:00
ichuang
2c9652ab74 change xqa server location to suburl 2012-08-12 18:29:48 -04:00
Victor Shnayder
3455f8f64d Hide errors from non-staff users 2012-08-12 18:03:12 -04:00
Victor Shnayder
af7e70a979 Log content problems as warnings, not errors 
* will avoid newrelic complaining
* NOTE: Is this what we want post-ship?
  - need some way of notifying instructors of problems
 2012-08-12 17:21:40 -04:00
Victor Shnayder
e980f8b296 add notes on how to run individual tests 2012-08-12 16:59:07 -04:00
Victor Shnayder
d7f94a05b7 Add DARK_LAUNCH functionality 
* pass user to check_course
* if dark launch feature enabled, users with staff access to course
can see courseware before start date.  Students still can't.
* tests.
* Remaining: enrollment view has custom access control.  Need to check it.
 2012-08-12 16:23:31 -04:00
Victor Shnayder
622eebc473 Don't error on missing static files 
* Just log a warning and return a dummy url
* May want smarter checking later
  (e.g. would be nice to tell staff what files are missing.)
 2012-08-12 16:21:38 -04:00
David Ormsbee
54b0a465fa Ugly hack so that an LMS-specific test of the shared Student djangoapp doesn't break CMS test runs 2012-08-12 16:10:08 -04:00
Rocky Duan
44f7b37bfb refactored comment_client working 2012-08-12 12:56:55 -07:00
ichuang
656a162aba allow xqa server url to be set by MITX_FEATURES['USE_XQA_SERVER'] 2012-08-12 12:43:08 -04:00
ichuang
453d623b43 use mitx content-qa central server for staff_problem_info 2012-08-11 23:42:39 -04:00
Rocky Duan
b7d3361894 Merge branch 'mergedtom' into refactor 
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
 2012-08-11 17:43:16 -07:00
Rocky Duan
de8c828fb3 changed comment_client module to be imported as cc 2012-08-11 17:42:08 -07:00
Rocky Duan
2848c1fe38 switched to refactored comment_client 2012-08-11 17:36:58 -07:00
ichuang
da64c8f0a1 add xqa interface to staff_problem_info, make staff_debug a modal 
window, add xqa modal window, add xqa_key to course metadata
 2012-08-11 20:12:37 -04:00
Rocky Duan
2d256dfe1d attempt to fix sort 2012-08-11 16:35:34 -07:00
Rocky Duan
7030d1f1a2 fixed endorse&edit&delete 2012-08-11 14:38:37 -07:00
Rocky Duan
2f469f0f29 Merge branch 'brittany' of github.com:dementrock/mitx into mergedtom 2012-08-10 18:51:18 -07:00
Rocky Duan
39590116f7 make some indentation 2012-08-10 18:51:12 -07:00
Brittany Cheng
78ca885b05 fix comment styles 2012-08-10 18:42:07 -07:00
ichuang
9a54295ea1 Merge pull request #391 from MITx/feature/cale/allow-broken-content-links 
If there is a missing static file, don't break the server, just leave a ...
 2012-08-10 18:36:52 -07:00
Calen Pennington
14bfbb06a5 If there is a missing static file, don't break the server, just leave a dead url 2012-08-10 21:22:12 -04:00
Rocky Duan
66beb54739 Merge branch 'brittany' of github.com:dementrock/mitx into lol 2012-08-10 17:59:28 -07:00
Rocky Duan
ab6cf914a0 Merge branch 'brittany' of github.com:dementrock/mitx into lol 
Conflicts:
	lms/templates/discussion/_thread.html
 2012-08-10 17:59:19 -07:00