Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,070 Commits 1 Branch 0 Tags
6294baf4568b9beaf14fd3907da1ea02f79ebc54
Commit Graph

7852 Commits

Author SHA1 Message Date
Ari Rizzitano
8b59c6d596 Merge pull request #16639 from edx/ari/react-renderer 
mako/react bridge code
 2017-12-06 11:12:24 -05:00
Sylvia Pearce
e40b00eda6 Merge pull request #16788 from edx/sylvia/DOC-3826 
On Import Course page, clarify content that's imported per course tea…
 2017-12-06 09:59:50 -05:00
Ari Rizzitano
8ca0fe9dfc introduce ReactRenderer module and renderReact mako def 
[FEDX-453]

[extreme wip] mako/react bridge code [FEDX-453]

more attempts

split out entry points into separate file

this works!

kill dynamic import

error handling

didn't need webpack_static

handle passing props

cleanup django-template-rendering defs

pytest monkeypatch fix

cleanup

add id arg to renderReact def

more cleanup

oops

quality xss fixes

unittest fix

kill HelloWorld
 2017-12-05 17:53:46 -05:00
John Eskew
f5a83d5d6c Fix URLs that generate warnings in Django 1.10. 2017-12-05 16:46:33 -05:00
Jeremy Bowman
62f91dd7e9 Merge pull request #16795 from edx/jmbowman/PLAT-1418 
PLAT-1418 Remove obsolete can_import_settings attribute
 2017-12-05 16:45:32 -05:00
Jeremy Bowman
df008438a8 PLAT-1418 Remove obsolete can_import_settings attribute 2017-12-05 15:42:15 -05:00
Jeremy Bowman
da8cf6b528 PLAT-1382 Populate ALLOWED_HOSTS for tests 2017-12-05 14:22:30 -05:00
Sylvia Pearce
233d470ad2 On Import Course page, clarify content that's imported per course team request 2017-12-05 13:40:36 -05:00
Nimisha Asthagiri
7ef443f7ce Update usages to ace_common 2017-12-05 11:38:16 -05:00
Ayub khan
3fc45dcdba Merge pull request #16718 from edx/Update_translations_30_Nov 
updated translations
 2017-12-05 12:29:39 +05:00
Eric Fischer
a09866622d Move library creator checks to POST-only 2017-12-04 11:55:49 -05:00
Eric Fischer
cb463c0d11 Revert "Revert "Merge pull request #16447 from appsembler/omar/hide-library-button"" 
This reverts commit 7696727fda.
 2017-12-04 11:55:49 -05:00
Michael Roytman
cb19a653ee Merge pull request #16754 from edx/mroytman/sfe-a11y-page 
add Accessibility Page into studio from studio-frontend
 2017-12-04 11:23:18 -05:00
Jeremy Bowman
067785dbfd Merge pull request #16710 from edx/jmbowman/PLAT-1419 
PLAT-1419 Make edxmako a proper template backend
 2017-12-04 11:07:30 -05:00
ayub-khan
b9acdbb284 updated translations 2017-12-04 17:21:48 +05:00
Michael Roytman
2afbe87723 add Accessibility Page into studio from studio-frontend 2017-12-02 08:29:15 -05:00
Michael Roytman
fab7f31a55 Merge pull request #16735 from edx/mroytman/EDU-1826 
mroytman/edu 1826/1830
 2017-12-01 22:14:59 -05:00
Michael Roytman
eeb6cc7ca3 Add accessibility accomodation request page to studio and link to said page in footer, both behind a Waffle switch. Add tests for the new page. 2017-12-01 19:57:21 -05:00
Farhanah Sheets
d0687e97b1 Merge pull request #16734 from edx/fsheets/EDUCATOR-1825 
Update studiofrontend to pass generic studioContext
 2017-12-01 19:02:33 -05:00
Farhanah Sheets
e395e78521 Update to use generic studioContext configuration 2017-12-01 17:55:55 -05:00
Jeremy Bowman
fdc50c3aa8 PLAT-1419 Make edxmako a proper template backend 2017-12-01 17:01:52 -05:00
Jeremy Bowman
e0ece33701 PLAT-1762 Remove obsolete mentoring XBlock 2017-11-30 16:30:17 -05:00
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