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

174 Commits

Author SHA1 Message Date
Jay Zoldak
bc30addfb9 Unicode changes to support QRF 
fixing unit tests

fixing merge error

fixing xqueue submission issue with unicode url (trial 0.1)

fixing fotmats as commented upon

removing yaml file language selection

Unicode changes to support QRF

removed unnecessary pass in modulestore/init.py

fixing merge error

fixing fotmats as commented upon

removing yaml file language selection

fixing pep8 violations

- fixing pylint violations

pylint violation

fixing line spaces and formats

ignore pylint E1101

remove empty line

fixing pylint violations

 pep8 violations

bulk mail unicode/decode

fix migration error

fix pep8 just to push again

more unicode/decode
Final changes to comments and error messages.
 2014-01-30 16:20:36 -05:00
Oleg Marshev
13c19c98e2 Add role parameter to LTI. BLD-583. 2014-01-30 14:37:33 +02:00
Don Mitchell
d999d0af1b Detached categories don't access control on date 2014-01-17 17:53:14 -05:00
Don Mitchell
858e354a6d Moved roles.py to common student 2014-01-14 17:04:43 -05:00
Calen Pennington
417fe21d05 Enable pure XBlocks, but behind a feature flag 
[LMS-226]
[LMS-2013]
 2014-01-10 11:40:03 -05:00
Carson Gee
cbb6e5e686 Changed default user to be anonymous in both has_access and student.views.index 
Replaced existing test_none_user_index_access_with_startdate_fails
test with new test now that the tested function has changed and
was causing the original test to fail.
 2013-12-15 09:56:37 -05:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
Calen Pennington
c0f570ceab Fix [LMS-1528] (500 error when checking for beta access) 2013-11-22 13:00:45 -05:00
Calen Pennington
061a46beef Formalize various access roles as objects 
This centralizes the logic for group membership, and means that we
don't need to make queries to find out whether the legacy groups names exist.
 2013-11-13 13:42:37 -05:00
Calen Pennington
68c182c055 Optimize and cache the query to find the list of groups a user is in 2013-11-13 09:03:02 -05:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Your Name
541aa08471 update forum access to include check for valid date range 2013-08-21 11:59:39 -04:00
Your Name
b317d45ffb add missing imports 2013-08-21 09:49:09 -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
Jean Manuel Nater
3c67e2754a Merge branch 'master' into jnater/courseware_tests 
Conflicts:
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/instructor/tests/test_enrollment.py
 2013-06-27 13:53:47 -04:00
Jean Manuel Nater
7f017d0ca9 Addressed pull request feedback 2013-06-26 17:19:13 -04:00
Don Mitchell
8b23eeca7e Minor pylint/whitespace changes 2013-06-25 22:34:29 -04:00
Jean Manuel Nater
1b94050ef6 Merge branch 'master' into jnater/courseware_tests 
Conflicts:
	lms/djangoapps/open_ended_grading/tests.py
 2013-06-21 16:38:31 -04:00
Jean Manuel Nater
9bfddd4891 Addressed pull request feedback. 2013-06-21 14:05:57 -04:00
Jason Bau
07e56ac43b Merge pull request #67 from edx/features/jbau/stanford-shib 
Shibboleth Auth
 2013-06-21 09:32:30 -07:00
Ned Batchelder
61b53713d2 Remove unused imports from lms, as detected by pylint. 2013-06-19 16:56:34 -04:00
Jason Bau
824fb9a311 The bulk of Shibboleth authentication for Stanford 
Highlights:
* The url '/shib-login/' interfaces with apache/mod_shib via
  request.META to handle shibboleth login and registrations
* Courses can designate 'enrollment_domains' to limit enrollment
  to users with a linked ExternalAuthMap verified by a particular
  identity provider
* Tests
* Logging

 Changes to be committed:

	new file:   common/djangoapps/external_auth/migrations/0001_initial.py
	new file:   common/djangoapps/external_auth/migrations/__init__.py
	new file:   common/djangoapps/external_auth/tests/test_shib.py
	modified:   common/djangoapps/external_auth/views.py
	modified:   common/djangoapps/student/views.py
	modified:   common/lib/xmodule/xmodule/course_module.py
	modified:   lms/djangoapps/courseware/access.py
	modified:   lms/djangoapps/courseware/tests/test_access.py
	modified:   lms/envs/common.py
	modified:   lms/envs/dev.py
	modified:   lms/envs/test.py
	modified:   lms/templates/courseware/course_about.html
	modified:   lms/templates/dashboard.html
	modified:   lms/templates/extauth_failure.html
	modified:   lms/templates/navigation.html
	modified:   lms/templates/register.html
	modified:   lms/templates/signup_modal.html
	modified:   lms/urls.py
	renamed:    lms/wsgi_apache.py -> lms/wsgi_apache_lms.py
 2013-06-19 00:48:18 -07:00
