Commit Graph

173 Commits

Author SHA1 Message Date
Matt Drayer
c2c2a67753 mattdrayer/WL-493: Enable bulk purchase via Otto for unauthenticated users 2016-06-03 13:00:45 -04:00
wajeeha-khalid
f19af52054 MA-2050: add optional user profile details in GET thread & comment 2016-06-02 17:05:00 +05:00
Calen Pennington
853bfe7a36 Add a TestCase mixin for enabling caches in tests
By default, disable all caching in tests, to preserve test independence.
In order to enable caching, inherit from CacheSetupMixin, and specify
which cache configuration is needed.

[EV-32]
2016-05-04 14:51:30 -04:00
Calen Pennington
39ff841d1f Don't pass arguments to setUp (for UrlResetMixin)
The TestCase API doesn't accept arguments, so passing arguments for some
TestCase subclasses makes adding new inheritance/mixins tricky. Instead,
prefer configuration via class attributes for TestCases.
2016-05-04 11:34:51 -04:00
Renzo Lucioni
affee69296 Manually merge release into master 2016-04-14 14:23:06 -04:00
Vedran Karačić
a533472ae8 Merge pull request #12052 from edx/vkaracic/SOL-1668
[SOL-1668] Coupon codes application is not available for a user who has just activated his account
2016-04-13 16:01:49 +02:00
Vedran Karacic
02c5e7f939 Redirect to ecommerce checkout on the PayAndVerify view.
When a user tries to purchase a verified certificate for the first
time or upgrade to verified, if the ecommerce checkout is enabled
redirect the user to the ecommerce checkout basket.
2016-04-13 10:14:09 +00:00
Omar Khan
6fc4b38ea0 Disallow free verified course modes
The verification workflow assumes that all verified courses will have a
price. Free verified course modes cause a 404 when the user attempts to
enroll or upgrade.
2016-04-12 18:06:16 -07:00
Ben Patterson
c9e4a1d964 Revert "Disallow free verified course modes" 2016-04-06 13:58:41 -04:00
Simon Chen
e0995b8072 Merge pull request #11374 from open-craft/omar/verified-coursemode-price
Disallow free verified course modes
2016-04-06 12:32:00 -04:00
Zia Fazal
a796b56314 saleem-latif/WL-328: Multi-Site Comprehensive Theming
ziafazal: improvements need for multi-tenancy
ziafazal: fixed broken tests
ziafazal: no need to add setting in test.py
ziafazal: added hostname validation
ziafazal: changes after feedback from mattdrayer
ziafazal: fixed branding and microsite broken tests
ziafazal: make STATICFILES_DIRS to list
ziafazal: added theme directory to mako lookup for tests
ziafazal: added more protection in test_util
saleem-latif: Enable SCSS Overrides for Comprehensive Theming
saleem-latif: Incoporate feedback changes, Correct test failures, add tests and enable theming for django templates
saleem-latif: Correct errors in python tests
mattdrayer: Fix invalid release reference
mattdrayer: Update django-wiki reference to latest release
saleem-latif: Update Theme storages to work with Caching, Pipeline and collectstatic
saleem-latif: Incorporate feedback changes
mattdrayer: Pylint violation fix
mattdrayer: Fix broken pavelib test
2016-03-28 14:57:01 -04:00
Ben Patterson
c504029b39 Create a third shard for lms unit tests.
This will leverage the nose attrib plugin to allow us
to break tests apart on our build system to run
in parallel on separate nodes.
2016-03-17 12:01:42 -04:00
Jesse Zoldak
f891d27cbb Revert "ziafazal/WL-328: Multi-Site Comprehensive Theming"
This reverts commit 954dae584a.
2016-03-16 11:19:36 -04:00
Zia Fazal
954dae584a ziafazal/WL-328: Multi-Site Comprehensive Theming
ziafazal: improvements need for multi-tenancy
ziafazal: fixed broken tests
ziafazal: no need to add setting in test.py
ziafazal: added hostname validation
ziafazal: changes after feedback from mattdrayer
ziafazal: fixed branding and microsite broken tests
ziafazal: make STATICFILES_DIRS to list
ziafazal: added theme directory to mako lookup for tests
ziafazal: added more protection in test_util
saleem-latif: Enable SCSS Overrides for Comprehensive Theming
saleem-latif: Incoporate feedback changes, Correct test failures, add tests and enable theming for django templates
saleem-latif: Correct errors in python tests
mattdrayer: Fix invalid release reference
mattdrayer: Update django-wiki reference to latest release
2016-03-14 13:42:53 -04:00
Bill DeRusha
beacf3c93a Only return unexpired initial verifications. 2016-02-23 13:38:48 -05:00
Bill DeRusha
a1a58db9be Do not send initial verification photo_id if new photo_id provided
ECOM-2888
2016-02-23 13:29:53 -05:00
aamir-khan
b6604a3a70 ECOM-3706: Updated the hard coded datetimes in tests and also added the test for restricting credit direct sale 2016-02-16 13:14:44 -05:00
Omar Khan
0b4fa6e5a5 Disallow free verified course modes
The verification workflow assumes that all verified courses will have a
price. Free verified course modes cause a 404 when the user attempts to
enroll or upgrade.
2016-02-03 21:19:45 +07:00
Zia Fazal
c0648ab164 moved IS_EDX_DOMAIN dependent feature to edx.org theme 2016-01-22 15:32:19 -05:00
Mushtaq Ali
8f76f3385a Fix enrollment message 2016-01-20 15:59:27 +05:00
Robert Raposa
5e69224c32 Deprecate escaping in display_name_with_default
- Remove escaping in display_name_with_default
- Move escaped version to deprecated display_name_with_default_escaped
- Does not include any other changes to remove double-escaping

