Matjaz Gregoric
e4a3a30c8b
Convert mongo read_preference setting at a lower level.
...
Doing it at the modulestore level does not cover all usages of mongo,
for example when connecting to the contentstore.
2017-11-13 11:18:34 +01:00
edx-pipeline-bot
230b18db16
Merge pull request #16531 from edx/release-mergeback-to-master
...
Merge release back to master
2017-11-10 22:39:41 -05:00
adeel khan
4fd43029df
Merge pull request #16518 from edx/adeel/LEARNER_2571_studentaccountview_error_handle
...
Adds error handling for password reset
2017-11-10 16:21:10 +05:00
Adeel Khan
3f61f50de0
Adds error handling for password reset
...
This patch enables handling of UserAPIInternalError on password
reset , instead of throwing 500 to user. We are showing user
a message if UserAPIInternalError is raised.
LEARNER-2571
2017-11-10 14:41:15 +05:00
Gabe Mulley
4c64343806
Merge pull request #16519 from edx/pacing/studio-modal
...
Studio Section Highlights: add doc and preview text to modal
2017-11-09 16:51:29 -05:00
Eric Fischer
25b08981e5
Revert "Merge pull request #16447 from appsembler/omar/hide-library-button"
...
This reverts commit 9a9ef198b2f61cbe75b5
2017-11-09 16:11:55 -05:00
Matt Tuchfarber
5ca2ea9aad
Merge pull request #16523 from edx/tuchfarber/program_marketing_tweaks
...
Make FAQ responses allow HTML and fix banner image sizing.
2017-11-09 15:29:08 -05:00
Douglas Hall
5c3f509807
Merge pull request #16525 from edx/uman/0.53.12
...
[ENT-633] Upgrade edx-enterprise to 0.53.12.
2017-11-09 15:25:50 -05:00
Eric Fischer
801a948d71
Merge pull request #16524 from edx/efischer/revert_library
...
Revert "Merge pull request #16447 from appsembler/omar/hide-library-b…
2017-11-09 15:00:11 -05:00
Jeremy Bowman
e71f64dc28
Merge pull request #16500 from edx/jmbowman/django-ses-upgrade
...
Upgrade django-ses for Django 1.11 support
2017-11-09 14:51:26 -05:00
Marco Morales
9fc58a25bd
Merge pull request #16506 from edx/hrein/responsive-experience/cleanups
...
Styling changes for responsive behavior on LMS.
2017-11-09 14:47:28 -05:00
Nimisha Asthagiri
e88d384ad1
Merge pull request #16509 from edx/sync-course-language
...
Sync course language: Discovery -> LMS Course Overview
2017-11-09 14:29:43 -05:00
Nimisha Asthagiri
e59410be18
Studio Section Highlights: add doc and preview text to modal
2017-11-09 14:17:55 -05:00
Gabe Mulley
01cfd22e1a
Merge pull request #16508 from edx/ret/fix-theming-for-ace
...
support theming of ACE emails
2017-11-09 14:02:07 -05:00
Eric Fischer
7696727fda
Revert "Merge pull request #16447 from appsembler/omar/hide-library-button"
...
This reverts commit 9a9ef198b2f61cbe75b5
2017-11-09 13:57:19 -05:00
Matt Tuchfarber
8828fa5cd9
Make FAQ responses allow HTML and fix banner image sizing.
2017-11-09 13:35:41 -05:00
Jeremy Bowman
0edcf26a90
Merge pull request #16505 from edx/jmbowman/upgrade_ora2
...
Upgrade edx-ora2
2017-11-09 13:11:40 -05:00
Uman Shahzad
7b90f2c593
Upgrade edx-enterprise to 0.53.12.
2017-11-09 23:06:56 +05:00
Harry Rein
aa853a930e
Styling changes for responsive behavior on LMS.
2017-11-09 12:46:48 -05:00
Matt Drayer
5062d49562
Merge pull request #16475 from edx/mattdrayer/ENT-686-3
...
mattdrayer/ENT-686: Enhanced logging for SuccessFactors exceptions
2017-11-09 11:51:01 -05:00
sanfordstudent
c02fd79fe2
Merge pull request #16481 from edx/sstudent/google_analytics_pixel
...
EDUCATOR-1578: GA tracking pixel
2017-11-09 11:48:39 -05:00
Gabe Mulley
54ae1c6238
support theming of ACE emails
2017-11-09 11:16:26 -05:00
Sanford Student
e932fc9353
EDUCATOR-1578: GA tracking pixel
2017-11-09 10:54:58 -05:00
Gabe Mulley
d037a19c94
Merge pull request #16501 from edx/thallada/ret-fix-highlights-number
...
Re-render XBlockOutlineView on highlights change
2017-11-09 10:33:09 -05:00
John Eskew
004da0c381
Merge pull request #16449 from edx/jeskew/commerce_to_appconfig
...
Add commerce AppConfig and use to register signals.
2017-11-09 10:25:16 -05:00
Alex Dusenbery
95b47369c4
PLAT-1786 | Add lms/cms analytics_exporter.py settings files.
2017-11-09 10:14:30 -05:00
Matt Drayer
6027e5fc1d
mattdrayer/ENT-686: Enhanced logging for SuccessFactors exceptions
2017-11-09 10:00:17 -05:00
Uman Shahzad
80cf046dc4
Merge pull request #16492 from edx/uman/responsive-registration-page-issues
...
[ENT-749] Fix logistration page issues in Enterprise context (plus a color fix to validation)
2017-11-09 19:50:13 +05:00
John Eskew
e30de61e23
Merge pull request #16507 from edx/jeskew/more_apps_signals
...
Move ccxcon, credit, and programs Django apps to AppConfig standard.
2017-11-09 09:26:38 -05:00
John Eskew
80d70f6ecb
Run all touched files through isort.
2017-11-09 09:25:19 -05:00
John Eskew
6672f64188
Add commerce AppConfig and use to register signals. Move imports.
...
Add explicit 'lms.djangoapps' prefix to all commerce imports, as another
commerce Django app exists at openedx.core.djangoapps.commerce
2017-11-09 09:24:37 -05:00
Albert (AJ) St. Aubin
ac3642ad05
Merge pull request #16493 from edx/aj/LEARNER-3160
...
Added new method to retrieve the course runs for a course based on UUID
2017-11-09 08:47:56 -05:00
Eric Fischer
c37ce9b730
Merge pull request #16504 from edx/efischer/EDU-1557
...
Move hint before content it refers to
2017-11-09 08:25:20 -05:00
Albert St. Aubin
ddcc5feaa4
Added new method to retrieve the course runs for a course based on UUID
...
This method will retrieve the Course Run information from the Discovery
service based on a Courses UUID.
[LEARNER-3160]
2017-11-09 07:55:36 -05:00
Ayub khan
55cc8c6105
Merge pull request #16514 from edx/update_translations
...
Update translations (autogenerated message)
2017-11-09 17:03:53 +05:00
ayub-khan
47a6e73b5a
Update translations (autogenerated message)
2017-11-09 15:59:53 +05:00
Muzaffar yousaf
690ddceb83
Merge pull request #16489 from edx/revert-16479-revert-16201-transcript-secure-credentials
...
Revert "Revert "Transcript secure credentials""
2017-11-09 15:57:36 +05:00
Waheed Ahmed
79af4c9bc2
Merge pull request #16462 from edx/waheed/LEARNER-2980-my-programs-fragment
...
Create programs listing fragment for mobile app.
2017-11-09 14:13:24 +05:00
muzaffaryousaf
7de3871f67
Fix the makemigration test temporary.
2017-11-09 13:20:29 +05:00
Waheed Ahmed
50891f9102
Implement program listing fragment for mobile app.
...
Converted the program listing logic into a web fragment view
and exposed a URL for mobile app.
LEARNER-2980
2017-11-09 12:51:25 +05:00
Nimisha Asthagiri
e7f8a592dd
Sync course language: Discovery Course Catalog -> LMS Course Overview
2017-11-08 21:42:05 -05:00
Ayub khan
bd49375d16
Merge pull request #16499 from edx/LEARNER-2653-update-make-targets-for-translations
...
LEARNER-2653 Updated translations make targets
2017-11-09 05:05:53 +05:00
John Eskew
09bd0244b4
Move ccxcon, credit, and programs Django apps to AppConfig standard.
2017-11-08 17:06:09 -05:00
Anthony Mangano
e438bdc790
Merge pull request #16503 from edx/amangano/update-spanish-translations
...
Update Spanish translations
2017-11-08 17:00:56 -05:00
Troy Sankey
319aa8775a
Merge pull request #16487 from edx/pwnage101/courseware_mgmt_cleanup
...
courseware management commands cleanup for django 1.11
2017-11-08 16:40:49 -05:00
Jeremy Bowman
f725e3a6ab
Upgrade edx-ora2
2017-11-08 16:29:22 -05:00
Eric Fischer
8838f11cd2
Move hint before content it refers to
...
EDUCATOR-1557
2017-11-08 16:13:11 -05:00
Anthony Mangano
4636471c7e
update Spanish translations
2017-11-08 16:10:20 -05:00
Clinton Blackburn
f1f5a7ddb3
Disabled edx-notes for anonymous users
2017-11-08 15:41:02 -05:00
Troy Sankey
150096e3bf
courseware management commands cleanup for django 1.11
2017-11-08 15:12:52 -05:00
