Commit Graph

38006 Commits

Author SHA1 Message Date
Sven Marnach
0206dfaea5 Add support to set initial password hash to manage_user command. 2016-07-29 11:19:07 +02:00
wajeeha-khalid
cad10c2302 Merge pull request #13119 from edx/jia/MA-2646
MA-2646: handle profile_image in requested_fields for anonymous user
2016-07-29 13:04:24 +05:00
wajeeha-khalid
551fd7eef0 MA-2646: handle profile_image in requested_fields for anonymous user 2016-07-29 11:42:56 +05:00
Kevin Kim
3a65ca02fe Merge pull request #13023 from edx/kkim/country_tz_api
Country Time Zone API
2016-07-28 16:28:47 -04:00
Christina Roberts
a35a6b73e4 Merge pull request #13116 from edx/christina/remove-extra-save
There is no need to call save after add/remove.
2016-07-28 15:07:42 -04:00
Kevin Kim
127095b94a Add endpoint for commonly used country time zones 2016-07-28 19:02:55 +00:00
sanfordstudent
194c5096c5 Merge pull request #13123 from edx/sstudent/milestones-fie
Fixing test failures on master
2016-07-28 14:59:25 -04:00
Sanford Student
03256937e6 fixing failing tests on master from enabling milestones_app feature flag 2016-07-28 14:18:45 -04:00
PaulWattenberger
59ac60f20e Merge pull request #13117 from edx/pwattenberger/ECOM-5065
ECOM-5065 Don't retry invalid email response from Sailthru
2016-07-28 11:15:24 -04:00
PaulWattenberger
dd4bab3cb3 ECOM-5065 Don't treat invalid email response from Sailthru as retryable error 2016-07-28 10:35:10 -04:00
sanfordstudent
7fc020761c Merge pull request #13083 from edx/tnl/enable_milestones
Enable Milestones in LMS Tests
2016-07-28 09:12:12 -04:00
raeeschachar
e861b6094b Merge pull request #13101 from edx/raees/chrome-bokchoy-skip-discussion-sort-preference
Skipped test failing on chrome due to old version
2016-07-28 11:47:41 +05:00
PaulWattenberger
97489999b9 Merge pull request #13114 from edx/pwattenberger/ECOM-5059
ECOM-5059 Fix domain Sailthru logon cookie dropped in to
2016-07-27 16:36:16 -04:00
cahrens
c195e7eb72 There is no need to call save after add/remove. 2016-07-27 16:15:16 -04:00
Muhammad Ammar
113458a3c6 Merge pull request #13100 from edx/ammar/tnl-5003-fix-xblock-url-for-verticals
fix xblock urls for verticals
2016-07-27 23:57:07 +05:00
Nimisha Asthagiri
a1a5a0fcb9 Enable Milestones in LMS Tests 2016-07-27 14:56:24 -04:00
muhammad-ammar
152ae4b1c2 fix xblock urls for verticals
TNL-5003
2016-07-27 22:42:30 +05:00
Chris
df66a8e32d Merge pull request #13086 from edx/clrux/ac-544
AC-544 certs regen use implicit labels; cleanup
2016-07-27 13:01:34 -04:00
PaulWattenberger
366b522650 ECOM-5059 Fix domain Sailthru logon cookie dropped in to 2016-07-27 12:40:53 -04:00
Renzo Lucioni
92f3c7ee60 Merge pull request #13112 from edx/release
Release
2016-07-27 12:33:49 -04:00
Andy Armstrong
6e01f532c7 Merge pull request #12610 from OmarIthawi/edraak/forum-post-button
Corrected RTL issues new forum post button
2016-07-27 12:25:32 -04: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
Renzo Lucioni
66d4dc9397 Merge pull request #13109 from edx/patch/2016-07-27
Updates to facilitate program category casing changes
2016-07-27 11:05:54 -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
David Ormsbee
1809f88dd8 Merge pull request #12931 from edx/ormsbee/ok_perf_0.3.2
Bump opaque-keys version to 0.3.2
2016-07-27 09:48:04 -04:00
Saleem Latif
a538fa00e8 Merge pull request #12995 from edx/saleem-latif/WL-300
WL-300: Remove all usages of USE_CUSTOM_THEME and THEME_NAME from python files
2016-07-27 15:48:50 +05: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
80644e0d18 Merge pull request #13039 from edx/saleem-latif/WL-343
WL-343: Merge microsites into Comprehensive Theming
2016-07-27 14:50:13 +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
David Ormsbee
5d150a39eb Bump opaque-keys version to 0.3.2 2016-07-26 17:31:15 -04:00
Renzo Lucioni
b540968457 Updates to facilitate program category casing changes
The LMS continues to expect lowercased category slugs, while the Studio program creator now uses correctly cased slugs. Programs should be updated before this is released. Part of ECOM-5018.
2016-07-26 16:28:41 -04:00
cahrens
b8cd96e371 Delete XBlockDisableConfig model.
TNL-4672
2016-07-26 15:49:34 -04:00
Ahsan Ulhaq
e8c60bc6c1 Merge pull request #13096 from edx/ahsan/ECOM-5029-Photo-Verification-Admin-Broken
Photo Verification Admin Broken
2016-07-27 00:32:45 +05:00
Diana Huang
92587fbf2b Merge pull request #13105 from edx/release
Release back into master
2016-07-26 15:09:11 -04:00
Nimisha Asthagiri
558043a8e6 Merge pull request #13082 from edx/tnl/split-edit-version
Expose course_version and subtree_edited_on in BlockStructures
2016-07-26 15:04:47 -04:00
sanfordstudent
8acd1bb19f Merge pull request #13090 from edx/sstudent/TNL-5071
adding request cache for milestones
2016-07-26 15:03:01 -04:00
Sanford Student
f02889e8d2 removing redundant inherit 2016-07-26 14:11:50 -04:00
Calen Pennington
a1e93f613a Merge pull request #13104 from cpennington/revert-paver-timing
Revert "Merge pull request #13021 from cpennington/paver-timing"
2016-07-26 13:41:39 -04:00
Nimisha Asthagiri
9616ac99f8 Expose course_version from Split Modulestore;
Support subtree_edited_on and course_version fields in BlockStructures
TNL-5010
2016-07-26 13:40:53 -04:00
Diana Huang
20cbc62c37 Merge pull request #13077 from edx/rc/2016-07-26
Release Candidate rc/2016-07-26
2016-07-26 13:33:12 -04:00
Calen Pennington
acf50c4469 Revert "Merge pull request #13021 from cpennington/paver-timing"
This reverts commit ed80381b41, reversing
changes made to 205cb8b3eb.
2016-07-26 13:32:59 -04:00
Sanford Student
d996c2a3cd per cliff's review 2016-07-26 11:39:19 -04:00
Sanford Student
c3d829f2c5 adding query counts 2016-07-26 11:11:59 -04:00
Sanford Student
d9e0ba45cc first round of self review and code review 2016-07-26 10:50:02 -04:00
Calen Pennington
ed80381b41 Merge pull request #13021 from cpennington/paver-timing
[EV-62] Paver timing
2016-07-26 09:50:40 -04:00
alisan617
b5dc83f101 Merge pull request #13095 from open-craft/discussion-export-hotfix
Discussion import/export fix (TNL-5001)
2016-07-26 09:07:28 -04:00
raeeschachar
e8d32c839d Skipped test failing on chrome due to old version 2016-07-26 11:49:18 +00:00