Commit Graph

5589 Commits

Author SHA1 Message Date
Ned Batchelder
ef4c69881c Fix literal-used-as-attribute error 2016-08-03 12:44:41 -04:00
Ned Batchelder
9e6a63b68e Fix translation-of-non-string errors 2016-08-03 12:44:41 -04:00
Renzo Lucioni
c5434c5310 Merge pull request #13125 from edx/renzo/multiple-program-types
Allow program listing page to display programs from any category
2016-08-02 13:11:23 -04:00
mikedikan
13c8e39259 Merge pull request #13147 from edx/release
Release
2016-08-02 12:29:39 -04:00
Renzo Lucioni
8196e1a024 Allow program listing page to display programs from any category
This work removes most references to XSeries from the LMS in an attempt to be more general. ECOM-5018.
2016-08-01 16:47:21 -04:00
Sven Marnach
d6203b7f43 Merge pull request #13124 from open-craft/smarnach/manage-user
Add support to set initial password hash to manage_user command.
2016-08-01 17:53:10 +02:00
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
Sven Marnach
0206dfaea5 Add support to set initial password hash to manage_user command. 2016-07-29 11:19:07 +02:00
Albert (AJ) St. Aubin
747be14e0e Merge pull request #13018 from edx/TNL-4742_DarkLangChanges
Tnl 4742 dark lang changes
2016-07-27 11:43:39 -04:00
Kevin Kim
5346ee25b8 Merge pull request #12974 from edx/kkim/gate_banner
Gated Subsection Staff Banner
2016-07-27 11:27:52 -04:00
Albert St. Aubin
b42a7a1cfb Removed the Darklang preview-lang and clear-lang parameters and added the new DarkLang settings form at /update_lang
Remove the DarkLang middleware from the LMS

Created and basic routing to the update_lang page for the GET Request
TNL-4742

Basic form functionality

Working example in LMS of the form to set the language

Login now required to change the preview language, and corrected some minor bugs

Updates to move the template code to lms and to correct minor defects
TNL-4742

Added template for preview_lang.html to cms
TNL-4742

Changed filename of darklang.py to api.py to match convention
TNL-4742

Updated and refactored the Darklang tests
TNL-4742

Updated comments in tests
TNL-4742

Formating updates
TNL-4742

Updated comments and formatting
TNL-4742

Corrected i18n tests and corrected PEP8 format issues
TNL-4742

Code Lint/PEP-8 corrections and upates
TNL-4742

Removed constant that was not needed (to be squashed)
TNL-4742

Added init method to clear up PEP8 Warnings (will squash)
TNL-4742

PEP-8/Lint issue resolved (squash)

Updated for i18n
TNL-4742

Refactored the preview_lang.html page to use a common included template

Refactoring and changes from PR comments
TNL-4742

Correction for safecommit violation (Squash)
TNL-4742

PR changes and refactoring (Squash)

Updates to reduce changes made in the urls used
TNL-4742

Removed unneeded aria-described by and bug in MAKO Template (squash)
TNK-4742

Updated docstring comments

Clarified form response text

Minor PR request (Squash)

Refactoring of how the responses are generated within the DarkLang views file

A series of refactors in response to PR comments

Method name change for clarity in reponse to PR comments (Squash)

Updates to tests per PR requests (Squash)

Minor comment updates for clarity and PR requests (Squash)

Updated per PR comments and added a test for empty preview_language

Layout and code style updates (Squash)

Updated test to contain method in the request.

Removed the Darklang preview-lang and clear-lang parameters and added the new DarkLang settings form at /update_lang

Refactored tests and added some tests for coverage, corrected defect with empty input codes

Removed unused and obsolete code

Corrected test errors, resolved PR comments, and updated comments to clarify testing
TNL-4742

Updated tests to deal with Pylint quality issue (Squash)

