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

424 Commits

Author SHA1 Message Date
Diana Huang
47ce9082e4 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/courseware/tests/modulestore_config.py
 2013-09-13 17:15:44 -04:00
Calen Pennington
3f8a2f03ee Use a setter to make editing location possible 2013-09-13 15:05:17 -04:00
Chris Dodge
955e54c2e6 refactor some code out of the django-admin entry point into a help function in CMS. Update tests to use new method 2013-09-13 09:07:01 -04:00
Chris Dodge
2ac6d78a90 update comment 2013-09-12 16:01:51 -04:00
Chris Dodge
bf67c83340 update comment and verify seeding was done 2013-09-12 15:58:56 -04:00
Chris Dodge
615341fb65 add one more test to verify that deleting one courses forum permissions does not accidentially delete another course's forum seeding 2013-09-12 15:03:00 -04:00
Chris Dodge
bd69db4410 switch to using get() rather than get_or_create(). Also add a test case with a different casing on the courseId 2013-09-12 14:27:57 -04:00
Chris Dodge
41be20a000 define a unseeding forums permissions and call into it from delete_course 
define a unseeding forums permissions and call into it from delete_course

define a unseeding forums permissions and call into it from delete_course
 2013-09-12 14:27:57 -04:00
cahrens
1184a97b0b Do not store expanded action URLs. 
They are not portable. STUD-681.

Minor updates.
 2013-09-12 09:47:30 -04:00
chrisndodge
9c6987d010 Merge pull request #873 from edx/fix/cdodge/enable-course-image-setting 
also even when we have a marketing site, we still need a course image fo...
 2013-09-06 16:58:54 -07:00
Adam
3184939138 Merge pull request #885 from edx/release 
Release
 2013-09-06 13:51:03 -07:00
Chris Dodge
12bd7309d2 add content assertions 2013-09-06 16:03:09 -04:00
Chris Dodge
c7f2f27708 fix bug and add unit test 2013-09-06 14:47:59 -04:00
Don Mitchell
fc131fa841 Add InheritanceKVS and standardize inherited attr patterns 2013-09-06 12:19:50 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Chris Dodge
0a6565b882 also even when we have a marketing site, we still need a course image for the dashboard 2013-09-05 21:07:22 -04:00
cahrens
4e67783644 Don't show course about page link when we have the marketing site. 
STUD-733
 2013-09-05 14:26:08 -04:00
Chris Dodge
4a12cb60c9 due to the MixedModuleStore pending release, we need to make enrollment start/end dates editable in Studio 2013-09-05 12:43:24 -04:00
ichuang
4a706641f2 add test for tab names importing correctly 2013-08-27 20:03:35 -04:00
Calen Pennington
4b1fa6b316 Merge pull request #690 from cpennington/one-time-startup 
One time startup centralization
 2013-08-27 12:19:42 -07:00
Will Daly
e50a2414b2 Studio ModuleStoreTestCase subclasses now use randomized Mongo 
collection names
 2013-08-27 12:57:14 -04:00
Calen Pennington
407b02b358 Centralize startup code, and execute in all contexts 
Inspired by: http://eldarion.com/blog/2013/02/14/entry-point-hook-django-projects/
Moves startup code to lms.startup and cms.startup, and calls the startup
methods in wsgi.py and manage.py for both projects.
 2013-08-27 12:12:20 -04:00
Julian Arni
1e44e01629 Remove assert2xx 2013-08-25 22:50:26 -04:00
Julian Arni
509a861459 Clear contentstore 
Signed-off-by: Julian Arni <julian@edx.org>
 2013-08-25 22:40:11 -04:00
Julian Arni
a28b02ae2c Pep8 and pylint fixes 2013-08-25 22:40:11 -04:00
Julian Arni
eaa4b3ef99 Pep8 and pylint fixes 2013-08-25 22:40:10 -04:00
Julian Arni
d991595ecb Split import-export into new file 2013-08-25 22:40:10 -04:00
Julian Arni
993b92bc47 Add import tests 2013-08-25 22:40:10 -04:00
Will Daly
42ac76ce0c Merge branch 'master' into lapentab/fix_network_tests 
Conflicts:
	lms/djangoapps/courseware/tests/tests.py
 2013-08-23 11:48:38 -04:00
Will Daly
c680dfdd40 Merge pull request #768 from edx/will/use-mixed-modulestore-in-tests 
Will/use mixed modulestore in tests
 2013-08-23 08:38:09 -07:00
Chris Dodge
7edfd185b7 teardown the content database after tests 2013-08-22 17:35:38 -04:00
chrisndodge
0191ae9417 Merge pull request #652 from edx/feature/ichuang/import-with-no-static 
Enable mongodb to be used as back-end for git-based authoring workflow
 2013-08-22 11:05:02 -07:00
chrisndodge
1e9621cf4f Merge pull request #763 from edx/fix/cdodge/strip-transient-draft-serialization-attributes 
fix some gaps which would allow the temporary xml attributes 'parent_seq...
 2013-08-22 11:00:55 -07:00
Chris Dodge
bd412182c7 verticals shouldn't have 'data' 2013-08-22 12:01:17 -04:00
chrisndodge
2699ba65ba Merge pull request #756 from edx/fix/cdodge/incorrect-html-serialization 
Fix/cdodge/incorrect html serialization
 2013-08-22 08:58:56 -07:00
lapentab
d894a065df Stylistic changes 2013-08-22 09:28:37 -04:00
lapentab
1759191370 Remove network calls in tests 2013-08-22 08:43:28 -04:00
Chris Dodge
0c1c3f11af loop in static import testing into common/* tests 2013-08-21 20:48:56 -04:00
Chris Dodge
fb3a5bf9db remove unused class 2013-08-21 20:10:36 -04:00
Chris Dodge
ef98c54f5b fix some pylint violations 2013-08-21 20:06:10 -04:00
Chris Dodge
2ba0d40d7b fix pep8 violations 2013-08-21 20:02:58 -04:00
Will Daly
109d3c3d10 Refactored to remove test#XXX methods from ModuleStoreTestCase 2013-08-21 19:00:32 -04:00
Chris Dodge
21f4b05813 fix some gaps which would allow the temporary xml attributes 'parent_sequential_url' and 'index_in_children_list' to get persisted in the database, whereas they are meant to be only scoped during export/import 2013-08-21 14:46:38 -04:00
Peter Fogg
e177270d0d Merge pull request #700 from edx/peter-fogg/course-image-upload 
WIP: Peter fogg/course image upload
 2013-08-21 11:17:12 -07:00
ichuang
42af561a17 pep8 and pylint for tests of nostatic import 2013-08-21 11:23:00 -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
ichuang
8a84e6790b clean up test_import_nostatic.py 2013-08-20 23:44:33 -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
Chris Dodge
d523167bdd add another piece of test data. just an img tag. 2013-08-20 23:16:39 -04:00
Chris Dodge
5a7bcd7bb3 always serialize out HTML content to a separate .html file 2013-08-20 22:43:53 -04:00