Muhammad Ammar
947b87230e
Merge pull request #16539 from edx/ammar/pass-course-id-as-string
...
pass course id as string to edxval api method
2017-11-13 14:35:34 +05:00
muhammad-ammar
d78557a40b
pass course id as string to edxval api method
2017-11-13 12:28:19 +05: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
Josh
b8893cbbd1
Remove unreachable return in contentstore course listing
2017-11-10 18:20:23 +09:00
David Ormsbee
5f866c265b
Remove unused OS X shortcut to fonts.
...
Based on the header, it looks like this was a large OS X Alias file,
checked in accidentally.
2017-11-09 17:34:16 -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
Tyler Hallada
bf80774712
Add configuration information to Schedules README
2017-11-09 16:47:56 -05:00
sandroroux
65d652f5d8
Rename Definitions to Glossary. Filled out some of the terms.
2017-11-09 16:35:56 -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
sandroroux
0156ef3a7c
Wrote an overview section.
2017-11-09 16:10:30 -05:00
Troy Sankey
877c9fafc3
teams management commands cleanup for django 1.11
2017-11-09 15:39:04 -05:00
Troy Sankey
b07402e751
remove unused optparse imports
2017-11-09 15:38:54 -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
Tyler Hallada
f446e79cca
WIP README for the Schedules Django app
2017-11-09 14:18:56 -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
muzaffaryousaf
db07a049bf
Clean makemigration test and bump the val version.
2017-11-09 17:48:45 +05:00
Tasawer Nawaz
d2827b3d8e
Fix certificates visiblity to students on the profile page before the issue date set by course teams
...
LEARNER-3097
2017-11-09 17:10:49 +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
