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

989 Commits

Author SHA1 Message Date
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
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
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
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
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
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
kimth
d41f709c92 Moved xqueue_callback URLs into the course 2012-08-10 18:51:35 -04:00
ichuang
f6e84e84da SECURE_PROXY_SSL_HEADER for django-1.4 in envs/dev_ike for nginx ssl proxy 2012-08-10 16:24:32 -04:00
ichuang
b159eb4825 add feature flag to disable login button (for systems which autologin) 2012-08-10 15:57:41 -04:00
ichuang
f99eb930ac new static/admin files for django 1.4 admin 2012-08-10 15:25:42 -04:00
ichuang
dade6dd182 askbot template loader is broken - breaks admin view; disable in dev_ike.py 2012-08-10 15:25:42 -04:00
ichuang
411e77e19d ModuleSystem should get its DEBUG set from settings.DEBUG in module_render 2012-08-10 15:25:42 -04:00
ichuang
2e4f21ee3b replace_static_urls should only be run once (currently twice, eg if 
html is in a veritical)
 2012-08-10 15:25:41 -04:00
Victor Shnayder
38a89e9f1a Make courseware navigation work again. 
* bodyclass block got accidentally deleted
 2012-08-10 14:51:47 -04:00
David Ormsbee
b3676cd760 Add replication tests 2012-08-10 14:43:43 -04:00
Calen Pennington
310788ca08 Merge pull request #384 from MITx/feature/tomg/fall-design 
fixed course name title bar bug
 2012-08-10 10:05:59 -07:00
Tom Giannattasio
538185173a added truncation for super long titles 2012-08-10 11:48:07 -04:00
Victor Shnayder
6882b4b53d responding to review comments on #383 2012-08-10 11:42:54 -04:00
Tom Giannattasio
c6d5d4aaae fixed instructor tab active state 2012-08-10 11:42:54 -04:00
Victor Shnayder
a6148856b2 make the tests work around the 404 bug 2012-08-10 11:42:54 -04:00
Victor Shnayder
c3814a81fd In-progress auth tests 
* need to actually return 404 codes to clients when DEBUG=False
* add option to make nose more verbose and drop to pdb on error
 2012-08-10 11:42:54 -04:00
Victor Shnayder
8e364e6d45 ensure float when computing module score 2012-08-10 11:42:54 -04:00
Victor Shnayder
c9fd7b22a0 Add instructor dashboard 
* dashboard links to gradebook and dummy grade summary page
 2012-08-10 11:42:53 -04:00
Victor Shnayder
43d6948f02 Fix links to student profile pages from gradebook 2012-08-10 11:42:53 -04:00
Victor Shnayder
1903a66bea Style cleanup in gradebook 
* don't display thousands of '%' characters
* s/percentage/fraction/, since that's what it is
 2012-08-10 11:42:53 -04:00
Victor Shnayder
15a4db1774 Only show enrolled students in course gradebook 
* also added todo about need for pagination
 2012-08-10 11:42:53 -04:00
Victor Shnayder
2005492f7f Remove noisy debug message 
* also adds a comment to lms/urls.py
 2012-08-10 11:41:05 -04:00
Tom Giannattasio
022c65a6b4 fixed class name header bug 2012-08-10 11:40:16 -04:00
Calen Pennington
5f44b08f9c Merge pull request #382 from MITx/feature/victor/check-access-control 
Did a quick security scan through views.
 2012-08-10 07:59:24 -07:00
Victor Shnayder
8740ba8837 Did a quick security scan through views. 
* we appear to be fairly consistent in using is_staff and has_staff_access_to_course
* cleaned up some docstrings and little code things as I went
* fixed small bug in change_enrollment view (check for non-anon user)
 2012-08-10 10:43:20 -04:00
Calen Pennington
1f1a87d970 Merge pull request #379 from MITx/feature/victor/keep-accordion-state 
Make accordion remember state
 2012-08-10 07:15:57 -07:00
Calen Pennington
e29feb089a Merge pull request #377 from MITx/feature/tomg/fall-design 
wayfinding style changes
 2012-08-10 05:51:50 -07:00
David Ormsbee
165d5dcfd3 add config files for running different server groups in dev 2012-08-10 02:02:44 -04:00
David Ormsbee
0d824c6c02 Move modx_dispatch URL calls into the course 2012-08-10 02:02:44 -04:00
Victor Shnayder
1c3038ff3a Make accordion remember state 
* use url_name to compare to passed params
* remove unused fields from template context
* Also make it possible to link to a chapter
 2012-08-09 19:47:08 -04:00
Tom Giannattasio
ced521c17d cleaned up textbook nav styles 2012-08-09 14:44:50 -04:00
David Ormsbee
b78c038bf2 Merge pull request #375 from MITx/dormsbee/new_jobs 
Dormsbee/new jobs
 2012-08-09 10:00:14 -07:00
Tom Giannattasio
3c23aca898 styled bulleted lists on jobs page 2012-08-09 12:26:32 -04:00
Tom Giannattasio
3d3ee02e52 started textbook nav styles 2012-08-09 12:16:13 -04:00
David Ormsbee
775ddf6fcc Add updated jobs descriptions for content related positions 2012-08-09 12:11:37 -04:00
Tom Giannattasio
e82582e329 added course name to global nav bar 2012-08-09 11:17:26 -04:00