Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,834 Commits 1 Branch 0 Tags
622ee7a7e35e33b198561e525bafd93e61aa82c8
Commit Graph

43834 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Beggs
622ee7a7e3 Merge pull request #16540 from open-craft/mtyaka/mongo-read-preference 
Convert mongo read_preference setting at a lower level.
 2017-11-28 09:14:56 -05:00
Douglas Hall
900f066dc9 Merge pull request #16692 from edx/douglashall/update_edx_enterprise_0_53_19 
Update edx-enterprise package to 0.53.19.
 2017-11-28 09:10:07 -05:00
Alessandro Roux
c21895a8cb Merge pull request #16646 from edx/pacing/highlights-setting-UI-for-courses 
Pacing/highlights setting ui for courses
 2017-11-28 08:54:05 -05:00
Douglas Hall
a374606703 Update edx-enterprise package to 0.53.19. 2017-11-28 07:17:22 -05:00
Douglas Hall
7f60dcb255 Merge pull request #16689 from edx/saleem-latif/ENT-740-version-upgrade 
ENT-740: edx-enterprise version upgrade to 0.53.18
 2017-11-28 06:59:04 -05:00
syed-awais-ali
d1757fdf50 Merge pull request #16677 from edx/aali/OPS-2476_update_requiremnts 
added redis version
 2017-11-28 16:20:29 +05:00
Saleem Latif
61a163fcb3 edx-enterprise version upgrade to 0.53.18 2017-11-28 13:02:57 +05:00
Tyler Hallada
9f74e70589 Course Highlights Setting in Studio Course Outline 
fixup! trying to "fix" underscore syntax error

add cancel modal test

Fix quality issues.

Apply Nimisha's suggestions for my quality fixes.

Skip test_drop_unit_in_collapsed_subsection

Fix quality error
 2017-11-27 17:23:55 -05:00
sandroroux
13edb0b03e Updated course_has_highlights and get_week_highlights. Methods ensure that a course has highlights_enabled_for_messaging 
Responded to Nimisha's review feedback.
 2017-11-27 17:23:29 -05:00
Sofiya Semenova
ea488f84ed Merge pull request #16633 from edx/sofiya/ed-1560 
Educator 1560 - Clean up labelling in the Discussion Add Post form
 2017-11-27 13:47:54 -05:00
Michael Terry
ffc838250d Merge pull request #16605 from mikix/mikix/border-a11y 
Show current tab even in high contrast mode
 2017-11-27 12:14:29 -05:00
Michael Terry
20154a761c Merge pull request #16641 from mikix/mikix/button-a11y 
Fix focus loss when bookmarking a page in IE
 2017-11-27 12:13:06 -05:00
sanfordstudent
b6d9dfb2ab Merge pull request #16652 from edx/add-persistent-grade-override-table-in-admin 
Add `PersistentSubsectionGradeOverride` table in django admin
 2017-11-27 11:12:34 -05:00
Sofiya Semenova
3244fc0d67 Educator 1560 - Clean up labelling in the Discussion Add Post form 2017-11-27 11:12:05 -05:00
Jeremy Bowman
139fa895d1 Merge pull request #16662 from edx/jmbowman/more_ssencrypt_tests 
Add more ssencrypt tests
 2017-11-27 10:29:41 -05:00
Awais Jibran
baa967ca66 Add PersistentSubsectionGradeOverride table in django admin 
EDUCATOR-1624
 2017-11-27 10:11:57 -05:00
Matt Tuchfarber
1d8613f34e Merge pull request #16602 from edx/tuchfarber/fix_instructor_ordering 
Fix instructors ordering on program marketing page
 2017-11-27 09:52:23 -05:00
Brian Mesick
4a938c1496 Merge pull request #16645 from edx/bmedx/django111_fix_cms_failures 
Fixes to common/openedx tests that reference apps CMS doesn't use
 2017-11-27 09:16:19 -05:00
Brian Mesick
9911c8d068 Merge pull request #16649 from edx/bmedx/django111_tag_test_failures_lms_1 
Tag LMS Unit 1 tests that fail in Django 1.11
 2017-11-27 09:15:53 -05:00
Brian Mesick
3d5fef7882 Merge pull request #16655 from edx/bmedx/django111_tag_test_failures_lms_2 
Tag LMS Unit 2 tests that fail in Django 1.11
 2017-11-27 09:15:26 -05:00
Mushtaq Ali
4a0d6264c8 Merge pull request #16672 from edx/mushtaq/val-version-bump 
VAL version bump
 2017-11-27 19:13:21 +05:00
syed-awais-ali
375190f4f8 added redis version 2017-11-27 18:37:17 +05:00
Mushtaq Ali
37bbfd0a5c VAL version bump - EDUCATOR-1809 2017-11-27 18:09:02 +05:00
raeeschachar
e739bc82c2 Merge pull request #16673 from edx/raees/LEARNER-2881-header-logo-link-to-mktg-root 
Fix header logo link to MKTG root.
 2017-11-27 17:42:42 +05:00
