Commit Graph

2705 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
Douglas Hall
a9a330a0e4 Merge pull request #11021 from StraNNiKK/LTI-9
LTI-9 - Bug with sending back grades for a non-leaf blocks on devstack
2016-04-06 10:10:15 -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
Sanford Student
53e6611fc8 removing feature flag for next button across sections 2016-03-31 16:50:48 -04: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
b912aa453f Merge pull request #11948 from edx/atiya/ECOM-3963-specific-student
Fixed error on Course Home, when viewed as specific student.
2016-03-31 10:48:43 +05:00
Diana Huang
70145de7bb Merge pull request #11061 from CredoReference/impossible-to-click-check-without-answer
PR-154 - Make it impossible to click "final check" without selecting a choice
2016-03-30 11:33:11 -04:00
Dmitry Viskov
4c83a2f0de Make it impossible to click "final check" without selecting a choice 2016-03-30 16:50:00 +03:00
attiyaishaque
acc6d4f282 Fixed error on Course Home, when viewed as specific student. 2016-03-30 17:09:25 +05:00
Dmitry Viskov
57a9839e4c LTI-9 - Bug with sending back grades for a non-leaf blocks on devstack 2016-03-30 03:38:21 +03: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
Brian Beggs
1dff9d45f3 Merge pull request #11787 from mitocw/enhancement/aq/add_master_course_staff_in_ccx_fix_migration_issue
Adds staff and instructor users of the master course to CCX
2016-03-28 18:49:46 -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
Amir Qayyum Khan
795ead82b5 Added master course staff and admins to ccx and fixed same issues related to ccx 2016-03-26 03:18:39 +05: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
Ehtesham
5ad2eb300c [TNL-4073][TNL-4273] Make sure that domain defined for preview exists in
HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS,
2016-03-23 18:52:32 +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
sanfordstudent
658348da68 Merge pull request #11816 from edx/sstudent/MA-2164
MA-2164 adding youtube url to encoded videos
2016-03-18 06:41:04 -04:00
raeeschachar
8343bd4e3e Merge pull request #11791 from edx/raees/testing-one-feature-file
Testing feature file
2016-03-18 10:55:12 +05:00
Sanford Student
3893f3f069 MA-2164 add youtube when mobile video encoding missing 2016-03-17 19:59:33 -04:00
raeeschachar
792bca88a3 Removed annotatable.feature and events.feature and related py files 2016-03-17 18:34:18 +05: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
Matt Drayer
3ed3fea2fb mattdrayer/xblock-translations: Add I18N/L10N support to XBlocks via the runtime
* mattdrayer:  Latest proto code
* mattdrayer:  Add translation.py
* asadiqbal08: Xblock translation ugettext update, remove translation.py
* mattdrayer:  Additional I18N work -- starting to see some translations!
* asadiqbal08: Trying to make xBlock message catalog files path dynamic
* mattdrayer:  Remove unnecessary modifications
* mattdrayer:  Cleaned up implementation
* mattdrayer:  Moved import statement
* asadiqbal08: update as suggested
* asadiqbal08: xblock its own domain
* asadiqbal08: translation: secure none object
* asadiqbal08: pylint
* asadiqbal08: get locale from xblock
* asadiqbal08: update
* mattdrayer:  Determine XBlock locale path within runtime service
* mattdrayer:  Determine module location via the runtime
* mattdrayer:  Remove ModuleI18nService reference
* asadiqbal08: override the service in studio
* asadiqbal08: remove import
* asadiqbal08: update the Modulei18nService
* asadiqbal08: update the Modulei18nService
* mattdrayer:  Remove redundant __class__ reference
* asadiqbal08: update the docstring
* asadiqbal08: tests
* mattdrayer:  Remove specific ugettext override from ModuleI18nService
* mattdrayer:  Move service operation to base class
* mattdrayer:  Address quality violations
* asadiqbal08: Investigating the test failure issue on jenkins and solved
* asadiqbal08: First utilizing the parent class method
* mattdrayer:  Use recommended callable approach
* asadiqbal08: remove unused code
* asadiqbal08: Updated the test to use cms preview module system runtime in order to get i18n service.
* asadiqbal08: Pylint quality
* asadiqbal08: update the service call to check xblock declarations
* asadiqbal08: update doc string
* asadiqbal08: i18n callable test in studio
* asadiqbal08: test lms runtime for modulei18n service
* asadiqbal08: add doc strings
* asadiqbal08: Rename locale and domain to Flask-Babel convention
2016-03-11 09:55:15 -05:00
erm0l0v
4142438372 add CourseTalk widget
Move tests to one test class
2016-03-09 13:32:07 +03:00
Hassan
48a5b954d5 Use CourseOverview for dump_course_ids 2016-03-07 19:44:38 +05: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