JonahStanley
1d7284b7cd
Refactored out more for feature flags
...
Refactored more for feature flags
2013-08-21 16:05:01 -04:00
JonahStanley
f4c19919cd
Beginnings of a feature flag
...
Conflicts:
common/djangoapps/terrain/browser.py
Changed way feature flag was checked
Conflicts:
common/djangoapps/terrain/browser.py
2013-08-21 16:05:00 -04:00
Diana Huang
bd4cc448af
Clean up models, add some error handling
2013-08-21 15:55:30 -04:00
Frances Botsford
c392349fb0
adjusted controls for v photos
2013-08-21 15:40:08 -04:00
Frances Botsford
abd678e464
initial step interaction for verification
2013-08-21 15:27:37 -04:00
Diana Huang
e2ae0b2970
Remove line_cost from OrderItem
2013-08-21 14:49:18 -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
Jason Bau
ef4e8f7e13
move currency formatting into template
2013-08-21 10:31:26 -07:00
Jason Bau
f59e7edb8f
minor changes to PaidCourseRegistrationTest.test_purchased_callback
2013-08-21 13:16:06 -04:00
Jason Bau
1c2d84077b
100% coverage on shoppingcart/models.py
2013-08-21 13:15:37 -04:00
Diana Huang
42f8b970fc
Clean up views and models.
2013-08-21 13:14:23 -04:00
Diana Huang
76766cbcae
Some pep8/pylint cleanup
2013-08-21 13:14:22 -04:00
Jason Bau
d38748b300
100% coverage on CyberSource.py
2013-08-21 13:14:22 -04:00
Jason Bau
3da149ad76
Start of tests for CyberSource processor
2013-08-21 13:14:22 -04:00
Jason Bau
3ecdb6711f
change method sig of process_postpay_callback
2013-08-21 13:14:22 -04:00
Jason Bau
64c8a7444f
add handling of CyberSource non-ACCEPT decisions
2013-08-21 13:14:22 -04:00
Jason Bau
efbb439cb5
Adding migration to store purchased mode in PaidCourseRegistration
2013-08-21 13:14:22 -04:00
Jason Bau
65f2814d73
make PaidCourseRegistration mode aware
2013-08-21 13:14:22 -04:00
Diana Huang
c5f353ec05
Major cleanup work on ShoppingCart models
...
* Make currency a property of the Order (for validation purposes)
* Remove null=True from Char fields
* Use InheritanceManager for subclassing OrderItem
* Change VerifiedCertificate to better handle some new use cases
* Cleaned out old migrations
* Tests!
2013-08-21 13:14:21 -04:00
Diana Huang
38ba856ddc
Start building tests
2013-08-21 13:14:21 -04:00
Diana Huang
88f54fff20
Put shopping cart views behind flags
2013-08-21 13:14:21 -04:00
Diana Huang
77ee243e77
Some cleanup fixes to get verified certs working.
2013-08-21 13:14:21 -04:00
Diana Huang
d6e777bc1b
Remove enrollment_cost from course_module
2013-08-21 13:14:21 -04:00
Diana Huang
cff5491f8c
Pull CyberSource values from environment variables
...
when in a dev environment.
2013-08-21 13:14:21 -04:00
Diana Huang
d719f14a52
Add in new VerifiedCertificate order item
2013-08-21 13:14:21 -04:00
Jason Bau
a4f5f4e42f
about page changes, refactor processor reply handling
2013-08-21 13:14:21 -04:00
Jason Bau
0b8f41443f
Lots more verification of CyberSource reply + receipt generation
2013-08-21 13:14:21 -04:00
Jason Bau
cf9d42772f
factor out cybersource processor from cart
2013-08-21 13:14:21 -04:00
Jason Bau
ab1452cb1a
add Order model fields for receipt generation
2013-08-21 13:14:21 -04:00
Jason Bau
1f6bdca6dd
add Validation function for cybersource receipt POST
2013-08-21 13:14:21 -04:00
Jason Bau
ed4e7f54c7
Move shopping cart from session into model/db
2013-08-21 13:14:21 -04:00
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
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
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
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
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
Frances Botsford
07b94f7dd4
added font variables for LMS, more sass for verification
2013-08-20 21:59:23 -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
