Commit Graph

7098 Commits

Author SHA1 Message Date
Ned Batchelder
411219aac8 Update translations (autogenerated message) 2016-08-18 17:05:20 +00:00
M. Rehan
ffbaf1fe54 Merge pull request #12813 from edx/aj/TNL4826-lib-problems-not-update-with-import
Refersh library children for the block during import.
2016-08-16 00:52:58 +05:00
Eric Fischer
501fc69d7f Messaging update to hide after due warning 2016-08-15 12:20:11 -04:00
Asad Iqbal
1a179289ab Merge pull request #13220 from edx/asadiqbal08/OLIVE-75
OLIVE-75 - CourseID Term not rendering correctly.
2016-08-15 19:19:06 +05:00
Qubad786
aca82be335 Move fix to importer module and fix branch_setting in MixedModuleStore. 2016-08-15 18:50:50 +05:00
asadiqbal
1e938162db OLIVE-75 - CourseID Term not rendering correctly 2016-08-15 17:48:25 +05:00
Ned Batchelder
f8cadf7481 Merge pull request #13221 from edx/ned/update-translations
Update translations (autogenerated message)
2016-08-11 13:59:17 -04:00
Ned Batchelder
8ee9fcd8b2 Update translations (autogenerated message) 2016-08-11 16:00:22 +00:00
Albert (AJ) St. Aubin
28922ca688 Merge pull request #13197 from edx/aj/TNL-5051_CourseInfoAcctptanceTest
Aj/tnl 5051 course info acctptance test
2016-08-11 11:40:31 -04:00
Renzo Lucioni
363f9e2cd5 Merge pull request #13170 from edx/renzo/dashboard-programs
Display programs of all categories on the student dashboard
2016-08-11 10:06:15 -04:00
Albert St. Aubin
b63bfbd5dd Replaced lettuce tests with bokchoy tests for the course updates page and improved flaky test issues.
TNL-5051
2016-08-11 10:04:57 -04:00
Renzo Lucioni
9c81ba47e2 Display programs from all categories on the student dashboard
Removes most remaining hardcoded references to XSeries from the LMS. Part of ECOM-4638.
2016-08-11 09:00:23 -04:00
Awais Jibran
878b9124ab Merge pull request #13111 from edx/aj/ECOM4890-make-studio-case-insensitive-for-create-course
Make studio case-insensitive for course keys for creating courses.
2016-08-10 16:20:36 +05:00
Awais Jibran
4bc5ded768 Make studio case-insensitive for course keys for creating courses.
ECOM-4890
2016-08-10 14:34:35 +05:00
Mushtaq Ali
95b16dba4d Merge pull request #13183 from edx/mushtaq/maintenance
Maintenance app RequireJS
2016-08-09 23:52:01 +05:00
Brian Jacobel
71b0ea8fef Merge pull request #13173 from edx/bjacobel/autofix-cms
Run ESLint autofixer in CMS
2016-08-09 12:20:45 -04:00
Mushtaq Ali
fb2f9948e1 Fix dynamic load RequireJs issue on Maintenance Dashboard 2016-08-09 13:48:20 +00:00
Mushtaq Ali
abb6af9789 Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46 2016-08-09 18:16:13 +05:00
Brian Jacobel
d43e915dab Run eslint autofixer on /cms 2016-08-08 15:04:06 -04:00
Brian Beggs
1182ae6c54 Adding edx-django-release-util to LMS and CMS 2016-08-05 13:50:05 -04:00
alisan617
46b94ec6be remove dropdown menu class that has pseudo border that double arrows 2016-08-05 11:46:26 -04:00
sanfordstudent
095bae1a2c Merge pull request #13129 from edx/sstudent/TNL-5099
WIP: initial re-add with no extra work beyond merge conflicts
2016-08-05 09:47:27 -04:00
Brian Jacobel
c7042c4879 Merge pull request #13159 from edx/bjacobel/jshint-directives-to-eslint
JSHint directives to ESLint (WIP)
2016-08-04 17:11:56 -04:00
Brian Jacobel
a32fd27d60 Replace JSHint ignore directives with ESLint ones 2016-08-04 16:22:59 -04:00
Sanford Student
fc943ff539 moving milestones check to access.py and upgrading milestones version 2016-08-04 14:47:15 -04:00
Ned Batchelder
02f378a6ff Update translations (autogenerated message) 2016-08-04 18:25:47 +00:00
Ned Batchelder
7a0d764ef3 Update translations (autogenerated message) 2016-08-04 17:42:48 +00:00
Nimisha Asthagiri
be5940e6f4 Robust Grades refactor
Adds ENABLE_SUBSECTION_GRADES_SAVED feature flag to both lms and cms. Also
installs the wiring that will allow robust grades to be used for courses
that enable it. This functionality is still gated by the feature flag
and should not be used until the remaining robust grades work is finished.
2016-08-03 15:47:16 -04:00
Chris
e641c0dcee Merge pull request #13134 from edx/clrux/ac-549
AC-549 updating pink
2016-08-03 14:34:30 -04:00
Ned Batchelder
76bc4fb98e Fix 29 anomalous-backslash-in-string errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
8571ceabeb Fix many wrong-assert-type errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
eef964f5f6 Fix unused-variable errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
1905f0c517 Fix simplifiable-range errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
8b1978ba6c Fix unused-import errors 2016-08-03 12:44:41 -04:00
Chris Rodriguez
edfd0d6aa0 AC-549 updating pink 2016-08-03 11:10:05 -04:00
Andy Armstrong
7119357a07 Address code review feedback 2016-08-02 18:57:13 -04:00
Andy Armstrong
2e12214a17 Update Pattern Library pages to use new color scheme
TNL-5135
2016-08-02 18:57:13 -04:00
mikedikan
13c8e39259 Merge pull request #13147 from edx/release
Release
2016-08-02 12:29:39 -04:00
alisan617
ba74ba90ea Merge pull request #13035 from OmarIthawi/edraak/rtl-fixups
Two RTL Fixups in Studio and CAPA problems
2016-08-02 10:11:45 -04:00
Omar Al-Ithawi
1655625b4b Two RTL Fixups in Studio and CAPA problems
- Fixed RTL icon margin in the studio
  - Make math equation fields always LTR in CAPA problems
2016-08-02 11:33:55 +03: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
Renzo Lucioni
92f3c7ee60 Merge pull request #13112 from edx/release
Release
2016-07-27 12:33:49 -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
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
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
Diana Huang
92587fbf2b Merge pull request #13105 from edx/release
Release back into master
2016-07-26 15:09:11 -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
Simon Chen
9424930fbd Try to fix program editor in studio for stage 2016-07-25 14:49:46 -04:00