Updated tests to better reflect test case and PR updates (Squash)
2016-07-27 10:43:08 -04:00
Christina Roberts
99eb795a89 Merge pull request #13107 from edx/christina/delete-xblock-disable-config
Delete XBlockDisableConfig model.
2016-07-27 10:08:25 -04:00
Kevin Kim
a39d6c2e94 Add gated content banner for staff in lms 2016-07-27 14:03:08 +00:00
Saleem Latif
6277bd27e6 Remove all usages of USE_CUSTOM_THEME and THEME_NAME from python files 2016-07-27 14:53:02 +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
cahrens
b8cd96e371 Delete XBlockDisableConfig model.
TNL-4672
2016-07-26 15:49:34 -04:00
Sanford Student
d996c2a3cd per cliff's review 2016-07-26 11:39:19 -04:00
Sanford Student
d9e0ba45cc first round of self review and code review 2016-07-26 10:50:02 -04:00
Sanford Student
7d690dde8a adding request cache for milestones 2016-07-25 16:55:06 -04:00
sanfordstudent
ba54ad197e Merge pull request #13075 from edx/sstudent/TNL-4925
generalizing proctored exam transformer to handle all milestones
2016-07-25 10:10:42 -04:00
wajeeha-khalid
03cee389e0 update oauthlib version to 1.0.3 2016-07-25 10:59:42 +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
Sanford Student
87a9ebce9a generalizing proctored exam transformer to handle all milestones 2016-07-22 12:57:23 -04:00
Nimisha Asthagiri
b04a6a6a4b Merge pull request #13053 from edx/tnl/grades-app
Create Grades djangoapp
2016-07-22 09:07:40 -04:00
Nimisha Asthagiri
1ada5c3487 Create Grades djangoapp
https://openedx.atlassian.net/browse/TNL-5008
2016-07-22 00:09:43 -04: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
Eric Fischer
cae03d0349 Revert "moving milestones check to access.py" (#13060) (#13061)
This reverts commit 5db58c0038.
2016-07-21 13:58:35 -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
Robert Raposa
67e15e22e6 Merge pull request #13046 from edx/release
Release 2016-07-20 back to Master
2016-07-21 10:43:58 -04:00
Kevin Kim
94100f5944 Convert ORA due dates to user preferred time zone 2016-07-21 13:57:20 +00:00
Andy Armstrong
51bb4d4e00 Merge pull request #12795 from eduNEXT/fmo/coffee_to_js_cms_main
Convert cms/coffee/src/main to js
2016-07-20 15:16:48 -04:00
Adam Palay
95c0b50ebe authenticate user after their reset confirmation goes through
make password validation code more DRY

grammar nit: "less" -> "fewer"
2016-07-20 11:06:58 -04:00
Edward Zarecor
95800be01f Merge pull request #12999 from edx/e0d/random-passwords
use random rather than unusable so they can be reset
2016-07-20 09:28:26 -04:00
Felipe Montoya
c32b30ba94 Relocating inside the cms namespace
Addressing feedback
2016-07-18 18:07:35 -05:00
Renzo Lucioni
863782d021 Merge pull request #12991 from edx/renzo/run-marketing-urls
Use course run marketing URLs from the catalog service on program detail page
2016-07-15 17:55:01 -04:00
Renzo Lucioni
a43c507a00 Use course run marketing URLs from the catalog service on program detail page
Part of ECOM-4566.
2016-07-15 16:12:10 -04:00
e0d
8a18b2c351 use random rather than unusable so they can be reset 2016-07-14 08:09:51 -04:00
Awais Jibran
07467a5b68 Merge pull request #12989 from edx/aj/add-logging-for-allow-donation
Adding logging if course_id is not found in enrolled course modes.
2016-07-14 15:03:08 +05:00
Awais Jibran
dba8a51f59 Adding logging if course_id is not found in enrolled course modes. 2016-07-14 12:59:38 +05:00
Toby Lawrence
8ab62b5b99 [PERF-351] Account for settings.STATIC_URL in XBlock resource URLs when
rewriting them.

In PERF-341, we adjusted the static_replace middleware to try and
exclude static XBlock resource URLs from being interpreted as the marker
URLs used to signify course assets in course content.  Since they both
started with /static, this could, and did, cause issues where linking
directly to the assets of an XBlock within, say, one of its templates,
would lead to that link being rewritten and ultimately being incorrect.
The fix attempted to see if the link started with the prefix that all
static XBlock resource URLs start, and if so, it returned them
unmodified.

We incorrectly assumed that our testing captured all cases, and since
we're here, we know that this was wrong.  We weren't accounting for cases
when the URLs being generated had the STATIC_URL configuration value
prefixed -- https://example.com/static/xblock/.... -- and so our direct
check of seeing if such a URL started with "/static/xblock" would always
fail, leading to the erroneous rewriting and nonsensical output.

This fix checks if the link either starts with the prefix OR if it
starts with the STATIC_URL value and contains the prefix overall.  There
is a small overlap between the STATIC_URL and the prefix we check for,
so an inconsistency could arise down the line if we changed our
STATIC_URL to use a difference base directory, but our tests will at
least catch the issue now.
2016-07-12 22:33:11 -04:00
sanfordstudent
d13e456959 Merge pull request #12939 from edx/sstudent/TNL-4924
moving milestones/gating check to access.py
2016-07-11 16:21:53 -04:00
Douglas Hall
c38f2373c7 Add recipient key to Zendesk ticket creation API request payload 2016-07-11 14:56:44 -04:00
Sanford Student
5db58c0038 moving milestones check to access.py 2016-07-11 14:32:52 -04:00
Toby Lawrence
54fa8aebbc Merge pull request #12959 from edx/PERF-346
[PERF-346] Add a second version component to versioned course asset URLs
2016-07-11 09:32:09 -04:00
Toby Lawrence
f15533dc8f [PERF-346] Add a second version component to versioned course asset URLs
This version component reflects the "version" of the StaticContent
objects which we cache server-side.  If the layout of those objects
changes between releases, errors occur when loading them from cache.

By using a separate version value, which can be incremented on its own
after a change has been made to the StaticContent class, we can avoid
loading older cached content and in turn take advantage of these changes
faster, without needing to intervene operationally.
2016-07-10 19:20:20 -04:00
Christina Roberts
b6b792826c Merge pull request #12864 from edx/christina/disable-xblocks
Move disabling of XBlocks to new XBlockConfiguration model
2016-07-08 15:05:17 -04:00
Chris Rodriguez
4cf0e19af2 AC-520 fixing section ignores 2016-07-06 15:01:44 -04:00