Commit Graph

8706 Commits

Author SHA1 Message Date
Tim Babych
246e0e6f66 Merge pull request #4411 from edx/anton/group-experiments
Create new group configurations page
2014-07-15 08:19:34 +03:00
Nimisha Asthagiri
851fe47a95 Merge pull request #4370 from edx/nimisha/split-drop-database-2952
Implement close_connections and drop_database on modulestores.
2014-07-14 18:17:48 -04:00
Nimisha Asthagiri
d7cf8b7fa0 Implement close_connections and drop_database on modulestores. 2014-07-14 16:01:10 -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
Nimisha Asthagiri
bc03fb0881 Merge pull request #4380 from edx/nimisha/mongo-bwc-config
auto-migrate old mongo to draft modulestore
2014-07-14 13:46:00 -04:00
Carson Gee
95dd2aad0b Merge pull request #3836 from mitocw/cg/add_default_logging
Adding django default log handlers into logging configuration
2014-07-14 13:08:05 -04:00
Don Mitchell
57ec402433 Merge pull request #4397 from edx/split-migrator/lms-2936-ok
Refactor split migrator
2014-07-14 12:10:42 -04:00
Nimisha Asthagiri
23c5febc17 Added deprecation warnings. 2014-07-14 11:59:40 -04:00
Nimisha Asthagiri
7503cc2473 reverting back to migrating the settings in the env files 2014-07-14 11:59:40 -04:00
Nimisha Asthagiri
4859eee23b Move modulestore django settings migration code down into the modulestore layer so it works for all django-based callers. 2014-07-14 11:59:40 -04:00
Don Mitchell
639658913d Refactor split migrator
LMS-2936

Also, a bunch of ancillary cleanups.

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_publish.py

Conflicts:
	cms/djangoapps/contentstore/management/commands/migrate_to_split.py
	cms/djangoapps/contentstore/management/commands/tests/test_rollback_split_course.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	common/lib/xmodule/xmodule/modulestore/split_migrator.py
	common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
	common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py
	common/lib/xmodule/xmodule/modulestore/tests/test_split_w_old_mongo.py
2014-07-14 11:20:29 -04:00
polesye
205d24f5cf BLD-1121: Create new group configurations page. 2014-07-14 17:44:48 +03:00
Greg Price
36352fa501 Merge pull request #4383 from mlkwaqas/waqas/for156-anonymous-posts-labels-user-roles
Fix anonymous posts appear are labeled with the logged in user's role
2014-07-14 10:43:25 -04:00
Waqas Khalid
f1df9a1093 Fix anonymous posts appear are labeled with the logged in user's role
FOR-156
2014-07-14 17:01:23 +05:00
asadiqbal08
ce7e625c3b Update the UserSignUpSource model 2014-07-14 12:36:00 +05:00
Don Mitchell
9cf082e727 Merge pull request #4369 from edx/bug/stud-1962
Bug/stud 1962
2014-07-11 16:57:00 -04:00
Mat Peterson
cd82abae6c More test fixes
Fix opaque key TODOs left over from split-migrator changes and fixed test_image_import to use the correct course

Reset get_location_from_path to pre deprecated opaque-keys

Fix CMS acceptance test

Fixed usage key reassignment in item.py
2014-07-11 15:40:09 -04:00
Mat Peterson
98649072bd skipping test_clone_course 2014-07-11 15:40:09 -04:00
Sarina Canelake
b2867a694d Quality cleanup 2014-07-11 15:40:09 -04:00
Diana Huang
96420f30f1 Minor cleanups
Remove unnecessary check.
Fix merge conflict
2014-07-11 15:40:09 -04:00
Diana Huang
97331d4c16 Fix merge conflict 2014-07-11 15:40:09 -04:00
Mat Peterson
df1a9304c1 Made fill_in_run public in mongo and added fill_in_run to mixed which funnels to mongo 2014-07-11 15:40:09 -04:00
Mat Peterson
b2ae827fa4 Old style location urls removed from CourseFixture and CoursePage 2014-07-11 15:40:09 -04:00
Sarina Canelake
ff2822cf48 Fix cms tests 2014-07-11 15:40:09 -04:00
Diana Huang
c21977326c Fix test_import and unicode issues.
Handle unicode in get_course_index
2014-07-11 15:40:08 -04:00
Diana Huang
f82a950f7b Skip tests for location mapper
Since we're trying to get rid of location mapper,
skip these tests until we get rid of it entirely.
2014-07-11 15:40:08 -04:00
Mat Peterson
1b71ace4b0 studio new style assumption corrections 2014-07-11 15:40:08 -04:00
Mat Peterson
e39cc5dfa3 Switch offering to course and run 2014-07-11 15:40:08 -04:00
Mat Peterson
78a2959540 Removed some definition_key references 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
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
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
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
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
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
lduarte1991
a5d8669f68 Annotation Tool: Removed conflict between tags-annotator and flagging-annotator 2014-07-10 11:20:29 -04:00
Adam
379edd2317 Merge pull request #4352 from edx/release
Release
2014-07-10 10:54: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
Don Mitchell
cb2422a3e2 Unit test to demonstrate bug 2014-07-10 09:14:37 -04:00
Muhammad Ammar
81a5a7b962 CMS Video Handout Tests 2014-07-10 05:45:49 +00: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