Commit Graph

3204 Commits

Author SHA1 Message Date
Adam Palay
feb042d474 Revert "Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46"
This reverts commit 27646b7e6f.
2016-08-01 10:13:10 -04:00
wajeeha-khalid
986dcff626 MA-2536: get 'course_about' url in enrollment 2016-07-29 14:58:54 +05:00
Saleem Latif
8ae92901ef 1. Merge microsites into Comprehensive Theming
2. Add site configuration overrides to theming/helpers.py
3. Move microsite.get_value from theming/helpers to site_configuration/helpers
4. Move microsite_configuration.microsite.get_value usages to site_configuration.helpers.values
2016-07-27 13:55:14 +05:00
Muddasser
00448dffe5 Merge pull request #12882 from edx/muddasser/lettuce-to-bok-choy/signup.feature
Conversion of cms/signup.feature to bok-choy
2016-07-25 20:52:55 +05:00
Syed Hasan raza
d1ce8d39aa Merge pull request #13055 from edx/shr/bug/plat-1048-mongo-courses-restriction-split-key
Mongo courses wrong course_key restriction
2016-07-25 16:06:17 +05:00
Syed Hassan Raza
79df545606 Mongo courses wrong course_key restriction 2016-07-25 14:41:31 +05:00
Mushtaq Ali
d4ff39a391 Merge pull request #12237 from edx/mushtaq/maintenance
Maintenance app and force publish course view
2016-07-23 01:23:58 +05:00
Mushtaq Ali
27646b7e6f Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46 2016-07-22 18:29:12 +00:00
Jesse Zoldak
4906bde056 Comment out flaky lettuce test TNL-5051 2016-07-22 09:11:55 -04:00
Muddasser
64838f5665 Conversion of cms/signup.feature to bok-choy 2016-07-22 12:22:59 +00:00
Christina Roberts
467bc55d27 Merge pull request #12950 from edx/christina/studio-support-levels
Studio support level of components/xblocks
2016-07-21 17:13:58 -04:00
cahrens
d4cc7b8ffd Support level support for Studio xblock creation.
TNL-4670
2016-07-21 15:44:59 -04:00
Kevin Kim
1ab52f8b0a Merge pull request #12945 from edx/kkim/ora_tz_date
Convert ORA Due Dates
2016-07-21 10:52:07 -04:00
Kevin Kim
94100f5944 Convert ORA due dates to user preferred time zone 2016-07-21 13:57:20 +00:00
Jesse Zoldak
893d1f5dfe Merge pull request #13049 from edx/zoldak/TNL-5051
Skip flaky CMS.Course updates lettuce tests  TNL-5051
2016-07-20 21:04:15 -04:00
Eric Fischer
35ae67b530 New CMS visibility settings (#12940)
TNL-4906 Subsections now use radio buttons, to allow for "hide after due" as a
visibility option. Also, all tabs have been consolidated to "Basic" and
"Advanced", and visibility options have moved there.

Documentation links are updated to assist course authors with the new
visibility options. Tests have also been updated, and the changes suggested
in TNL-4951 are included.
2016-07-20 19:58:51 -04:00
Jesse Zoldak
8cdac6c99a Skip flaky CMS.Course updates lettuce tests TNL-5051 2016-07-20 16:15:26 -04:00
Chris
3302b26e65 Merge pull request #12926 from edx/clrux/ac-524
AC-524 fixes `label` ignores
2016-07-20 09:00:15 -04:00
Chris Rodriguez
b97d063181 AC-524 - label - test_lms_instructor_dashboard.py 2016-07-20 07:49:48 -04:00
Simon Chen
1d768cde7a ECOM-4904 Move the program editor backbone app to Studio (#12962) 2016-07-19 19:09:51 -04:00
Muddasser
186b3badb5 course-settings.feature conversion to bokchoy 2016-07-19 08:18:36 +00:00
Renzo Lucioni
e7cdcb9b71 Merge pull request #12954 from edx/renzo/extract-token-generation
Unify JWT generation code
2016-07-11 15:37:14 -04:00
Christina Roberts
6d7a545276 Merge pull request #12932 from edx/christina/deprecated-components
Move deprecating of XBlocks to new XBlockConfiguration model
2016-07-08 15:05:42 -04:00
Renzo Lucioni
f6d7371dd1 Unify JWT generation code
These changes unify four different approaches to JWT creation, moving the core of the AccessTokenView to a general-purpose JwtBuilder class. This utility class defaults to using the system's JWT configuration, but it will allow overriding of the signing key and audience claim to support those clients which still require this. Part of ECOM-4566.
2016-07-07 16:38:39 -04:00
Chris Rodriguez
4cf0e19af2 AC-520 fixing section ignores 2016-07-06 15:01:44 -04:00
cahrens
25bfd0a7d8 Get Studio deprecation list from XBlockConfiguration.
Replaces settings value.
TNL-4669
2016-07-06 11:05:52 -04:00
Toby Lawrence
4e22affb24 [PERF-344] Add versioning of cached course assets to allow graceful cache invalidation
When releasing the versioned assets work, we stumbled on a problem with old pickled
versions of the StaticContent objects residing in cache, which triggered a bug in the
code. Not wanting to blow away all cached items, we ended up having to revert and add
in some backwards-compatible helper code to ease the transition.

With this, we'll now utilize the version argument that Django's caching interface
allows, in conjunction with a constant value that can be modified when breaking changes
are being made, to let us gracefully ignore older cached course assets.
2016-07-05 15:15:47 -04:00
E. Kolpakov
33b3dfcc92 Converts Discussion XModule to Discussion XBlock
* Renames discussion_module to discussion_xblock
* Moves common/lib/xmodule/xmodule_discussion to openedx/core/lib/xblock_builtin/xblock_discussion
2016-06-29 06:47:04 +12:00
Sylvia Pearce
8b1f28d317 Account registration and activation text string revisions 2016-06-27 13:32:53 -04:00
Nimisha Asthagiri
74a3665289 Update query and mongo counts 2016-06-23 20:22:32 -04:00
Toby Lawrence
bb29ad5f30 Revert "Revert "[PERF-325] Add versioned course asset URLs when canonicalizing asset paths.""
This reverts commit 9967b6fd58.
2016-06-23 13:27:15 -04:00
Kevin Falcone
2c41d79c6d Merge pull request #12827 from edx/release
Release -> Master after revert
2016-06-22 15:37:27 -04:00
Kevin Falcone
9967b6fd58 Revert "[PERF-325] Add versioned course asset URLs when canonicalizing asset paths."
We're seeing errors in NR from objects read out of the cache lacking the
'StaticContent' object has no attribute 'content_digest'
File "/edx/app/edxapp/edx-platform/common/djangoapps/contentserver/middleware.py",
    line 70, in process_request

This reverts commit 849ebc5f22.
2016-06-22 12:11:35 -04:00
Muddasser
ce665e3b4c Conversion of cms/component.feature into bokchoy tests 2016-06-22 11:20:48 +00:00
Gregory Martin
f701058296 Merge pull request #12764 from edx/yro-add_val_duplicate_video
Add VAL "Duplicate" status
2016-06-17 14:49:14 -04:00
Eric Fischer
fdc6d91588 update_in_cache on lms worker (#12689)
This commit "undoes"a previous hotfix, and allows a cms course_publish
signal to trigger a block_structure update_course_in_cache task, which
is run on an lms worker queue.

Changes:
    -exposes ALTERNATE_QUEUE_ENVS
    -adds routing layer in celery.py
    -moves prior dev_with_worker settings file to devstack_with_worker
    -moves course_block api functionality into openedx/core/djangoapps/content/block_structure
2016-06-16 18:01:06 -04:00
Greg Martin
d20af4a2ba Add VAL "Duplicate" status
Added duplicate video failed status for VAL.
2016-06-15 11:47:38 -04:00
Toby Lawrence
9abce102ff Merge pull request #12573 from edx/PERF-325
[PERF-325] Add versioned course asset URLs when canonicalizing asset paths.
2016-06-15 09:05:13 -04:00
Toby Lawrence
849ebc5f22 [PERF-325] Add versioned course asset URLs when canonicalizing asset paths. 2016-06-15 08:04:52 -04:00
Awais Jibran
1e67ec66cd Merge pull request #12702 from edx/aj/PLAT-1032-fix-export
Fix course export on edge
2016-06-13 18:46:56 +05:00
Awais Jibran
ba6ef624c2 PLAT-1032 2016-06-10 11:38:20 +05:00
Calen Pennington
fc1e0b6637 Use the Django TestClient for course_creator unit tests, so that middleware is cleaned up properly 2016-06-08 16:43:31 -04:00
Calen Pennington
93970f3473 Allow edxmako to be passed an explicit request to create the RequestContext from 2016-06-08 16:35:25 -04:00
Christina Roberts
1f26cd2ec6 Merge pull request #12681 from edx/christina/delete-landing
Delete old cruft from 2012/2013.
2016-06-08 10:18:53 -04:00
cahrens
1fa4319140 Delete old cruft from 2012/2013. 2016-06-07 13:34:31 -04:00
Calen Pennington
12d239801e Merge pull request #12628 from cpennington/test-i18n-reset-translations
Test i18n reset translations
2016-06-07 10:44:07 -04:00
Calen Pennington
105308e129 Use translation.deactivate, rather than explicitly activating the current settings LANGUAGE_CODE 2016-06-02 11:06:59 -04:00
Nimisha Asthagiri
4a56fa5fb1 Adding infrastructure to support context-sensitive help links in the LMS. 2016-05-27 11:35:05 -04:00
Afzal Wali
eadd656df0 SOL-1802 Allow proctoring service to create support ticket. 2016-05-27 09:29:06 -04:00
Brian Wilson
a36aa68fd7 Add new export_olx management command.
This moves the functionality of the 'export_course'  management command from lms/djangoapps/courseware
over to the Studio codebase.  This reflects its use going forward to be run with cms settings, to
export the content of the Studio modulestore instead of the LMS modulestore.  The management
command is used by an analytics workflow to output course content for researchers.
2016-05-26 17:26:59 -04:00