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

43480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sandroroux
82aa1654f8 Added Google Analytics tracking to the Highlights Modal's save and cancel buttons 
Added tracking to 'Enter Section Highlights' link.
 2017-11-06 15:32:02 -05:00
Harry Rein
bdde858779 Merge pull request #16470 from edx/HarryRein/hotfix-course-tabs-too-long 
Issue with long course tab name styling.
 2017-11-06 15:23:26 -05:00
Matt Tuchfarber
166d784dd5 Merge pull request #16453 from edx/tuchfarber/more_program_marketing 
Make program marketing dynamic and less 500-prone.
 2017-11-06 15:07:43 -05:00
Troy Sankey
c4c1e7eb80 Merge pull request #16467 from edx/pwnage101/django_comment_client_mgmt_cleanup 
django_comment_client management command cleanup for Django 1.11
 2017-11-06 14:48:49 -05:00
Eric Fischer
ae0854b09f Merge pull request #16468 from edx/efischer/edu-1635 
Log Role Creation
 2017-11-06 14:45:52 -05:00
Harry Rein
263a227999 Issue with long course tab name styling. 2017-11-06 14:27:39 -05:00
Harry Rein
51459d3333 Merge pull request #16444 from edx/responsive-header-cleanup 
Cleaning up mobile web.
 2017-11-06 14:17:53 -05:00
Matt Tuchfarber
28e1e2bb4b Make page more dynamic and less 500-prone. Also fix image sizing. Makes 
nav links dynamic based on content.
 2017-11-06 14:07:29 -05:00
Eric Fischer
93877890fc EDUCATOR-1635 Log Role Creation 2017-11-06 13:56:27 -05:00
Troy Sankey
9567649d20 Fixup! run isort 2017-11-06 13:49:51 -05:00
Troy Sankey
d6bd4dc43f Fixup! Make string quoting consistent (prefer single quotes) 2017-11-06 13:38:49 -05:00
Troy Sankey
0ed8042652 django_comment_client management command cleanup for Django 1.11 2017-11-06 12:55:23 -05:00
Harry Rein
7f61828e12 Cleaning up mobile web. 2017-11-06 12:33:23 -05:00
Matt Drayer
617937755d Merge pull request #16463 from edx/mattdrayer/ENT-686-2 
SuccessFactors OData: Support null response object scenarios
 2017-11-06 11:49:30 -05:00
Noraiz Anwar
a69fb493c3 Merge pull request #16460 from edx/noraiz/remove-logs-EDUCATOR-1652 
remove logs added under EDUCATOR-1652
 2017-11-06 21:04:59 +05:00
Brian Mesick
0255592c67 Merge pull request #16436 from edx/bmedx/django111_urls_openedx 
openedx urls cleanup for Django 1.11
 2017-11-06 10:36:20 -05:00
Matt Drayer
828c53cb64 SuccessFactors OData: Support null exception object scenarios 2017-11-06 10:13:47 -05:00
noraiz-anwar
1f99e28f57 remove logs added under EDUCATOR-1652 2017-11-06 20:07:28 +05:00
Farhanah Sheets
33335f7ade Merge pull request #15933 from edx/george/reinstate-pr-15641 
Toggle timer visibility on timed exams #15641 
https://github.com/edx/edx-platform/pull/15641
 2017-11-06 09:28:47 -05:00
Awais Jibran
81461610da Merge pull request #16438 from edx/aj/fix-django-wiki-links 
Fix Django Wiki Links Issue
 2017-11-06 18:08:32 +05:00
Awais Jibran
96dd282970 Fix Django Wiki Links Issue 
EDUCATOR-1655
 2017-11-06 16:08:10 +05:00
Muhammad Ammar
549c0f6b2c Merge pull request #16422 from edx/ammar/add-video-duration-to-events 
add video duration to events
 2017-11-06 13:47:33 +05:00
Ned Batchelder
a6254d5049 Merge pull request #16434 from edx/nedbat/openedx-favicon 
A new favicon for Open edX
 2017-11-05 17:51:34 -05:00
bmedx
68e3894c17 openedx urls cleanup for Django 1.11 
- Remove usage of django.urls.patterns
- Change urls tuples to lists
- Make all string view names callables
 2017-11-03 16:11:41 -04:00
Eric Fischer
c153198928 theme update 2017-11-03 15:38:44 -04:00
Farhanah Sheets
b482fbec60 Update to latest proctoring release 
https://github.com/edx/edx-proctoring/releases/tag/1.3.0
 2017-11-03 15:38:44 -04:00
