Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

22621 Commits

Author SHA1 Message Date
Will Daly
96c2a50370 Merge branch 'master' into will/use-mixed-modulestore-in-tests 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/django.py
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/courseware/tests/tests.py
 2013-08-21 10:12:24 -04:00
Diana Huang
70e1c70e4f Move course modes to common and enable in Studio 2013-08-21 09:59:15 -04:00
Your Name
b317d45ffb add missing imports 2013-08-21 09:49:09 -04:00
Peter Fogg
e4302e62d2 Allow course image uploads in the settings page. 
Authors can upload an image (or choose an existing one) from the
settings page, using the in-context uploader from PDF
textbooks. Includes tests for backwards compatibility with XML courses
-- they used a magic filename (images/course_image.jpg) which is
mapped to a location in the Mongo contentstore.

Still needs some UX work, though the backend plumbing is there.
 2013-08-21 09:42:00 -04:00
Will Daly
48c6daacb8 Removed unnecessary settings wrangling from ModuleStoreTestCase. 
Modified navigation tests to use MixedModulestore
Updated factories to find editable modulestore

Updated test_submitting_problems

Updated test_tabs.py

Updated test_view_authentication

Updated test_views

Updated courseware/tests/tests.py

Updated test_masquerade

Updated test_module_render

Pylint fixes

Updated video and word cloud tests

Updated course wiki tests

Updated license and open_ended tests.
One open_ended test still failing due to Mako initialization issues

Updated staticbook

Updated django_comment_client tests

Updated instructor tests

Updated instructor task tests

Updated external_auth tests

Updated course_groups
 2013-08-21 09:36:45 -04:00
ichuang
0d938d3940 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static 
Conflicts:
	lms/djangoapps/courseware/tests/test_module_render.py
 2013-08-20 23:40:09 -04:00
ichuang
95952bd693 add tests of static_asset_path and importing with no static; 
fix (again) static_replace to work with static_asset_path
 2013-08-20 23:30:26 -04:00
Frances Botsford
07b94f7dd4 added font variables for LMS, more sass for verification 2013-08-20 21:59:23 -04:00
Kevin Chugh
08aafc58ea refactor to add access control to already_existing access control routines in access.py 2013-08-20 19:43:46 -04:00
Kevin Chugh
a2bbb65dcf refactor to add access control to already_existing access control routines in access.py 2013-08-20 19:42:03 -04:00
ichuang
91bf6ad86d remove extra debugging line from courses.py 2013-08-20 18:11:40 -04:00
ichuang
fedfa7cab7 fix tabs.py to properly handle static_asset_path 2013-08-20 18:09:57 -04:00
ichuang
2fe4895e43 more static_asset_path handling in courses.py 2013-08-20 18:09:27 -04:00
ichuang
210fa112f3 modify handling of info/handouts and module_render to honor static_asset_path 2013-08-20 18:08:01 -04:00
Miles Steele
cb7a3ad8eb switch from log_event to Logger.log 
keep log_event for compatibility
 2013-08-20 16:52:18 -04:00
Frances Botsford
2e821be65f adding some standard sass bits to LMS and bare bones sass for verification 2013-08-20 16:04:48 -04:00
Christina Roberts
1a8b2fa0eb Merge pull request #735 from edx/fix/cdodge/pylint-violations 
address some pylint violations in the mixedmodulestore build report
 2013-08-20 05:42:55 -07:00
chrisndodge
c33571ff98 Merge pull request #732 from edx/fix/cdodge/get_items_needs_courseid 
Fix/cdodge/get items needs courseid
 2013-08-19 21:26:12 -07:00
