Commit Graph

1072 Commits

Author SHA1 Message Date
Adam Palay
76f0fb0fc2 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-04-07 12:02:43 -04:00
Ben Patterson
c9e4a1d964 Revert "Disallow free verified course modes" 2016-04-06 13:58:41 -04:00
Awais Jibran
03925474b9 Verification Upgrade Deadline panel on course home page should not show if user is already verified 2016-04-06 12:53:31 -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
Waheed Ahmed
6a9157e409 Fixed progress page grade requirements text.
ECOM-3127
2016-04-06 15:37:28 +05:00
Andy Armstrong
845e3708f3 Introduce Pattern Library test pages
FEDX-93

These are developer only pages, so can not be seen in production
environment. On devstack, you can access these pages in LMS and
Studio at:

    /template/ux/reference/pattern-library-test.html
2016-04-05 09:22:14 -04:00
Renzo Lucioni
77a90a08ca Add option to bypass course home
Exposes an advanced setting in Studio allowing course teams to bypass the home tab when students arrive from the dashboard, sending them directly to course content. ECOM-3961.
2016-04-05 09:08:51 -04:00
Simon Chen
649e8b1158 ECOM-3673 Update the course end date description text to remove the reference to certificate when course enrollment is in audit mode 2016-04-05 09:07:56 -04:00
Muzaffar yousaf
cc4349e9ae Merge pull request #11990 from edx/mzfr/prvw-masqrd-tnl4291
Staff should be able to masquerade when previewing content.
2016-04-01 19:42:58 +05:00
Simon Chen
33fc268d21 ECOM-3673 Update the course end date description text to remove the reference to certificate when course enrollment is in audit mode 2016-03-31 10:47:31 -04:00
muzaffaryousaf
e572eafaa4 Staff should be able to masquerade when previewing content.
TNL-4291
2016-03-31 19:12:16 +05:00
attiyaishaque
acc6d4f282 Fixed error on Course Home, when viewed as specific student. 2016-03-30 17:09:25 +05:00
Nimisha Asthagiri
74a9989f04 Merge pull request #11705 from edx/tnl/next_button
Activate LMS Navigation Button across sections
2016-03-29 15:05:59 -04:00
Nimisha Asthagiri
2c90cac962 Accessible Sequence navigation
MA-2190
2016-03-29 12:59:05 -04:00
Nimisha Asthagiri
8cbf99aca4 Activate Next and Previous Buttons across sections
MA-2152
MA-2153
2016-03-29 12:58:08 -04:00
Renzo Lucioni
b1f3b7d10f Merge pull request #11971 from edx/renzo/bypass-home
Add option to bypass course home
2016-03-29 09:12:20 -04:00
Renzo Lucioni
6f49579166 Add option to bypass course home
Exposes an advanced setting in Studio allowing course teams to bypass the home tab when students arrive from the dashboard, sending them directly to course content. ECOM-3961.
2016-03-28 17:49:55 -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
Usman Khalid
78016db313 Merge pull request #11932 from edx/release
Merge release to master
2016-03-24 16:58:12 +05:00
Usman Khalid
59b452a4b3 Quality fixes. 2016-03-24 02:46:54 +05:00
vkaracic
3c8ae7c3b2 Change EcommerceService's is_enabled to accept User instead of request
. And change the verification link in the sidebar to redirect to new basket if the EcommerceService is enabled.
2016-03-23 07:44:55 +00:00
Jesse Zoldak
7e79d335a6 Remove executable bit from test file TE-1235 2016-03-22 11:46:06 -04:00
Simon Chen
82a246fbf4 Merge pull request #78 from edx/rsrct-preview-tnl4194
Create the security fix #2 for the RC 2016-03-22
2016-03-21 13:01:14 -04:00
Renzo Lucioni
a5b10ca0fe Merge pull request #11805 from edx/renzo/self-paced-modulestore-wrapper
Override field data within the XBlock runtime
2016-03-21 12:14:22 -04:00
muzaffaryousaf
bb952e148f Restrice non-staff users to access preview content.
TNL-4194
2016-03-21 20:08:24 +05:00
Aamir
91f59d59cb Merge pull request #11780 from edx/aamir-khan/ECOM-3345-remove-gen-cert-button
Remove the certificate generation button from progress page for audit student
2016-03-21 17:09:10 +05:00
aamir-khan
6fe0638214 Remove the certificate generation button from progress page for audit student 2016-03-21 15:52:54 +05:00
Renzo Lucioni
cd9986b662 Override field data within the XBlock runtime
Resolves an issue preventing students in self-paced courses from seeing all available discussion modules. ECOM-3733.
2016-03-18 17:15:00 -04:00
Sanford Student
da828cdf75 MA-2164 cleaning up old lettuce 2016-03-18 14:42:23 -04:00
Sanford Student
3893f3f069 MA-2164 add youtube when mobile video encoding missing 2016-03-17 19:59:33 -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
erm0l0v
4142438372 add CourseTalk widget
Move tests to one test class
2016-03-09 13:32:07 +03:00
Renzo Lucioni
d481768571 Merge pull request #11691 from edx/jeskew/shared_modulestore_test_case_conversion
WIP: Lots of Python unittest speedups
2016-03-01 16:50:27 -05:00
Ayub khan
be7be407cb Merge pull request #11478 from Ayub-Khan/ayubkhan/ECOM-3603
Fixed progress exception for credit courses
2016-03-02 01:10:17 +05:00
John Eskew
72ce55c8a2 Convert to SharedModuleStoreTestCase 2016-03-01 11:09:18 -05:00
John Eskew
14ad8cd78f SharedModuleStoreTestCase conversion for speedup. 2016-02-29 14:41:17 -05:00
Kevin Falcone
6f9a3911e5 Implement a BaseStudentModuleHistory
This abstract class contains most of the fields (aside from the id and
foreign key to StudentModule that the subclasses need to manage).  It
also provides a get_history method that abstracts searching across
multiple backends.

