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

43492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Mesick
6a336c0c6f Merge pull request #16454 from edx/bmedx/django111_urls_lms_2 
LMS urls cleanup pt. 2
 2017-11-06 16:59:34 -05:00
Tyler Hallada
5332b6920f Merge pull request #16466 from edx/thallada/ret-fix-absolute-url 
Schedules: absolute_url returns given URL if already absolute
 2017-11-06 16:44:43 -05:00
Nimisha Asthagiri
e758e20a8b Merge pull request #16409 from edx/google-analytics-in-studio 
Course Week Highlights (Studio): adding Google Analytics tracking
 2017-11-06 16:44:07 -05:00
Clinton Blackburn
69eeca61d8 Opening courseware to anonymous users 
Anonymous users may now view units in the courseware. This access is limited to units that are not considered problems/graded (e.g. homework, exams).
 2017-11-06 16:42:06 -05:00
Nimisha Asthagiri
9a9ef198b2 Merge pull request #16447 from appsembler/omar/hide-library-button 
Hide the create library for non-staff users when DISABLE_COURSE_CREATION
 2017-11-06 16:12:44 -05:00
bmedx
11a4030767 LMS urls cleanup for Django 1.11 
- Remove usage of django.urls.patterns
- Change urls tuples to lists
- Make all string view names callables
- This is the second of several urls updates for LMS; a work in progress
 2017-11-06 16:06:00 -05:00
Nimisha Asthagiri
f61cbe75b5 Merge pull request #16455 from edx/pacing/highlights-email 
Schedule-based Highlights email update
 2017-11-06 15:35:35 -05:00
Clinton Blackburn
9782b40751 Updated override_waffle_flag to work as a context manager 
override_waffle_flag can now be used as a context manager in addition to its previous role as a decorator. Additionally, the tests have been updated to use standard assertions since we now use py.test.
 2017-11-06 15:32:12 -05:00
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
Nimisha Asthagiri
98e647fa24 Schedule-based Highlights email update 2017-11-06 14:30:28 -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
Tyler Hallada
1f88d528bd Add unit tests for absolute_url 2017-11-06 13:17:52 -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
Tyler Hallada
1b1c7235d1 absolute_url returns given URL if already absolute 2017-11-06 11:30:46 -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
Omar Al-Ithawi
cb5e76ee06 Hide the create library for non-staff users when DISABLE_COURSE_CREATION 2017-11-04 10:07:43 +02: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