Commit Graph

14265 Commits

Author SHA1 Message Date
Jason Bau
fb927dd790 Merge pull request #4450 from Stanford-Online/jbau/edx/fix-shib-student-register
fix shib reg from course about page
2014-07-17 13:53:51 -04:00
Jason Bau
be80e0058e Merge pull request #4464 from edx/jbau/remove-branch-setting-cache
removing thread-local cache for branch_setting
2014-07-17 13:03:08 -04:00
Jason Bau
f12fa05ae1 removing thread-local cache for branch_setting 2014-07-17 11:05:47 -04:00
Calen Pennington
1607b7fc0d Merge pull request #4445 from cpennington/cross-store-xml-import-export
Add tests for xml import/export between different modulestores
2014-07-17 10:55:55 -04:00
Jason Bau
e1fcac93c5 fix shib reg from course about page 2014-07-17 10:51:32 -04:00
Calen Pennington
1bc0b323b1 Explicitly create the AssetKey for all assets coming out of a ContentStore 2014-07-17 10:35:36 -04:00
Chris Dodge
4928fad415 add ability to inspect a cart for the existence of a particular type of item, e.g. PaidCourseRegistration. Only show the 'Shopping Cart' button if there's a PaidCourseRegistration in it. 2014-07-17 00:43:00 -04:00
Sarina Canelake
fba7bb91bd Merge pull request #3718 from jazkarta/idde-bugfix
Fix a bug in Individual Due Date Extensions (IDDE).
2014-07-16 11:30:10 -04:00
Sarina Canelake
666f563ee6 Merge pull request #4418 from Stanford-Online/dcadams/make_registration_button_conditional
Make text on register button on About page conditional.
2014-07-15 16:37:00 -04:00
Chris Rossi
700504c52f Fix a bug in Individual Due Date Extensions (IDDE).
The IDDE implementation relied on a StudentModule being created for a
particular block in order to set the extended due date on that block.
Since StudentModules seem to be created on demand whenever data is
written to an attribute with Scope.user_state, it meant that if a
homework problem hadn't yet been touched by a student it was possible
that the due date extension wouldn't take effect for that problem, even
if the due date extension was successfully set for the parent unit.

This patch fixes this problem by creating new StudentModules as
necessary in order to make sure extended due dates propogate properly to
all problems in a unit.
2014-07-15 15:54:55 -04:00
David Adams
aa1b623904 Make text on register button on About page conditional.
Added a new advanced setting; invitation_only

 If invitation_only display "Enrollment in this course is by invitation only"
 Otherwise, if outside of enrollment period display "Enrollment is Closed"

 This issue is logged at LMS-2670

 Also fixed in this PR is issue LMS-2717; even though the Register button was greyed out,
 clicking it sent one to the registration page.
2014-07-15 12:51:12 -07:00
Calen Pennington
4986a61877 Merge pull request #4414 from cpennington/fix-get-module-calls
Fix calls to get_module to not pass course ids as positions
2014-07-15 12:55:12 -04:00
Calen Pennington
4ded4be700 Fix calls to get_module to not pass course ids as positions 2014-07-15 09:22:04 -04:00
cahrens
66173ab9e6 Add "visible_to_staff_only" field to support staff locking in Studio.
STUD-1875
2014-07-14 14:46:40 -04:00
clytwynec
1807948f2e Merge pull request #4391 from edx/clytwynec/clean_up_lettuce_output
Clytwynec/clean up lettuce output
2014-07-14 09:09:25 -04:00
Mat Peterson
638a1aaec4 Fixed test that hardcoded url to deprecated format 2014-07-11 15:40:08 -04:00
Mat Peterson
4f6088cbd1 Fixed some isinstance errors with opaque-keys 2014-07-11 15:40:08 -04:00
Christine Lytwynec
0581d0c5a1 disabling zendesk in lettuce tests and removing help/feedback lettuce tests in favor of the existing JS ones 2014-07-11 12:01:03 -04:00
Waqas Khalid
81dfcb04aa Show thread user to staff when only anonymous_to_peers is true
FOR-122
2014-07-11 13:09:13 +05:00
Abdallah
cf16975bd2 unicode fixes 2014-07-10 17:06:16 -04:00
chrisndodge
665ccdb730 Merge pull request #4172 from edx/cdodge/ecommerce-improvements
eCommerce enhancements
2014-07-10 15:23:58 -04:00
James Tauber
256c6bb4a5 Merge pull request #4095 from edx/jtauber/open-edx-footer
Separate edX / Open edX footer
2014-07-10 15:02:11 -04:00
James Tauber
3cb8780284 Separate edX / Open edX footer.
We need to use an Open edX footer by default (and that's what all non-edx.org
instances should base their footer off) and only use the edX footer on
edx.org.