raeeschachar
5196f4b108 Fix header logo link to MKTG root. 
In courseware, banner Logo links to Dashboard, footer logo
links to home page.

LEARNER-2881
 2017-11-24 18:26:26 +05:00
Ayub khan
dd2f90fb47 Merge pull request #16666 from edx/LEARNER-2653-update-django-wiki-version 
LEARNER-2653 Update django-wiki version
 2017-11-23 17:10:51 +05:00
Ayub khan
4aeb7f1058 Merge pull request #16667 from edx/Update_pull_translations_Nov_23 
Updated pull Translations
 2017-11-23 17:09:37 +05:00
ayub-khan
9e619e4244 Updated Translations 2017-11-23 16:02:47 +05:00
Ahsan Ul Haq
6e72065032 Merge pull request #16620 from edx/ahsan/LEARNER-3298-Learner-certificates-should-not-be-findable-before-available-date 
Learner certificates should not be findable before the available date
 2017-11-23 15:39:49 +05:00
ayub-khan
992832ca0b update django-wiki version 2017-11-23 14:32:53 +05:00
Ahsan Ulhaq
da675e52dc Learner certificates should not be findable before the available date 
LEARNER-3298
 2017-11-23 14:14:05 +05:00
Matjaz Gregoric
dcb77ff7ae Merge pull request #16510 from open-craft/mtyaka/lms-internal-root-url 
Introduce LMS_INTERNAL_ROOT_URL.
 2017-11-23 09:21:15 +01:00
Matjaz Gregoric
d403e5f8b1 Introduce LMS_INTERNAL_ROOT_URL. 
The LMS and edx-enterprise currently communicate via REST APIs, even
though they are all running within the same service.

Currently API URLs are constructed using LMS_ROOT_URL, but that is
problematic on some systems where the external LMS_ROOT_URL is not
accessible from the private network, or routing internal requests via
the external URL is not desireable.

This patch introduces a new setting variable LMS_INTERNAL_ROOT_URL which
defaults to the value of LMS_ROOT_URL for backwards compatibility.

The LMS and edx-enterprise will use LMS_INTERNAL_ROOT_URL to construct
API URLs instead of LMS_ROOT_URL.
 2017-11-23 08:17:38 +01:00
Jeremy Bowman
b00b6b89a8 Add more ssencrypt tests 2017-11-22 17:59:02 -05:00
Brian Beggs
705aac7980 Merge pull request #16657 from edx/bbeggs/sorl-thumbnail 
Pin sorl-thumbnail to 12.3
 2017-11-22 16:48:59 -05:00
bmedx
d827d47b48 Tag LMS Unit 2 tests that fail in Django 1.11 2017-11-22 15:47:22 -05:00
bmedx
5fbbf4979a Tag LMS Unit 1 tests that fail in Django 1.11 2017-11-22 15:46:45 -05:00
bmedx
d3e6836d9e Fixes to common/openedx tests that reference apps CMS doesn't use 2017-11-22 15:46:06 -05:00
Brian Beggs
423b932e9e Pin sorl-thumbnail to 12.3 2017-11-22 15:44:26 -05:00
Calen Pennington
aa0377b01e Merge pull request #16661 from cpennington/fix-linting-errors 
Fix linting errors from https://github.com/edx/edx-platform/pull/16615
 2017-11-22 15:37:14 -05:00
edx-pipeline-bot
c23b0fce1a Merge pull request #16659 from edx/release-mergeback-to-master 
Merge release back to master
 2017-11-22 15:26:40 -05:00
Calen Pennington
48abc492ae Fix linting errors from https://github.com/edx/edx-platform/pull/16615 2017-11-22 14:47:49 -05:00
Jeremy Bowman
4ba29b4707 Convert unicode to bytes for RSA encryption 2017-11-22 11:55:44 -05:00
Ned Batchelder
a2e2aace82 Merge pull request #16650 from edx/nedbat/fix-unused-imports 
Fix a number of unused-import pylint violations
 2017-11-22 11:17:07 -05:00
John Eskew
872df1e4bd Merge pull request #16647 from edx/jeskew/custom_template_loader_fixes 
Change template's deprecated '=' comparison to '=='.
 2017-11-22 09:22:06 -05:00
Ned Batchelder
c966707a86 Correct a mock that was at the wrong module 2017-11-22 08:03:22 -05:00
Matt Drayer
8d1053eef8 Merge pull request #16566 from edx/mattdrayer/ENT-686-5 
Better handling of data for OData API exception handling
 2017-11-22 07:39:52 -05:00
Matt Drayer
9b4be93628 Better handling of data for OData API exception handling 2017-11-21 23:41:06 -05:00
Calen Pennington
7aa1a3460b Merge pull request #16615 from edx/cale/schedules-admin-improvements 
Cale/schedules admin improvements
 2017-11-21 22:06:37 -05:00
Ned Batchelder
e23e3a0486 Fix a number of unused-import pylint violations 2017-11-21 19:57:06 -05:00