Jason Bau
1a3953ca89
add parameterization of cybersource creds
2013-08-21 13:14:21 -04:00
Jason Bau
9e56028091
added shopping cart list template, embedded form
2013-08-21 13:14:20 -04:00
Jason Bau
b7d73933b7
initial commit of shopping cart and cybersource integration
2013-08-21 13:14:20 -04:00
Diana Huang
deb55380d5
Merge pull request #760 from edx/diana/move-course-modes-to-common
...
Move course modes to common and enable in Studio admin
2013-08-21 10:12:26 -07:00
Kevin Chugh
2f4665375f
Merge pull request #745 from edx/dave/block_forums_for_unenrolled
...
Make it so that students who are not enrolled cannot see the forum
2013-08-21 09:13:10 -07:00
Your Name
25d98778cc
Merge branch 'master' into dave/block_forums_for_unenrolled
2013-08-21 12:00:06 -04:00
Your Name
541aa08471
update forum access to include check for valid date range
2013-08-21 11:59:39 -04:00
ichuang
42af561a17
pep8 and pylint for tests of nostatic import
2013-08-21 11:23:00 -04:00
Your Name
a36e3b1957
CourseEnrollment no longer needed in forum/views
2013-08-21 11:06:30 -04:00
Peter Fogg
32de5aa09f
Fix up some SASS issues.
2013-08-21 11:03:40 -04:00
Julian Arni
7bf734221c
Fix var name issue
2013-08-21 10:49:48 -04:00
Chris Dodge
938b094679
disable the 'dont verify HTML modules' in test_export.py. This better traps the bug whereby XML-parseable HTML content was being dropped on export serialization
2013-08-21 10:32:54 -04:00
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
b539a4cb94
Update copy to include PNGs, add tests, remove default MIME type.
2013-08-21 09:42:01 -04:00
Peter Fogg
a601ede781
Update CHANGELOG.
2013-08-21 09:42:01 -04:00
Peter Fogg
f9aecb2778
Add support for PNGs as course images.
...
Also change the file uploader to accept multiple file types.
2013-08-21 09:42:00 -04:00
Brian Talbot
c626c773d8
Studio: revises styling/copy around course image management in settings
2013-08-21 09:42:00 -04:00
Peter Fogg
9632f4fed8
Address PR comments:
...
- Internationalize upload errors.
- Move upload tests into their own files.
- Refactor upload dialog acceptance tests.
2013-08-21 09:42: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
Peter Fogg
ce1a13f32c
Generalize file uploader.
...
Previously the file upload dialog was PDF- and textbook-specific. The
changes are adding parameters to the FileUpload model for the file
type, and adding an onSuccess callback to the UploadDialog view. Also
moved upload-specific SASS into its own file.
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
9b26e5bc78
dummy commit - trigger jenkins rebuild
2013-08-21 07:14:16 -04:00
ichuang
d2e93f7f7b
remove unncessary images from new test course
2013-08-20 23:46:15 -04:00
ichuang
8a84e6790b
clean up test_import_nostatic.py
2013-08-20 23:44:33 -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
Chris Dodge
d523167bdd
add another piece of test data. just an img tag.
2013-08-20 23:16:39 -04:00
Chris Dodge
b8a8b202a4
update comments and some code violation drive by fixes
2013-08-20 22:53:03 -04:00
Chris Dodge
cf7b744fec
add test files
2013-08-20 22:47:22 -04:00
Chris Dodge
596fed78f1
add docstrings
2013-08-20 22:45:37 -04:00
Chris Dodge
5a7bcd7bb3
always serialize out HTML content to a separate .html file
2013-08-20 22:43:53 -04:00
Frances Botsford
07b94f7dd4
added font variables for LMS, more sass for verification
2013-08-20 21:59:23 -04:00
Chris Dodge
5989bf6bdc
update the PDF textbook url paths as well as update wiki_slug when importing
2013-08-20 21:50:28 -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
jkarni
e79f8c437a
Merge pull request #665 from edx/feature/msteele/remove-log_event
...
Remove js log_event (keep compatibility)
2013-08-20 14:09:59 -07:00
Miles Steele
cb7a3ad8eb
switch from log_event to Logger.log
...
keep log_event for compatibility
2013-08-20 16:52:18 -04:00
Peter Baratta
5692867b14
Merge pull request #750 from edx/peterb/numerical/add-docs
...
Add docs for changes in #726
2013-08-20 13:22:43 -07: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
Peter Fogg
9065023132
Merge pull request #749 from edx/peter-fogg/fix-rename-fail-grade
...
Fix failing grade label being editable but not saved.
2013-08-20 12:53:27 -07:00
Carlos Andrés Rocha
a35a2fd389
Merge branch 'release'
2013-08-20 14:55:20 -04:00
Peter Baratta
ab2570a7bd
Add docs for changes in #726
2013-08-20 14:04:38 -04:00
Peter Fogg
533e0da101
Add acceptance test for noneditable failing grade range.
2013-08-20 13:34:41 -04:00
Peter Fogg
38165efd18
Fix failing grade label being editable but not saved.
2013-08-20 12:42:36 -04:00