Eric Fischer
2ede2b7397 Revert "Revert "Merge pull request #15641 from jspayd/toggle-timer-upstream"" 
This reverts commit e32615e132.
 2017-11-03 15:38:44 -04:00
Jeremy Bowman
8b13a8a459 Merge pull request #16442 from edx/jmbowman/oauth_provider_cms_import_fix 
Add oauth_provider to Studio INSTALLED_APPS
 2017-11-03 15:32:54 -04:00
John Eskew
ee5887956a Merge pull request #16437 from edx/jeskew/datadog_monitoring_to_appconfig 
Move datadog/monitoring startup to AppConfig ready.
 2017-11-03 14:58:56 -04:00
Douglas Hall
6cd33d6848 Merge pull request #16448 from edx/douglashall/ENT-749 
Fixed enterprise tagline styling.
 2017-11-03 14:41:23 -04:00
Douglas Hall
174302c191 Fixed enterprise tagline styling. 
ENT-749
 2017-11-03 14:40:17 -04:00
Nimisha Asthagiri
e63cf7ff98 Merge pull request #16446 from edx/naa/course-highlights-4 
Course Week Highlights accessor
 2017-11-03 14:33:08 -04:00
Ned Batchelder
2499dc95c2 A new favicon for Open edX 2017-11-03 14:14:28 -04:00
John Eskew
535d39d571 Merge pull request #16435 from edx/jeskew/bookmarks_course_overviews_startup_move 
Move bookmarks/course_overviews startup to AppConfig ready.
 2017-11-03 14:06:17 -04:00
Fred Smith
c02c4f9fb7 Merge pull request #15325 from isms/sandbox-cryptography 
Add cryptography package to sandbox environment
 2017-11-03 13:53:14 -04:00
Bessie Steinberg
f216b2b8f2 Merge pull request #16443 from edx/bessiesteinberg/update-edx-enterprise-version 
update edx-enterprise to version 0.53.10
 2017-11-03 13:44:22 -04:00
Troy Sankey
d8293f962c Merge pull request #16412 from edx/pwnage101/settings_validation_refactor_PLAT-1776 
move settings validation out of startup.py
 2017-11-03 13:44:11 -04:00
Nimisha Asthagiri
4f2fdde2d8 Course Week Highlights accessor 2017-11-03 13:33:46 -04:00
Cliff Dyer
c0d84c8fdd Merge pull request #16397 from edx/cliff/fix-broken-polls 
Fix polls 404 on disabled completion.
 2017-11-03 13:00:41 -04:00
Brian Mesick
e12ce751d7 Merge pull request #16413 from edx/bmedx/django111_urls_cms 
CMS urls cleanup for Django 1.11
 2017-11-03 12:53:48 -04:00
John Eskew
d6f8772031 Move course_overviews startup.py over to AppConfig::ready 2017-11-03 12:47:59 -04:00
John Eskew
3f99fe4c1b Move bookmarks startup.py over to AppConfig::ready 2017-11-03 12:47:58 -04:00
Bessie Steinberg
00fd7b6bfa update edx-enterprise to version 0.53.10 2017-11-03 12:45:36 -04:00
Jeremy Bowman
2e2ec0f5d0 Add oauth_provider to Studio INSTALLED_APPS 2017-11-03 12:28:07 -04:00
Troy Sankey
d11d7554c3 Move theming settings validation registration into ready method 
This avoids premature registration of django checks which could break
django 1.11 startup.
 2017-11-03 12:23:54 -04:00
Troy Sankey
c19eaef075 Move settings validation out of startup.py 
This also creates a new app common_initialization in order to provide a
place to run initialization code common to both the LMS and CMS.
 2017-11-03 12:23:54 -04:00
Gabe Mulley
47e3c68faf Merge pull request #16439 from edx/mulby/monitor-enrollment-perf 
set a custom course_id metric on enrollment
 2017-11-03 11:09:13 -04:00
J. Cliff Dyer
4313951dcb Fix polls 404 on disabled completion. 
Calling runtime.handle('progress', ...) was causing a 404 error due to
the runtime handler.  It should be okay for xblocks to submit a
completion or progress event; they just shouldn't have it treated
specially.

EDUCATOR-1642
 2017-11-03 11:06:59 -04:00
Tyler Hallada
8809fd86b7 Merge pull request #16420 from edx/thallada/studio-outline-modal-escape 
Allow escaping out of Studio CourseOutlineXBlockModals
 2017-11-03 09:46:15 -04:00
Gabe Mulley
15c2a828b7 set a custom course_id metric on enrollment 2017-11-03 08:46:25 -04:00