Move router code to openedx/core
We need to use it from cms and lms.
Ensure aws_migrate can be used for migrating both the lms and cms.

Handle queries directed to student_module_history vs default and the
extra queries generated by Django 1.8 (SAVEPOINTS, etc).

Additionally, flag testing classes as multi_db so that Django will
flush the non-default database between unit tests.

Further decouple the foreignkey relation between csm and csmhe

When calling StudentModule().delete() Django will try to delete CSMHE
objects, but naively does so in the database, not by consulting the
database router.

Instead, we disable django cascading deletes and listen for post_delete
signals and clean up CSMHE by hand.

Add feature flags for CSMHE
One to turn it on/off so we can control the deploy.
The other will control whether or not we read from two database tables
or one when searching.

Update tests to explicitly use this get_history method rather than
looking directly into StudentModuleHistory or
StudentModuleHistoryExtended.

Inform lettuce to avoid the coursewarehistoryextended app

Otherwise it fails when it can't find features/ in that app.

Add Pg support, this is not tested automatically.
2016-02-29 13:59:27 -05:00
Calen Pennington
dd90c55602 Create a new CSMHExtended table to hold our new data
This is a clone (copy) of CSMH's declaration and methods with an added
id of UnsignedBigInAutoField

We should be able to delete the save_history code, but needs testing.

Add error logging when capa failures happen

Put StudentModuleHistory into its own database

Bump out the primary key on CSMHE

This gives us a gap to backfill as needed.
Since the new table's pk is an unsigned bigint, even for people who don't
consolidate CSMH into CSMHE, the lost rows are unlikely to matter.

Remove StudentModuleHistory cleaner
2016-02-29 13:58:39 -05:00
Ayub-khan
4b81f0bb3c Fix progress exception for credit courses and add unit test. 2016-02-29 15:42:20 +05:00
Michael Frey
90146d9ae0 Only allow ecommerce checkout if user is also activated 2016-02-23 10:11:14 -05:00
Zia Fazal
e8ccc2f3e5 Merge pull request #11076 from CredoReference/render-lms-main-navigation-with-template
Render lms main navigation (tabs) with template
2016-02-18 11:21:16 +05:00
vkaracic
86a4710ee8 Otto checkout flow 2016-02-17 18:16:44 +01:00
M. Rehan
af9e26f5cb Merge pull request #11479 from edx/mrehan/plat-998-warnings-on-logout
Fix - Bypass unnecessary logs on logging out.
2016-02-17 17:46:05 +05:00
Qubad786
faf3a64e36 Bypass unnecessary logs on loging out 2016-02-17 13:42:01 +05:00
Toby Lawrence
9654449302 Merge pull request #11465 from edx/perf/speed-up-courseware-tests
Switch to SharedModuleStoreTestCase in the 'courseware' app where possible.
2016-02-16 10:06:53 -05:00
Dmitry Viskov
d532f8de0e Render LMS main navigation (tabs) with template, override templates for a specific list item 2016-02-16 17:03:53 +03:00
Toby Lawrence
49d3a7d35d More quality fixes. 2016-02-16 07:58:33 -05:00
Saleem Latif
cd101d5dec Merge pull request #11494 from edx/saleem-latif/WL-307
WL-307: correct FAVICON_PATH setting for comprehensive theming
2016-02-16 14:39:13 +05:00
Saleem Latif
75f17ecc8e correct FAVICON_PATH setting for comprehensive theming 2016-02-15 17:13:19 +05:00