Chris Dodge
6a3dafeed6 update hint manager to pass in a course_id when dereferencing a module 2013-08-19 23:42:27 -04:00
Chris Dodge
bc5e27fe17 update some more call sites in LMS to always pass in a course_id 2013-08-19 23:42:26 -04:00
Chris Dodge
a16aee340a get_items should take a course_id 2013-08-19 23:42:26 -04:00
Chris Dodge
2e1eb1dce5 add escaping 2013-08-19 23:41:49 -04:00
Chris Dodge
f599d4b508 don't put the substitutions in quotes 2013-08-19 23:41:49 -04:00
Chris Dodge
352e56eb4e address some pylint violations in the mixedmodulestore build report 2013-08-19 23:40:46 -04:00
David Ormsbee
013009ea24 Let staff have access to a forum even if they're not enrolled in the course. 2013-08-19 17:27:23 -04:00
David Ormsbee
c2d1791de4 Make it so that students who are not enrolled cannot see the forum 2013-08-19 17:09:47 -04:00
Jonah Stanley
73ad057eff Merge pull request #710 from edx/jonahstanley/help-acceptance-test 
Jonahstanley/help acceptance test
 2013-08-19 14:02:29 -07:00
Frances Botsford
94c442c9cc initial rough skeleton for verification flow 2013-08-19 16:48:36 -04:00
Adam Palay
cb3429570c set first FAQ link to mktg webiste too 2013-08-19 16:34:17 -04:00
Adam
bd45103fe9 Merge pull request #728 from edx/fix/adam/dash-delete 
fixes delete state on dashboard
 2013-08-19 07:45:59 -07:00
Diana Huang
9469991f52 Merge pull request #713 from edx/diana/button-updates 
Drupal side Register button updates
 2013-08-19 07:28:45 -07:00
Brian Talbot
fc4eb3786a mktg - revised sass/css for iframed button to match styles/consistency 2013-08-19 10:25:29 -04:00
Adam Palay
2e47d61cef fixes delete state on dashboard 2013-08-19 10:22:42 -04:00
JonahStanley
ce5d9b93b1 Added the full range of help modal options 
Fixed pylint violations
 2013-08-19 09:56:57 -04:00
chrisndodge
7aa4418934 Merge pull request #723 from edx/fix/cdodge/bad-links-can-cause-exception-on-rewrite 
Fix/cdodge/bad links can cause exception on rewrite
 2013-08-19 06:33:55 -07:00
ichuang
220ec522a1 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static 
Conflicts:
	common/djangoapps/static_replace/__init__.py
	common/djangoapps/xmodule_modifiers.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/module_render.py
 2013-08-19 08:24:35 -04:00
Anton Stupak
7a68516d12 Fix formatting. 2013-08-19 10:39:52 +03:00
Anton Stupak
a921e44aa3 Fix steps. 2013-08-19 10:39:52 +03:00
Anton Stupak
d848477596 Remove unecessary assert. 2013-08-19 09:10:50 +03:00
Chris Dodge
033f922ec0 add a try catch around the staticstorage lookup, which can throw an exception 2013-08-17 10:33:59 -04:00
chrisndodge
594a73d437 Merge pull request #722 from edx/feature/cdodge/add-a-mixed-modulestore 
Feature/cdodge/add a mixed modulestore
 2013-08-17 07:32:51 -07:00
chrisndodge
8ba3214cd4 Merge pull request #496 from edx/feature/cdodge/add-a-mixed-modulestore 
Add a 'MixedModuleStore' which aggregates between XML and Mongo Modulestores
 2013-08-16 13:02:31 -07:00
JonahStanley
fc899ab116 Stylistic change and factored out method to common 2013-08-16 15:30:35 -04:00
Diana Huang
af76997ccd Add in a uniqueness constraint on mode, course, and currency. 2013-08-16 15:26:57 -04:00
Vik Paruchuri
59336ee03c Fix prompt hiding issue in peer grading 2013-08-16 15:24:38 -04:00
Vik Paruchuri
bc8244b709 Rename reset to try again, hide and disable submit buttons 2013-08-16 14:43:37 -04:00
Carlos Andrés Rocha
4e0f3d0791 Merge pull request #706 from rocha/enable-django-nose-for-all 
Enable the django_nose app by default
 2013-08-16 11:29:43 -07:00
Vik Paruchuri
4f3ec68fb7 Scroll to top in peer and staff grading, preserve line breaks in submissions 2013-08-16 14:12:37 -04:00
Vik Paruchuri
be3291eeb0 Proper scoping, show status to staff, fix line break issues, multiple self assessments on one page work 2013-08-16 13:22:34 -04:00
Frances Botsford
d4ea8388a6 updated styling for marketing side register button to accommodate second line of text - and IE-specific styling 2013-08-16 11:28:07 -04:00