Commit Graph

38030 Commits

Author SHA1 Message Date
Chris
685bc2ff81 Merge pull request #13087 from edx/clrux/ac-543
AC-543 fixing bulk cert exception implicit labels
2016-08-01 12:16:06 -04:00
Christina Roberts
37db65fa90 Merge pull request #13131 from edx/christina/retry-celery
Retry on failures (database locking).
2016-08-01 12:06:46 -04:00
Brian Jacobel
829b7641bf Merge pull request #13081 from edx/bjacobel/eslint
Replace JSHint with ESLint and the new JavaScript styleguide
2016-08-01 11:55:00 -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
shaunagm
9b48eaf21a Merge pull request #13118 from shaunagm/master
Change relative paths to absolute paths in in acceptance test imports
2016-08-01 11:02:12 -04:00
Aasavari Phanse
8892051070 Merge pull request #13115 from edx/aphanse/modify-coveragerc
Change python coveragerc file
2016-08-01 09:10:14 -04:00
John Eskew
70929ffb12 Merge pull request #13019 from mitocw/fix/aq/emit_course_published_event
Fixed progress page update on save ccx and grade book crash issue
2016-07-29 16:02:42 -04:00
Chris Rodriguez
a10b61f8c3 AC-543 fixing bulk cert exception implicit labels 2016-07-29 14:49:23 -04:00
Brian Jacobel
9c959b9d3a Add back JSHint tests 2016-07-29 13:27:55 -04:00
Brian Jacobel
af76273393 Install and configure eslint and eslint-config-edx (alongside JSHint for now) 2016-07-29 13:27:55 -04:00
cahrens
7efc7fe40e Retry on failures (database locking).
TNL-5091
2016-07-29 11:57:28 -04:00
Amir Qayyum Khan
34034aa6f5 Made ccx id unicode in app 2016-07-29 19:37:46 +05:00
Ben Patterson
2c4ab11658 Merge pull request #12794 from edx/benp/collectstatic-logging
FEDX-152. Pipe collectstatic results to a file for bok-choy tests.
2016-07-29 09:58:49 -04:00
Amir Qayyum Khan
d5fcb609e7 Fixed progress page update on save ccx 2016-07-29 18:11:42 +05:00
Ben Patterson
066450d274 FEDX-152. Pipe collectstatic results to a file for bok-choy tests. 2016-07-29 08:11:13 -04:00
wajeeha-khalid
550f8520b4 Merge pull request #12818 from edx/jia/MA-2536
MA-2536: get 'course_about' url in enrollment
2016-07-29 16:10:53 +05: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
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
Shauna Gordon-McKeon
f8d28889b9 Remove unused imports, move too-long imports to multiple lines 2016-07-28 16:35:40 -04:00
Shauna Gordon-McKeon
12a619318e Switch relative to absolute urls in imports (tests/lms part 2) 2016-07-28 16:35:40 -04:00
Shauna Gordon-McKeon
89ed6f1c2b Switch relative to absolute urls in imports (tests/lms part 1) 2016-07-28 16:35:40 -04:00
Shauna Gordon-McKeon
29bb5b50e9 Switch relative to absolute urls in imports (video, discussion, misc) 2016-07-28 16:35:40 -04:00
Shauna Gordon-McKeon
5d50e76eaf Switch relative to absolute urls in imports (tests/studio part 2) 2016-07-28 16:35:40 -04:00
Shauna Gordon-McKeon
787b420539 Switch relative to absolute urls in imports (tests/studio part 1) 2016-07-28 16:35:40 -04: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
aphanse
5102635b8b Change python coveragerc file 2016-07-27 13:56:59 -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