sandroroux
98bf627efc
Revised content above "Configuration flags".
2017-11-14 16:43:16 -05:00
Adam
9520fe0342
Merge pull request #16553 from edx/adam/fix-branch-versioning-issues-coursegraph
...
addresses issue where branch information was not being stripped from …
2017-11-14 15:36:25 -05:00
Tyler Hallada
d3cc7e9bd3
Schedules readme: switch from markdown to rst
2017-11-14 13:04:24 -05:00
John Eskew
f790766c26
Merge pull request #16548 from edx/jeskew/more_mgmt_cmd_conv_from_optparse
...
Move more mgmt commands from optparse to argparse.
2017-11-14 12:29:57 -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
John Eskew
27315f442a
Move more mgmt commands from optparse to argparse.
2017-11-14 11:26:46 -05:00
Brian Mesick
7ccc498800
Merge pull request #16561 from edx/bmedx/django111_select_related
...
Remove use of non-relational fields in select_related queries
2017-11-14 11:04:41 -05:00
bmedx
09e5156543
Remove use of non-relational fields in select_related queries
...
These changes should not change the actual queries at all, and those
will throw errors in Django 1.11.
2017-11-14 10:10:08 -05:00
Mushtaq Ali
40d74e77c9
Modify video pipleine client jwt settings - EDUCATOR-1733
2017-11-14 17:23:06 +05:00
Adam Palay
25b4a6e207
addresses issue where branch information was not being stripped from child blocks when serializing courses (PLAT-1794)
2017-11-13 17:32:56 -05:00
Tyler Hallada
4faaff35b8
Schedules readme: fix small typos
2017-11-13 17:00:34 -05:00
Tyler Hallada
336ed2646b
Schedule readme: change heading hierarchy
2017-11-13 16:24:20 -05:00
Tyler Hallada
1d3ec32349
Schedules Readme: add definitions and litmus info
2017-11-13 16:20:15 -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
Tyler Hallada
6b138f8454
Add more details to the setup configuration steps
2017-11-13 15:26:14 -05:00
sandroroux
b2a4ffd2a4
Reworked the introduction.
2017-11-13 13:46:39 -05:00
Tyler Hallada
cfa4077fe8
Fill out "testing" section of Schedules readme
2017-11-13 13:08:02 -05:00
David Ormsbee
fc0dab4c4f
Merge pull request #16529 from edx/ormsbee/consolidate_xblock_assets
...
Consolidate collected XBlock static assets.
2017-11-13 12:46:20 -05:00
David Ormsbee
a6752b7c4d
Consolidate collected XBlock static assets.
...
Before this commit, XBlock static assets were extracted during the
collectstatic process by iterating through all installed XBlock classes
and creating a separate directory for each. However, some packages
install many XBlocks that actually share the same static assets. The
most notable example is problem_builder, though we also see this with
schoolyourself and google_drive.
This commit uses the parent module name to do package asset lookup,
collapsing those cases down and eliminating duplicates. For a default
install of edx-platform XBlocks, this reduces assets generated from 31M
to 14M.
2017-11-13 11:09:09 -05:00
Tyler Hallada
bf80774712
Add configuration information to Schedules README
2017-11-09 16:47:56 -05:00
sandroroux
65d652f5d8
Rename Definitions to Glossary. Filled out some of the terms.
2017-11-09 16:35:56 -05:00
sandroroux
0156ef3a7c
Wrote an overview section.
2017-11-09 16:10:30 -05:00
Nimisha Asthagiri
e88d384ad1
Merge pull request #16509 from edx/sync-course-language
...
Sync course language: Discovery -> LMS Course Overview
2017-11-09 14:29:43 -05:00
Tyler Hallada
f446e79cca
WIP README for the Schedules Django app
2017-11-09 14:18:56 -05:00
Gabe Mulley
54ae1c6238
support theming of ACE emails
2017-11-09 11:16:26 -05:00
John Eskew
004da0c381
Merge pull request #16449 from edx/jeskew/commerce_to_appconfig
...
Add commerce AppConfig and use to register signals.
2017-11-09 10:25:16 -05:00
John Eskew
e30de61e23
Merge pull request #16507 from edx/jeskew/more_apps_signals
...
Move ccxcon, credit, and programs Django apps to AppConfig standard.
2017-11-09 09:26:38 -05:00
John Eskew
80d70f6ecb
Run all touched files through isort.
2017-11-09 09:25:19 -05:00
John Eskew
6672f64188
Add commerce AppConfig and use to register signals. Move imports.
...
Add explicit 'lms.djangoapps' prefix to all commerce imports, as another
commerce Django app exists at openedx.core.djangoapps.commerce
2017-11-09 09:24:37 -05:00
Albert St. Aubin
ddcc5feaa4
Added new method to retrieve the course runs for a course based on UUID
...
This method will retrieve the Course Run information from the Discovery
service based on a Courses UUID.
[LEARNER-3160]
2017-11-09 07:55:36 -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
Nimisha Asthagiri
e7f8a592dd
Sync course language: Discovery Course Catalog -> LMS Course Overview
2017-11-08 21:42:05 -05:00
John Eskew
09bd0244b4
Move ccxcon, credit, and programs Django apps to AppConfig standard.
2017-11-08 17:06:09 -05:00
John Eskew
7c94131e51
Merge pull request #16494 from edx/jeskew/remove_autostartup_call_code
...
Remove everything from CMS/LMS startup.py except single monkey-patch.
2017-11-08 14:03:26 -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
Gabe Mulley
e5a0bcfc32
hold back some users from dynamic pacing features
2017-11-08 09:48:48 -05:00
Jeremy Bowman
0f4e4e1c31
Remove unused nose settings and plugin
2017-11-07 16:34:59 -05:00
John Eskew
3d884d6cc0
Merge pull request #16428 from edx/jeskew/email_mkting_lti_prov_to_appconfig_ready
...
Move lti_provider/email_marketing startup to AppConfig ready.
2017-11-07 15:15:56 -05:00
Feanil Patel
9a35a5439e
Revert "Transcript secure credentials"
2017-11-07 13:07:32 -05:00
Gabe Mulley
cfaf45054d
Merge pull request #16476 from edx/mulby/ace-bidi
...
rtl support for ACE emails
2017-11-07 10:56:43 -05:00
Gabe Mulley
f6adde3d45
rtl support for ACE emails
2017-11-07 09:33:50 -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
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
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
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
Nimisha Asthagiri
98e647fa24
Schedule-based Highlights email update
2017-11-06 14:30:28 -05:00
Tyler Hallada
1f88d528bd
Add unit tests for absolute_url
2017-11-06 13:17:52 -05:00
