Commit Graph

14680 Commits

Author SHA1 Message Date
wajeeha-khalid
551fd7eef0 MA-2646: handle profile_image in requested_fields for anonymous user 2016-07-29 11:42:56 +05: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
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
Nimisha Asthagiri
a1a5a0fcb9 Enable Milestones in LMS Tests 2016-07-27 14:56:24 -04: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
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
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
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
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
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
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
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
Ahsan Ulhaq
45db2feb01 Photo Verification Admin Broken
ECOM-5029
2016-07-26 09:37:17 +05: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
d061b8ddbe Use request_cache for storing disabled xblock names.
TNL-5002
2016-07-25 16:17:30 -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
Chris Rodriguez
103e1c8411 AC-544 certs regen use implicit labels; cleanup 2016-07-25 13:39:38 -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
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
f90bf5964a MA-2552: create revoke_token endpoint for oauth 2016-07-25 13:34:34 +05:00
wajeeha-khalid
98ba4b779c MA-2076: add due date to course block API 2016-07-25 11:06:47 +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
Daniel Naranjo
f84d05b9af add formatting and indentation best practices (#12850)
add_missing_semicolon

simple SpaceBeforeBrace
2016-07-22 15:42:42 -04: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
Eric Fischer
1af5e2abda Retry-while-retrying is not an error in bulk email (#13068)
This code will be hit if, during a retry of the send_email task, an error
is encountered that means we need to retry the task again. Since the task will
be retried with timed backoff up to predefinied limits, this is an expected
situation and does not need to be logged as an exception.
2016-07-22 14:19:03 -04:00
Sanford Student
87a9ebce9a generalizing proctored exam transformer to handle all milestones 2016-07-22 12:57:23 -04:00
Ned Batchelder
3799890b98 Merge pull request #13072 from edx/ned/update-translations
Update translations (autogenerated message)
2016-07-22 10:14:30 -04:00
Kevin Kim
2fddd2bd71 Initial check of removing feature flag (#13058) 2016-07-22 09:28:19 -04:00
Ned Batchelder
eaece533a9 Update translations (autogenerated message) 2016-07-22 09:28:15 -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
sanfordstudent
f2a1984f1a Revert "genericizing transformer" (#13063)
This reverts commit 4e65b1f14b.
2016-07-21 17:04:07 -04:00
Renzo Lucioni
719edc7632 Merge pull request #13032 from edx/renzo/program-utility-cleanup
Handle unavailable course runs on the program detail page
2016-07-21 16:30:44 -04:00
cahrens
d4cc7b8ffd Support level support for Studio xblock creation.
TNL-4670
2016-07-21 15:44:59 -04:00
Renzo Lucioni
4c997601e9 Handle unavailable course runs on the program detail page
Includes a refactor of the program data extension utility. ECOM-4807.
2016-07-21 15:05:23 -04:00
Adam
05700243fe Merge pull request #13037 from OmarIthawi/edraak/calculator-2-fixups
Calculator wording and translation improvements
2016-07-21 14:42:53 -04:00