Commit Graph

37986 Commits

Author SHA1 Message Date
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
Eugeny Kolpakov
205cb8b3eb Merge pull request #13056 from open-craft/ekolpakov/fix_legacy_discussion_import
[TNL-5001] Import-export issues when importing legacy discussion OLX format
2016-07-26 13:05:23 +03:00
Ahsan Ulhaq
45db2feb01 Photo Verification Admin Broken
ECOM-5029
2016-07-26 09:37:17 +05:00
E. Kolpakov
1f9dfe6573 [TNL-5001] Import-export issues when importing legacy discussion OLX format
Observed Problems:
1. Discussion categories and targets were missing
2. When imported over existing course Discussion IDs have changed unexpectedly - all posts were missing

Solutions:
* Parsing legacy discussion OLX
* Do not force exporting discussion ID
2016-07-25 14:38:03 -07:00
E. Kolpakov
fe6a942baa [TNL-5001] Import-export issues when importing legacy discussion OLX format
Observed Problems:
1. Discussion categories and targets were missing
2. When imported over existing course Discussion IDs have changed unexpectedly - all posts were missing

Solutions:
* Parsing legacy discussion OLX
* Do not force exporting discussion ID
2016-07-25 14:35:19 -07:00
Christina Roberts
0438878ab9 Merge pull request #13069 from edx/christina/cache-disable-state
Use request cache for disabled_xblock_types
2016-07-25 17:20:49 -04:00
Sanford Student
7d690dde8a adding request cache for milestones 2016-07-25 16:55:06 -04:00
Renzo Lucioni
27d585e0fc Merge pull request #13085 from edx/renzo/devstack-jwt
Configure JWT auth when running Studio in devstack
2016-07-25 16:29:55 -04:00
cahrens
682ee5eac1 Rename helper method that was being run as a testpoint. 2016-07-25 16:17:40 -04:00
cahrens
d061b8ddbe Use request_cache for storing disabled xblock names.
TNL-5002
2016-07-25 16:17:30 -04:00
Brian Jacobel
450a0bc980 Document how to run tests on Paver scripts (#13088)
Meta.
2016-07-25 16:13:17 -04:00
Simon Chen
bc6a0603d4 Try to fix program editor in studio for stage (#13084) 2016-07-25 15:39:53 -04:00
Brian Beggs
93969f1b1e Merge pull request #12996 from mitocw/fix/aq/staff_access_coach_dashboard
Fixed staff access to CCX coach dashboard issues
2016-07-25 15:37:58 -04:00
Brian Jacobel
940f6e992d Document how to run tests on Paver scripts
Meta.
2016-07-25 15:20:58 -04:00
Simon Chen
9424930fbd Try to fix program editor in studio for stage 2016-07-25 14:49:46 -04:00
Renzo Lucioni
29672370b9 Configure JWT auth when running Studio in devstack
An important step towards being able to use Studio's program editor out of the box. Part of ECOM-4638.
2016-07-25 13:37:20 -04: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
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
42337f803f Merge pull request #12895 from edx/jia/MA-2552
MA-2552: create revoke_token endpoint for oauth
2016-07-25 18:20:42 +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