This commit uses `SITE_NAME` to determine which footer to use.

Sites using theming or micro-sites with a `SITE_NAME` not ending in `edx.org`
should not be affected.
2014-07-10 14:15:37 -04:00
Julia Hansbrough
177e8a241d Merge pull request #3858 from aboudreault/xblock-resource-missing-mimetypes
Add missing mimetypes for xblock resources
2014-07-10 13:51:16 -04:00
asadiqbal08
5734d2a883 asadiqbal08:[EX-6] Set up data models and shopping cart enhancements in the LMS
Added username into Authors file

[Ex-12] Add user to input coupon code in the Shopping Cart

[Ex-13] Discount should be reflected in the Payment confirmation page and email

added E-commerce Tab in Instructor Dashboard

added name/email in authors file

removed the is_active column, change the colors scheme, fixed bugs

wip

wip

test github account

STORE_BILLING_INFO set to True

cybersource api update, reference number updated, merchant_data removed from params

View Course buttons on receipt

link for course added to receipt

receipt.html view course button - func update

receipt.html course link update

move new CyberSource implementation to a separate file so that we can keep the original

remove config changes

remove config changes

remove coupon redemption during clear cart and update test cases

[Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)

update data model max_length to 255

remove array paid_course_ids init in views.py

removed the is_active filter=false, added styling to the inactive coupon codes

remove coupon redemption during clear cart and update test cases

[Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)

update data model max_length to 255

Add column to the list of coupons in the E-Commerce tab

Add ability for microsites to specify custom CyberSource secret configuration, i.e. run under different accounts

make the new CyberSource2 also microsite aware

updating migration for student and shopping cart apps

added user signup functionality that orignated from the Microsites

added non-microsite user signup tests

fix the hard coded callback URL to localhost

add comment

Modify e-commerce instructor tab to show a total amount above the coupon listings for admin finance user

made changes as suggested by diana khuang

add the CourseAccessRoles table to the Django Admin website

shopping cart coupon checkout changes as suggested by Jason Bau

changes are made according to the suggesstions on PR#4172

changes made in the coupons file

changes in the coupons get_coupon_info view

fix merge conflict resolution error

changes in the remove_coupon view json response

changes as suggested by David Baumgold

pep8/pylint fixes

Changes as suggested by jasonBau

don't assume item in shopping cart is a PaidCourseRegistration

fix up some logging

changed the urls of the coupon views and use the post to get the values from the request
2014-07-10 09:35:32 -04:00
Nimisha Asthagiri
8855b12b76 Update tests to allow LMS tests to use published branch setting.
Conflicts:
	cms/djangoapps/contentstore/views/tests/test_container_page.py
	common/djangoapps/external_auth/tests/test_shib.py
	common/djangoapps/student/tests/test_login.py
	common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/branding/tests.py
	lms/djangoapps/courseware/tests/test_submitting_problems.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/instructor_task/tests/test_base.py
	lms/djangoapps/instructor_task/tests/test_integration.py
