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

7805 Commits

Author SHA1 Message Date
Clinton Blackburn
3a005c492f Disabled anonymous access for tabs that require enrollment 2017-11-14 08:00:16 -05:00
noraiz-anwar
73f9c02d6d optimize libraries iter for studio dashboard 2017-11-14 12:52:36 +05:00
Ned Batchelder
e8622f0415 Merge pull request #16534 from kaizoku/remove-unreachable-return 
Remove unreachable return in contentstore course listing
 2017-11-13 12:47:34 -05:00
muhammad-ammar
d78557a40b pass course id as string to edxval api method 2017-11-13 12:28:19 +05:00
Josh
b8893cbbd1 Remove unreachable return in contentstore course listing 2017-11-10 18:20:23 +09: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
Nimisha Asthagiri
e59410be18 Studio Section Highlights: add doc and preview text to modal 2017-11-09 14:17:55 -05:00
Eric Fischer
7696727fda Revert "Merge pull request #16447 from appsembler/omar/hide-library-button" 
This reverts commit 9a9ef198b2, reversing
changes made to f61cbe75b5.
 2017-11-09 13:57:19 -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
Alex Dusenbery
95b47369c4 PLAT-1786 | Add lms/cms analytics_exporter.py settings files. 2017-11-09 10:14:30 -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
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
Troy Sankey
150096e3bf courseware management commands cleanup for django 1.11 2017-11-08 15:12:52 -05:00
Tyler Hallada
1927551ac6 Re-render XBlockOutlineView on highlights change 2017-11-08 13:29:44 -05:00
John Eskew
0279181624 Remove everything from CMS/LMS startup.py except single monkey-patch. 
Move mimetype addition to common initialization.
 2017-11-08 11:26:07 -05:00
Muzaffar yousaf
7157ec2e2f Revert "Revert "Transcript secure credentials"" 2017-11-08 21:18:00 +05:00
Jeremy Bowman
0f4e4e1c31 Remove unused nose settings and plugin 2017-11-07 16:34:59 -05:00
Brian Mesick
333e1ccb96 Merge pull request #16433 from edx/bmedx/django111_urls_common 
common urls cleanup for Django 1.11
 2017-11-07 14:46:15 -05:00
Feanil Patel
9a35a5439e Revert "Transcript secure credentials" 2017-11-07 13:07:32 -05:00
bmedx
ffc2a0eb7c common 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-07 11:27:20 -05:00
Jeremy Bowman
1f1ad26137 Merge pull request #16465 from edx/jmbowman/PLAT-1774 
PLAT-1774 Move x_module monkey-patching
 2017-11-07 10:34:44 -05:00
Mushtaq Ali
9d40404206 Modify reset button and invalid credential error text 2017-11-07 13:18:59 +05:00
Mushtaq Ali
e89c3dd3ee Add cancel button, handle errors, change label texts - EDUCATOR-1584 2017-11-07 13:18:59 +05:00
Qubad786
2310614bb6 Save credentials in edx-video-pipeline 
EDUCATOR-1335 - This Adds a dedicated app which is responsible for communication with edx-video-pipeline service. It also adds the backend for saving 3rd party transcription service credentials on edx-video-pipline and cache it in edx-val.
 2017-11-07 13:18:58 +05:00
Mushtaq Ali
f3b9ea4311 Send transcript credentials data to backend 
Add Cielo Username

- EDUCATOR-1456
 2017-11-07 13:18:57 +05:00
Mushtaq Ali
6634b92c61 Transcript organization credentials UI - EDUCATOR-1126 2017-11-07 13:18:25 +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
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
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
Jeremy Bowman
c24a919856 PLAT-1774 Move x_module monkey-patching 2017-11-06 11:32:55 -05:00
noraiz-anwar
1f99e28f57 remove logs added under EDUCATOR-1652 2017-11-06 20:07:28 +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
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
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
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
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
Jeremy Bowman
2e2ec0f5d0 Add oauth_provider to Studio INSTALLED_APPS 2017-11-03 12:28:07 -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
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
John Eskew
d7bab033f7 Move monitoring functionality to util and AppConfig. 2017-11-02 17:44:03 -04:00
John Eskew
65433c9cd4 Move datadog startup.py over to AppConfig::ready 2017-11-02 17:44:03 -04:00
John Eskew
a2cc679b25 Remove usage of default_app_label from ccxcon. 2017-11-02 16:52:09 -04:00
John Eskew
2808bad0c9 Merge pull request #16416 from edx/jeskew/edxmako_startup_py_remove 
Move edxmako startup to AppConfig::ready.
 2017-11-02 15:08:18 -04:00
bmedx
9099f0dc23 CMS 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-02 14:29:48 -04:00
Jeremy Bowman
564514dd07 Merge pull request #16415 from edx/jmbowman/PLAT-1779 
PLAT-1779 Fix CMS INSTALLED_APPS/model imports mismatch
 2017-11-02 11:13:42 -04:00