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

7830 Commits

Author SHA1 Message Date
Alex Dusenbery
1602a0e66c EDUCATOR-1817 | Add traceback info on course import/export exceptions. 2017-11-29 10:10:58 -05:00
Alessandro Roux
96f3545136 Merge pull request #16698 from edx/pacing/making-highlights-enable-text-consistent 
Highlights: changes the feature name to Weekly Highlight Emails in UI
 2017-11-29 09:21:30 -05:00
Qubad786
dc335a2215 EDUCATOR-1628 
Enable Video Uploads by default with course rollout flag.
 2017-11-29 12:27:20 +05:00
sandroroux
3d616d7802 Changed references to Weekly Highlights Emails in UI elements. 'Learn More' link in studio opens in new tab. 2017-11-28 15:49:14 -05:00
Calen Pennington
64dd633fc9 Merge pull request #15846 from edx/ormsbee/decaffeinate_tests_2 
WIP: Decaffeinate Test Files (Part 2)
 2017-11-28 13:34:26 -05:00
Tyler Hallada
9f74e70589 Course Highlights Setting in Studio Course Outline 
fixup! trying to "fix" underscore syntax error

add cancel modal test

Fix quality issues.

Apply Nimisha's suggestions for my quality fixes.

Skip test_drop_unit_in_collapsed_subsection

Fix quality error
 2017-11-27 17:23:55 -05:00
Mushtaq Ali
37bbfd0a5c VAL version bump - EDUCATOR-1809 2017-11-27 18:09:02 +05:00
ayub-khan
9e619e4244 Updated Translations 2017-11-23 16:02:47 +05:00
Matjaz Gregoric
d403e5f8b1 Introduce LMS_INTERNAL_ROOT_URL. 
The LMS and edx-enterprise currently communicate via REST APIs, even
though they are all running within the same service.

Currently API URLs are constructed using LMS_ROOT_URL, but that is
problematic on some systems where the external LMS_ROOT_URL is not
accessible from the private network, or routing internal requests via
the external URL is not desireable.

This patch introduces a new setting variable LMS_INTERNAL_ROOT_URL which
defaults to the value of LMS_ROOT_URL for backwards compatibility.

The LMS and edx-enterprise will use LMS_INTERNAL_ROOT_URL to construct
API URLs instead of LMS_ROOT_URL.
 2017-11-23 08:17:38 +01:00
David Ormsbee
94614db46e CoffeeScript tests migration: Remove implicit returns 2017-11-22 15:39:50 -05:00
David Ormsbee
0880502f26 CoffeeScript tests migration: Decaffeinate files 
This is running decaffeinate, with no additional cleanup.
 2017-11-22 15:39:50 -05:00
David Ormsbee
5c64da2f63 CoffeeScript tests migration: Rename files 
Step 1 in our migration steps is to rename the CoffeeScript files to
the JS files they will be replaced with, so that we can preserve file
history.
 2017-11-22 15:39:50 -05:00
Ned Batchelder
e23e3a0486 Fix a number of unused-import pylint violations 2017-11-21 19:57:06 -05:00
Jeremy Bowman
8b3f81f3b4 PLAT-1413 Remove TEMPLATE_DEBUG setting 2017-11-20 14:39:36 -05:00
Nimisha Asthagiri
3ae87dd9d7 Update Studio API to include highlights_enabled_for_messaging 2017-11-17 14:53:52 -05:00
Nimisha Asthagiri
8b0693f229 Add highlights_enabled_for_messaging course field 2017-11-17 14:42:46 -05:00
Ayub khan
f097b7149c Merge pull request #16588 from edx/update_translations_16_nov 
Update translations
 2017-11-17 02:38:23 +05:00
John Eskew
ee36534fde Merge pull request #16574 from edx/jeskew/add_request_limits_for_django110 
Add request limits to LMS/CMS Django settings.
 2017-11-16 13:13:46 -05:00
Jose Antonio Gonzalez
f38e5ab939 add DEFAULT_MOBILE_AVAILABLE flag 2017-11-16 16:50:37 +02:00
ayub-khan
6fb44898f8 update translations 2017-11-16 16:03:38 +05:00
noraiz-anwar
8028d7aede remove temporary log 2017-11-16 12:59:52 +05:00
John Eskew
1bf74c7d32 Add disabled request limits implemented in Django 1.11 2017-11-15 14:19:31 -05:00
Brian Mesick
dad73637aa Merge pull request #16495 from edx/bmedx/django111_startup_fixes 
Changes necessary for Django 1.11 tests to start
 2017-11-14 12:19:21 -05:00
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
bmedx
d3bbb86fe3 Shims to fix test collection errors 2017-11-13 15:45:34 -05:00
bmedx
f3f8d8ec96 Changes necessary for Django 1.11 tests to start 
- Certificates management commands updates
- Moving reverse calls in tests into setUp from class definition
- Import shuffling
- Consolidating cryptograhpy version to 1.9
 2017-11-13 15:45:32 -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