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

46 Commits

Author SHA1 Message Date
Calen Pennington
e2bfcf2a36 Make course ids and usage ids opaque to LMS and Studio [partial commit] 
This commit updates common/djangoapps.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
 2014-05-07 12:54:49 -04:00
Greg Price
707ee5f2c7 Change behavior of cohort addition interface 
Instead of noting users that are already in a cohort and not changing
such users, clobber the previous cohort and display a message indicating
the previous cohort membership.

JIRA: FOR-452
 2014-04-07 11:40:51 -04:00
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
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -05:00
Will Daly
8165a033b1 Pep8/pylint fixes 
Fixed test_masquerade failure due to not clearing the modulestore
between tests.
 2013-08-21 19:42:59 -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
Jean Manuel Nater
5cb4c1a750 Removed some pep8 violations. 2013-07-01 17:07:24 -04:00
Jean Manuel Nater
72b4561e3a Moved xml_store_config, mongo_store_config, and draft_mongo_store_config to xmodule/modulestore/tests/django_util.py 
Removed some repeated instances of xml_store_config.
Reverted some changes to mongo_store_config so each modulestore gets it's own uuid.
 2013-07-01 14:45:53 -04:00
Ned Batchelder
181b1e979b Remove unused imports from common, as reported by pylint. 2013-06-19 16:56:34 -04:00
Diana Huang
2415680efd Merge pull request #1677 from MITx/victor/fix-auto-cohorting 
Fix randomness bug in cohort placement
 2013-03-20 07:50:43 -07:00
Victor Shnayder
d91008b73a Prevent random.Random() from running at import time. 2013-03-15 19:40:47 -07:00
Victor Shnayder
64e1eb9903 Fix randomness bug in cohort placement 
capa re-seeds the global RNG all the time, resulting in non-random
cohort placement.  Switch to using a local random module.

(Thanks Cale for helping me figure this out!)
 2013-03-15 11:35:27 -07:00
Calen Pennington
531eb80eb2 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.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/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	lms/djangoapps/open_ended_grading/tests.py
 2013-03-13 12:18:04 -04:00
Victor Shnayder
b06615298f Add logging to debug strange cohort behavior on prod. 
Strange behavior:
  - There are 20 cohorts that users should be randomly assigned
    into in HeroesX
  - Almost all, but not all (e.g. ~3300 / 3400) users end up in the
    same group.
  - testing manually locally and on prod in a django shell shows
    nothing wrong
 2013-03-11 15:24:14 -07: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
f519c4f571 Merge pull request #1474 from MITx/feature/victor/revert-revert-of-forums-ui 
Feature/victor/revert revert of forums ui
 2013-02-25 09:03:33 -08:00
Victor Shnayder
01a38c29be Add auto-cohorting functionality. 
See changes in xml-format.md or wiki (dynamic cohorts v1) for spec.
 2013-02-24 18:48:01 -05:00
Your Name
ff68853990 Merge branch 'master' into feature/victor/revert-revert-of-forums-ui 2013-02-21 13:30:24 -05:00
Calen Pennington
f0f7e0dc1c Fix more tests 2013-02-13 14:22:08 -05:00
Ned Batchelder
aa2d0ecaf2 We no longer need override_settings, Django has a better one. 2013-02-11 17:06:35 -05:00
Victor Shnayder
6d9a9ec46f Revert "Merge pull request #1452 from MITx/silly/victor/revert-forums-merge" 
This reverts commit e4819a1b55, reversing
changes made to b6ec41cae0.

Now that we're ready to test again, need to revert the revert to put the filtering UI back in.
 2013-02-08 15:00:25 -05:00
Victor Shnayder
2af06ef1d4 Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes" 
This reverts commit 66889b8724, reversing
changes made to 0dd9c24e74.

This was merged too early--it's still missing the filtering and display-your-cohort changes.
Will need to revert this revert later.
 2013-02-06 20:29:17 -05:00
Kevin Chugh
55c205b9b4 merged master 2013-02-06 17:13:52 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Your Name
8fd32ed502 update to show cohort name on create and cohort name on view all threads, added cohort dictionary to convert ids to names 2013-02-01 13:01:54 -05:00
Your Name
da1660a043 fix get_cohorted_commentables 2013-01-31 17:34:37 -05:00
Your Name
3fa67c1425 allow moderators and students to select cohort on post creation 2013-01-31 17:05:15 -05:00
Your Name
1fc26de945 merge master 2013-01-30 15:19:43 -05:00
Victor Shnayder
734a8bd6e5 make tests pass with cms config as well as lms 2013-01-28 15:07:44 -05:00
Victor Shnayder
46570b01ef refactor tests, add test for is_commentable_cohorted, fix a bug 2013-01-26 13:49:12 -05:00
Victor Shnayder
439acf2df7 Fix docstring and test for get_cohort 
Returns None if course isn't cohorted, even if cohorts exist.  Shouldn't happen on prod, but could if cohorting is turned off mid-course.
 2013-01-26 13:06:09 -05:00
Victor Shnayder
87e92644b6 Make all tests pass 
caveat: with a bit of hackery.  Need to do better testing once things are live.
 2013-01-25 16:13:55 -05:00
Victor Shnayder
d453a6136b fix regexp 2013-01-25 13:42:04 -05:00
Victor Shnayder
66934ce220 Address Dave's comments on https://github.com/MITx/mitx/pull/1350 2013-01-25 13:33:19 -05:00
Victor Shnayder
22ccf9c500 Some test cleanups 2013-01-24 17:33:25 -05:00
Victor Shnayder
69711a91ff Fix inline discussion cohorting, debug logging 2013-01-24 16:58:19 -05:00
Victor Shnayder
fb7614a81c oops--fix logging bug 2013-01-24 15:47:41 -05:00
Victor Shnayder
ea3aebdfe5 add logging, explicit check whether course is cohorted 2013-01-24 15:46:22 -05:00
Victor Shnayder
103db8aaf3 add conflict detection--users should be in at most one cohort per course 2013-01-24 15:14:34 -05:00
Victor Shnayder
de02721158 Add removing students from cohorts. 2013-01-24 15:14:33 -05:00
Victor Shnayder
9e84ae14d4 Started integration work with Kevin's cohort changes 
- Create new cohorts.py file
- moved code there from models.py
- implemented necessary functions.

Next: testing :)
 2013-01-24 15:14:33 -05:00
Victor Shnayder
7bdb5c23e1 Allow listing of users in cohorts and adding users 
- still needs style, more features, but basic functionality works
 2013-01-24 15:12:53 -05:00
Victor Shnayder
bab3b0c39e Add initial set of views for managing cohorts 
- lets user see and add cohorts
- needs styling
- needs to allow them to actually manage membership!
 2013-01-24 15:12:53 -05:00
Victor Shnayder
3488083e6b Add a get_course_cohorts function and test 2013-01-24 15:12:52 -05:00
Victor Shnayder
1b9a3557eb get_cohort() function and test 2013-01-24 15:12:52 -05:00
Victor Shnayder
0e78eaaf80 Add a course_groups djangoapp with a CourseUserGroup model. 2013-01-24 15:12:52 -05:00