2014-07-09 21:10:12 -04:00
Nimisha Asthagiri
ea32529866 Fix all modulestore calls to pass in user ids. 2014-07-09 21:10:12 -04:00
Nimisha Asthagiri
f5abef88c2 LMS-2947 remove get_error_courses in Split.
LMS-2950 move delete_course to Mongo.
2014-07-09 21:10:12 -04:00
Julia Hansbrough
545cfd8406 Merge pull request #4353 from edx/flowerhack/lms-deprecated-urls
Enables LMS to handle deprecated URLs
2014-07-09 18:23:00 -04:00
jhelbert
451953752e Merge pull request #4285 from edx/jhelbert/enrollment-mode-change-events
Jhelbert/enrollment mode change events
2014-07-09 17:57:39 -04:00
Julia Hansbrough
d9dd45662e Enables LMS to handle deprecated URLs
LMS-2651
2014-07-09 21:51:37 +00:00
Justin Helbert
e78a398f45 This emits enrollment mode changes events 2014-07-09 20:27:00 +00:00
Don Mitchell
211f0797fb Merge pull request #4294 from edx/split_mongo_assets_cherry
Split mongo assets cherry
2014-07-09 14:22:04 -04:00
Don Mitchell
cc6dfbbc75 Asset support in split
LMS-2876
2014-07-07 17:11:43 -04:00
Adam Palay
d63a5abfbc Merge branch 'rc/2014-07-02' into testmergemaster
Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py
2014-07-07 13:54:03 -04:00
Carlos Andrés Rocha
1939678958 Use deprecated course_key when calling the analytics API.
Previously it was serializing the course_key directly, which is not
interpreted correctly by the API.
2014-07-03 12:25:16 -04:00
Carlos Andrés Rocha
5be08cc231 Don't show 500 errors if connection to data API fails
Some of the metrics on the instructor dashboard are computed by the new
analytics data pipeline. Don't show 500 errors if the connection to the
pipeline API fails. Instead display that the data is not available and
log an error.

AN-1476
2014-07-03 11:42:39 -04:00
Usman Khalid
446270c0ff Moved GeneratedCertificates.MODES back inside model.
LMS-6631
2014-07-01 19:46:51 +05:00
Anton Stupak
8201c9906a Merge pull request #4038 from edx/anton/redirect-on-error
Add 401 error handler.
2014-07-01 17:03:09 +03:00
Usman Khalid
6a3d5eb079 Do not refund student if a certificate entry already exists for them.
LMS-2920
2014-07-01 16:29:07 +05:00
Clinton Blackburn
d118fb8cb2 Get active student count from new analytics data API
Disabled by default.
2014-07-01 07:18:04 -04:00
Carlos Andrés Rocha
9261a3e6b9 Merge pull request #4234 from rocha/rocha/analytics-active-count
Get active student count from new analytics data API
2014-06-30 16:53:56 -04:00
Clinton Blackburn
36cfe7ab9e Get active student count from new analytics data API
Disabled by default.
2014-06-30 15:16:30 -04:00
Jim Abramson
5d37ea83f7 Merge pull request #4216 from edx/jsa/new-post-redesign
consolidate new post form variants into single client-side template/view
2014-06-30 14:39:46 -04:00
David Baumgold
ded1a752a8 Merge pull request #4210 from bdero/bdero/fix-sysadmin-dashboard-gitlog-timezone
Make sysadmin dashboard gitlog date timezone-aware
2014-06-30 14:33:01 -04:00
jsa
994ccd1110 consolidate new post form variants into single client-side template/view 2014-06-29 20:45:22 -04:00
Nimisha Asthagiri
eecff6e0aa ModulestoreEnum class. 2014-06-27 14:37:35 -04:00
Brandon DeRosier
36873ffc92 Datetime localized on gitlog page of sysadmin dashboard 2014-06-27 12:27:50 -04:00
Nimisha Asthagiri
a9213509c3 Enable Mixed Modulestore STUD-1540
Refactor get_parent_locations STUD-1663
2014-06-26 18:00:11 -04:00
James Tauber
238b4a5df1 tests for PR 3769
Two out of three fail without PR 3769 but all pass with PR 3769.
2014-06-26 10:37:58 -04:00