Commit Graph

28558 Commits

Author SHA1 Message Date
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
Don Mitchell
3d2ca4f7d2 Deleting a private unit should remove it from the course
STUD-1962
2014-07-10 11:55:51 -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
Don Mitchell
cb2422a3e2 Unit test to demonstrate bug 2014-07-10 09:14:37 -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
Jay Zoldak
557a252314 Merge pull request #4317 from edx/zoldak/increase-sqlite-timeout
Increase the test SQLite DB timeout. TE-397
2014-07-09 14:40:58 -04: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
Minh-Tue Vo
a5a3f6255d Merge pull request #4343 from edx/mvo/removing_unused_action_chains
Removing unused import
2014-07-09 13:38:56 -04:00
cahrens
e984ca15a1 Add revert_to_published method.
STUD-1860
2014-07-09 13:12:39 -04:00
Greg Price
c256539627 Merge pull request #4350 from edx/gprice/for-154
Fix bug in inline discussion post creation
2014-07-09 12:17:24 -04:00
Greg Price
98d7b28c6b Merge pull request #4318 from edx/gprice/forum-sidebar-debt
Reduce tech debt in forum sidebar
2014-07-09 12:13:54 -04:00
Greg Price
c3845de76a Fix bug in inline discussion post creation
Commit 994ccd1 contained a bug that caused new posts created via the
courseware interface to not get posted to the correct topic. They would
appear to work but would actually be posted to the "undefined" topic.
This has now been fixed.

JIRA: FOR-154
2014-07-09 12:00:14 -04:00
Daniel Friedman
f9120e1d06 Merge pull request #4324 from edx/dan-f/add-to-authors
Add myself to AUTHORS.
2014-07-09 11:56:58 -04:00
Don Mitchell
a74ba6b932 Make pictures smaller 2014-07-09 08:34:03 -04:00
Andy Armstrong
69e205957b Merge pull request #4345 from edx/andy/fix-i18n-bug
Fix i18n bug on Studio's Advanced Settings page
2014-07-08 23:43:56 -04:00
Andy Armstrong
dbd3ffed66 Fix i18n bug on Studio's Advanced Settings page
STUD-1955

HTML escaped localized text that was output to
JavaScript.
2014-07-08 19:22:07 -04:00
Ned Batchelder
eefa18b393 Merge pull request #4333 from edx/ned/fix-readme-links
Fix the link to the Ubuntu installation instructions
2014-07-08 16:57:41 -04:00
Stephen Sanchez
f23492e14e Updating AWS settings 2014-07-08 16:38:12 -04:00
Minh Tue Vo
ba989424f8 removing unused import 2014-07-08 15:57:07 -04:00
David Baumgold
450842586a Merge pull request #4341 from edx/db/release-script-always-fetch
Always call `git fetch edx` before finding PR branches
2014-07-08 15:40:26 -04:00
David Baumgold
326ca21dd8 Always call git fetch edx before finding PR branches 2014-07-08 15:38:20 -04:00
Andy Armstrong
4cb1a510fc Merge pull request #4326 from edx/andya/fix-stud-1948
Fix user handling bug in split test module
2014-07-08 15:09:14 -04:00
Andy Armstrong
afb311ff51 Fix user handling bug in split test module
STUD-1948
2014-07-08 15:01:22 -04:00
Will Daly
d352d4aef3 Merge pull request #4323 from edx/will/ora2-release-2014-07-07T19.28
ORA2 release-2014-07-07T19.28
2014-07-08 13:52:29 -04:00
Will Daly
e582337522 ORA2 release-2014-07-07T19.28 2014-07-08 13:50:28 -04:00
Stephen Sanchez
ef68541069 updating ora2 version 2014-07-08 13:16:23 -04:00
Stephen Sanchez
573d3c89fc Updating settings and requirements for lms and cms to support file upload 2014-07-08 13:15:37 -04:00