Commit Graph

24324 Commits

Author SHA1 Message Date
Mat Peterson
aee47b44df Testing for bugs off master for opaque-keys deprecation 2014-07-11 15:40:08 -04:00
Minh-Tue Vo
5f404ba23f Merge pull request #4395 from edx/mvo/unittests_alone
Setting default system to be lms in unittests
2014-07-11 15:27:07 -04:00
Ben McMorran
3d409cf323 Merge pull request #4390 from edx/benmcmorran/defensive-has-changes
Defensively checks that children exist in has_changes
2014-07-11 15:13:35 -04:00
Minh Tue Vo
be3c517f2a setting default system to be lms 2014-07-11 14:44:43 -04:00
Jay Zoldak
1999a72690 Merge pull request #4393 from edx/zoldak/disable-video-lang-test
Disable failing video language test
2014-07-11 14:02:55 -04:00
Jay Zoldak
dc14530a9e Disable failing video language test 2014-07-11 13:04:02 -04:00
Ben McMorran
cccb5cd7b6 Defensively checks that children exist in has_changes 2014-07-11 11:30:31 -04:00
Mark Hoeber
b781013b0b Merge pull request #4387 from edx/markhoeber/documentation/doc-748
Added discussion label change to release notes
2014-07-11 10:12:15 -04:00
Mark Hoeber
557697016e Added discussion label change to release notes 2014-07-11 10:03:19 -04:00
Alison Hodges
fb18555a1b Merge pull request #4376 from edx/ahodges/documentation/activestudents
New "Active Students" data on instructor dash
2014-07-11 09:18:39 -04:00
Alison Hodges
208b24de1a New "Active Students" data on instructor dash 2014-07-11 09:18:15 -04:00
Sarina Canelake
b0170a5c30 Merge pull request #4379 from Stanford-Online/kluo/exclude-browser-translation
Subsume browser links to variables, to exclude from translation
2014-07-11 08:44:02 -04:00
Waqas Khalid
a9f751d947 Merge pull request #4297 from mlkwaqas/waqas/for122-anonymous-post-are-anonymous-to-staff
Show thread user to staff when only anonymous_to_peers is true
2014-07-11 16:47:46 +05: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
Kevin Luo
92381f0f84 Subsume browser links to variables, to exclude from translation 2014-07-10 15:40:51 -07:00
Ned Batchelder
d94b92026b Merge pull request #4377 from edx/ned/fix-pr-4168
unicode fixes
2014-07-10 18:01:50 -04:00
Ned Batchelder
84cfea8ead Remove an unneeded unicode conversion 2014-07-10 17:06:16 -04:00
Abdallah
cf16975bd2 unicode fixes 2014-07-10 17:06:16 -04:00
Julia Hansbrough
e8d264f870 Merge pull request #4368 from lduarte1991/lduarte-harvardx-pr9
Annotation Tool: Removed color bug from Flagging and HighlightTags plugins
2014-07-10 15:41:22 -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
Sarina Canelake
50709c163f Merge pull request #4367 from edx/sarina/i18n-course-handouts
i18n LMS and Studio components of course handouts
2014-07-10 14:47:23 -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
James Tauber
d7e6f94a09 Merge pull request #3191 from eduNEXT/feature/fmo/microsite-wiki
Feature/fmo/microsite wiki
2014-07-10 13:18:53 -04:00
Sarina Canelake
a5dc426cc8 i18n LMS and Studio components of course handouts 2014-07-10 11:28:00 -04:00
lduarte1991
a5d8669f68 Annotation Tool: Removed conflict between tags-annotator and flagging-annotator 2014-07-10 11:20:29 -04:00
Alison Hodges
19a3410b4b Merge pull request #4321 from edx/ahodges/documentation/FOR595
Updated with UI and terminology changes
2014-07-10 11:12:33 -04:00
Alison Hodges
5eb17f80ca Updated with UI changes in Studio and LMS, terminology 2014-07-10 11:11:47 -04:00
Alison Hodges
7d26594b16 Merge pull request #4312 from edx/ahodges/documentation/DOC158mslotke
Edits from Michele
2014-07-10 11:06:22 -04:00
Alison Hodges
e654c3dce6 Edits from Michele 2014-07-10 11:05:40 -04:00
Mark Hoeber
728238ef3b Merge pull request #4284 from edx/sylvia/docs/relnotes_7_2
Sylvia/docs/relnotes 7 2
2014-07-10 10:58:11 -04:00
Adam
379edd2317 Merge pull request #4352 from edx/release
Release
2014-07-10 10:54:16 -04:00
Sylvia Pearce
364ee10ae0 Release notes for 7-9-2014 2014-07-10 10:20:23 -04:00
Dave St.Germain
60349e3a00 Merge pull request #3504 from edx/dcs/LMS-1308
Make wiki links not look inactive. Fixes LMS-1308
2014-07-10 10:11:05 -04:00
Dave St.Germain
671772256a Make wiki links not look inactive 2014-07-10 10:10:11 -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
muhammad-ammar
cd11d5b69e Merge pull request #4307 from edx/ammar/bok-choy-video-handout-tests
CMS Video Handout Tests
2014-07-10 14:34:22 +05:00
Muhammad Ammar
81a5a7b962 CMS Video Handout Tests 2014-07-10 05:45:49 +00:00
Nimisha Asthagiri
6fa96cf03d Merge pull request #4339 from edx/nimisha/fix-user-ids
Nimisha/fix user ids and LMS tests branch setting
2014-07-09 21:11:43 -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
Nimisha Asthagiri
cd8f0e6ced Merge pull request #4309 from edx/nimisha/refactor_mixed_context_managers
Nimisha/refactor mixed context managers
2014-07-09 17:01:08 -04:00
Justin Helbert
e78a398f45 This emits enrollment mode changes events 2014-07-09 20:27:00 +00:00
Christina Roberts
227205fb10 Merge pull request #4344 from edx/christina/revert_to_published
Add revert_to_published method.
2014-07-09 16:01:13 -04:00
Nimisha Asthagiri
ce9aea80b1 Move context_managers to base class, overridden by mixed. 2014-07-09 15:55:53 -04:00