Thanks to agaylard who initiated this work:
https://github.com/edx/edx-platform/pull/10756

TNL-3425
2015-12-22 11:52:04 -05:00
Bill DeRusha
1846353a1f Fix auto set deadlines on publish 2015-12-16 13:58:13 -05:00
Ned Batchelder
a66d05ae69 Merge pull request #9940 from edx/ned/autospec-all-the-things
Add autospec to more mocks
2015-12-10 09:47:28 -05:00
Bill DeRusha
522095e112 Auto setting of verification deadlines with manual overrides 2015-12-09 11:59:55 -05:00
Ned Batchelder
43ac38aa87 Add autospec to all mocks 2015-12-09 09:44:22 -05:00
Awais
198d33dc13 New AB Testing URL for checkout page.
ECOM-2866
2015-12-04 07:04:59 +00:00
Peter Fogg
497622d4b4 Switch default course mode to 'audit'.
ECOM-2972
2015-11-25 11:22:29 -05:00
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -05:00
zubair-arbi
0b93054cbb Allow user to submit initial verification through reverify flow
ECOM-2933
2015-11-20 14:34:38 +05:00
muhammad-ammar
8d5f153201 Merge remote-tracking branch 'origin/release' into dj18-release-merge
Conflicts:
	common/djangoapps/util/testing.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/teams/tests/test_views.py
	openedx/core/djangoapps/programs/models.py
	openedx/core/djangoapps/user_api/accounts/tests/test_views.py
	requirements/edx/github.txt
2015-11-18 17:53:44 +05:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
2015-11-10 15:00:19 -05:00
Afeef Janjua
ed6e46453c allow reverification for pending status ('must_retry', 'submitted') 2015-11-10 13:23:52 +05:00
Tasawer
982c9a2667 Added photo_id_key while AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING is True
ECOM-2547
2015-10-28 10:58:44 +00:00
Ned Batchelder
322ca34b20 Remove pylint pragmas from "class Meta"
Also remove useless docstrings where they were added to keep pylint
quiet.
2015-10-21 07:37:00 -04:00
Tasawer
d2535bd02e New Model added for Configuration of ICRV status emails.
ECOM-2552
2015-10-20 15:39:16 +00:00
Ahsan Ulhaq
7fa9d73a4c Update Credit Eligibility Table for Skips
ECOM-2551
2015-10-15 19:03:07 +05:00
Edward Zarecor
8afb36057b Merge pull request #10060 from edx/release
Release
2015-10-06 15:51:43 -04:00
zubair-arbi
c78b1be515 add new column 'copy_id_photo_from' for 'SoftwareSecurePhotoVerification' model to track initial verification with 'photo_id_key' 2015-10-05 22:46:45 -04:00
Bill DeRusha
fe23052511 Merge pull request #9979 from edx/bderusha/boardman-traffic
Add IP to all python Segment tracking calls
2015-10-05 14:55:55 -04:00
Bill DeRusha
ca6633bd98 Add IP to all python Segment tracking calls 2015-10-01 21:21:16 -04:00
Bill DeRusha
bcb71a3255 Rename SEGMENT_KEY to have a unique key name for both CMS and LMS 2015-10-01 19:40:27 -04:00
Bill DeRusha
c721ff5a82 Replace SEGMENT_IO_LMS & SEGMENT_IO_LMS_KEY with single key SEGMENT_KEY 2015-09-24 11:49:03 -04:00
muhammad-ammar
6a5ce5d544 Upgrade factory_boy
TNL-3179
2015-09-18 18:02:38 +05:00
Tasawer
01ca1f9be1 removing deprecated view VerifyLaterView
XCOM-285
2015-09-03 07:19:39 +00:00
Peter Fogg
38fb6eaede Add signals for user's discussion activity.
These signals are caught by the Teams app and used to update
`last_activity_at` on both teams and individual users.

TNL-2497
2015-08-26 12:07:54 -04:00
zubair-arbi
ec28a75f14 In-course reverification access control
* Automatically create user partitions on course publish for each ICRV checkpoint.
* Disable partitions for ICRV checkpoints that have been deleted.
* Skip partitions that have been disabled when checking access.
* Add verification access control UI to visibility settings.
* Add verification access control UI to sequential and vertical settings.
* Add partition scheme for verification partition groups.
* Cache information used by verification partition scheme and invalidate the cache on update.
* Add location parameter to UserPartition so the partition scheme can find the associated checkpoint.
* Refactor GroupConfiguration to allow multiple user partitions.
* Add special messaging to ICRV for students in the honor track.

Authors: Zubair Arbi, Awais Qureshi, Aamir Khan, Will Daly
2015-08-20 08:43:55 -07:00
Renzo Lucioni
8b704cc2ec Merge pull request #9351 from edx/release
Release
2015-08-17 13:17:55 -04:00
Peter Fogg
c13f296103 HTML-escape uses of course display name. 2015-08-17 12:22:10 -04:00
Bill DeRusha
09acca2de8 Team API include correct info when expanding users TNL-2975
Create read-only serializer to handle User/UserProfile data
together.

Refactor GET accounts to use the new read-only joint serializer

Fix tests to check for new expanded user info

Update tests in teams/tests/test_views.py to test for both
public and private profiles on expands user

Update serializer to utilize the request object for creating absolute uris
2015-08-12 14:33:07 -04:00
Ned Batchelder
f54fe787c6 Remove needless 'disable=no-member' pragmas 2015-08-03 17:47:44 -04:00