Jean Manuel Nater
97275a3286 Refactored some of the classes in tests.py to not unnecessarily depend on the XML modulestore. 
Conflicts:
	lms/djangoapps/courseware/tests/test_navigation.py
	lms/djangoapps/courseware/tests/test_view_authentication.py
	lms/djangoapps/courseware/tests/tests.py
 2013-06-18 13:54:16 -04:00
Don Mitchell
d7194e6bec struct_time to datetime conversion. 2013-06-10 17:16:34 -04:00
ichuang
6cbd353992 make masquerade work properly even if DISABLE_START_DATES true 2013-04-20 11:57:56 -04:00
ichuang
857a6e0bd0 pylint masquerade fixes 2013-04-13 22:47:28 -04:00
ichuang
fb0a23238a allow staff to masquerade as student - works 
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/course_navigation.html
 2013-04-13 22:46:39 -04:00
Calen Pennington
1bfb933518 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	cms/templates/edit_subsection.html
	cms/templates/overview.html
	cms/templates/unit.html
	cms/templates/widgets/header.html
	common/djangoapps/course_groups/tests/tests.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/js/src/.gitignore
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml_exporter.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/open_ended_grading/tests.py
 2013-03-04 16:33:40 -05:00
David Ormsbee
1d4defd0ea Fix bug where we weren't combining org_staff with built-in staff for group checking 2013-03-01 10:54:57 -05:00
David Ormsbee
bfe2809a87 Merge branch 'master' into bugfix/dave/too_many_sql_queries 
Conflicts:
	lms/djangoapps/courseware/access.py
 2013-03-01 10:11:35 -05:00
John Jarvis
48242d3a06 Adding instructor_<org> 2013-02-27 15:30:07 -05:00
John Jarvis
ce2f1400e6 formatting 2013-02-27 15:05:02 -05:00
John Jarvis
7c0d9ff156 Creating group for organization staff access 2013-02-27 14:55:17 -05:00
Calen Pennington
bd822b9d2f Fix tests post-merge 2013-02-13 14:13:22 -05:00
David Ormsbee
5d894fdf03 Typo fix 2013-02-11 10:24:07 -05:00
David Ormsbee
04deb30fb6 Factor out the access group generation so we can check staff/instructor status without DB lookup. 2013-02-11 10:17:57 -05:00
Calen Pennington
4f555f6480 Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model 
Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/module_info_model.py
	cms/djangoapps/contentstore/tests/factories.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/djangoapps/models/settings/course_details.py
	cms/djangoapps/models/settings/course_grading.py
	cms/templates/edit_subsection.html
	common/djangoapps/mitxmako/shortcuts.py
	common/djangoapps/static_replace.py
	common/djangoapps/util/converters.py
	common/djangoapps/xmodule_modifiers.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/abtest_module.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/discussion_module.py
	common/lib/xmodule/xmodule/error_module.py
	common/lib/xmodule/xmodule/html_module.py
	common/lib/xmodule/xmodule/js/src/video/display.coffee
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	common/lib/xmodule/xmodule/raw_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_export.py
	common/lib/xmodule/xmodule/tests/test_import.py
	common/lib/xmodule/xmodule/video_module.py
	common/lib/xmodule/xmodule/x_module.py
	common/lib/xmodule/xmodule/xml_module.py
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/templates/staff_problem_info.html
	lms/templates/video.html
	rakefile
 2013-02-07 15:12:30 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Calen Pennington
75b0a8eed6 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2013-01-22 14:47:52 -05:00
Calen Pennington
bbcab7314a Anonymous users don't have an email attribute, and shouldn't be checked for CourseEnrollmentAllowed 2013-01-22 14:10:01 -05:00
Chris Dodge
0efd6e6a15 Merge branch 'master' into feature/cdodge/cms-master-merge4 2013-01-18 16:14:27 -05:00
Victor Shnayder
1411bd1a88 fix tests--nosetests is overly excited about my code 2013-01-18 15:39:28 -05:00
Chris Dodge
22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 
Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt
 2013-01-17 09:15:37 -05:00
Victor Shnayder
02d5cfd14d add comment about time format conversion 2013-01-15 11:44:27 -05:00
Victor Shnayder
1a5fc065ad Add beta test group management view to instructor dashboard 
* still needs to support uploading a list
* also want to clean up and refactor the code a bit
 2013-01-15 11:44:26 -05:00
Victor Shnayder
58a9fdeddc add note about settings needed for manual testing 2013-01-15 11:36:25 -05:00
Victor Shnayder
3e5a2f9bde Add beta test group support 
* add a days_early_for_beta inherited policy option
* students in the beta_testers_{COURSE} group get to see content that many days early
* Clean up some docstrings related to time formats
* Add basic test
 2013-01-15 11:36:25 -05:00
ichuang
ec94f7328c remove try...except workaround for circular import bug fixed by https://github.com/MITx/mitx/issues/1260 2013-01-10 23:32:48 -05:00
ichuang
e5c958082b list/add/delete instructors on instructor dashboard 2013-01-10 23:32:48 -05:00