cahrens
e487521289
Update for change in add_user_to_creator_group API.
2013-06-26 10:52:26 -04:00
cahrens
2c60a7dbc1
pep8 cleanup
2013-06-26 10:52:26 -04:00
cahrens
318372f2c0
Introduce course creator group.
2013-06-26 10:48:31 -04:00
JonahStanley
3f9a72e6ce
Consolidated imports
2013-06-21 16:32:13 -04:00
JonahStanley
5e6de488ab
Fixed pylint/pep8 violations
2013-06-21 16:28:32 -04:00
JonahStanley
58fe6d4e83
Cleaned up import and comment
2013-06-21 16:17:33 -04:00
JonahStanley
fa18b48f6e
Contentstore singleton is now cleared during teardown
2013-06-21 08:51:44 -04:00
JonahStanley
51f8c0cfeb
Added the beginnings of self cleanup
2013-06-21 08:51:44 -04:00
Jay Zoldak
f90ed69cd7
move override of MODULESTORE settings into ModuleStore test case class
2013-06-21 08:51:44 -04:00
JonahStanley
e4af7287b6
Initial testing for parallelization
2013-06-21 08:51:43 -04:00
Ned Batchelder
3eec09b87a
Merge pull request #216 from edx/ned/remove-unused-imports
...
Ned/remove unused imports
2013-06-20 14:15:31 -07:00
cahrens
34f8c044b8
Pep8 cleaning.
2013-06-20 16:06:00 -04:00
cahrens
a498fa52ba
Modify after UX text changes.
2013-06-20 11:29:31 -04:00
cahrens
d601cee8e5
Merge branch 'master' into christina/course-settings-drupal
2013-06-20 11:00:12 -04:00
Ned Batchelder
645d847bb1
Remove unused imports from cms, as detected by pylint.
2013-06-19 16:56:34 -04:00
cahrens
29d93aff89
pep8 fixes.
2013-06-19 16:34:23 -04:00
cahrens
6e96b88518
On marketing site, disable course settings options that do not work.
...
When on the marketing site (edx.org) disable portions of the course settings page in Studio that do not actually work in that environment.
2013-06-19 11:28:16 -04:00
Don Mitchell
1ff022e181
Incidental pep8 changes
2013-06-18 17:25:06 -04:00
Don Mitchell
b151d6c155
Merge pull request #183 from edx/dhm/timeconv/bug0
...
Fix a few remaining tz naive dates
2013-06-18 09:09:24 -07:00
Chris Dodge
53f18f27b9
need to comment out another thumbnail check due to build test environment not having libjpeg installed
2013-06-17 15:59:14 -04:00
Chris Dodge
a52f62a923
disable assertions on thumbnail generation as it puts a system requirement on libjpeg which may not be installed on the test machines
2013-06-17 14:59:48 -04:00
Don Mitchell
085a590bdd
timezone conversion: more unit tests
...
and code reorganization
2013-06-17 14:48:18 -04:00
Chris Dodge
7cebb873df
allow for an optional throw_on_not_found on contentstore().find() so we can clean up caller logic in the tests
2013-06-17 11:10:36 -04:00
Chris Dodge
dc94ea1041
add unit test for emptying the trashcan
2013-06-17 11:10:36 -04:00
Chris Dodge
70ee4b8060
add unit tests for asset delete/restore
2013-06-17 11:10:35 -04:00
cahrens
fae8fd3841
Merge branch 'master' into feature/christina/unify-fields
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/fields.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/test_fields.py
requirements/edx/github.txt
2013-06-13 10:55:13 -04:00
cahrens
86d952bf91
Change to putting serialize/de-serialize directly in xml_module.
2013-06-12 13:34:38 -04:00
Don Mitchell
e4757452f0
Partial implementation of means to get xmodule from descriptor and
...
attempt to test xmodule_modified (see fixme)
Removed obsolete else clause from before conversion
Ensure factories use datetime not struct_time for start date
Added more unit tests for settings encoder
2013-06-10 17:16:35 -04:00
Don Mitchell
28f8910db4
Make pymongo tz_aware
2013-06-10 17:16:34 -04:00
Don Mitchell
e47f8b1765
Coding consistency changes for code review.
2013-06-10 17:16:34 -04:00
Don Mitchell
d7194e6bec
struct_time to datetime conversion.
2013-06-10 17:16:34 -04:00
Don Mitchell
976280e693
Merge pull request #110 from edx/bug/dhm/baddrafts
...
Have the draft module store actively prevent non-leaf nodes from being
2013-06-10 12:01:49 -07:00
Chris Dodge
0c6991822b
move test so it doesn't split the tests from a helper method
2013-06-10 12:46:03 -04:00
Chris Dodge
d9ce3162e0
partial fix for STUD-145, catch invalid location errors and return a HTTP 400 error to client
2013-06-10 11:47:37 -04:00
Don Mitchell
2266028921
Have the draft module store actively prevent non-leaf nodes from being
...
saved as draft.
2013-06-07 15:40:30 -04:00
cahrens
c715edf57a
Strip off https://
2013-06-06 10:55:41 -04:00
cahrens
39397c5c2f
Bullet-proofing for MKTG_URLS.
2013-06-06 10:29:10 -04:00
Chris Dodge
4391783248
add exporting of 'about' content as well as adding unit test checks
2013-06-05 12:40:09 -04:00
Peter Fogg
779f86c440
Merge pull request #46 from edx/peter-fogg/single-click-video-creation
...
Peter fogg/single click video creation
2013-06-04 11:08:40 -07:00
Peter Fogg
e982d7fcdc
Refactor test_contenstore to remove code duplication.
2013-06-04 13:22:08 -04:00
Peter Fogg
266938a7b3
Finish the comment I forgot about...
2013-06-03 16:55:28 -04:00
Peter Fogg
90bbff8965
Add test to be sure that advanced components require multiple clicks.
2013-06-03 16:53:14 -04:00
cahrens
38e3ff13ed
pep8 cleanup.
2013-06-03 15:32:42 -04:00
cahrens
93be67d49a
Fix bug STUD-103. The url base for about page links needs to be www.edx.org for Drupal site, vs. LMS_BASE which is used for Studio. Note that the complete URL is still not correct, but a redirect exists to take it to the new location.
2013-06-03 15:21:02 -04:00
chrisndodge
7735e37585
Merge pull request #8 from edx/valera/fix_videoalpha_studio_integration
...
Added videoalpha to advanced components in component.py file.
2013-06-02 13:04:33 -07:00
Chris Dodge
6fb520f21e
add peer grading to the advanced components check
2013-06-02 14:39:36 -04:00
Chris Dodge
91d3f4ddff
add simple content check for the activation page when the user is not logged in
2013-06-02 00:43:17 -04:00
Chris Dodge
c0899463e3
remove unused import reference
2013-06-02 00:18:35 -04:00
Chris Dodge
ba9a5b3824
add simple check on whether the expected advanced modules appear in the edit unit page when turned on
2013-06-02 00:15:34 -04:00
cahrens
aca5cbb215
Merge branch 'master' into bug/christina/preview_url
2013-05-28 12:13:19 -04:00
