Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

3988 Commits

Author SHA1 Message Date
Gabe Mulley
26303580a5 update schedule start when course start date changes 2017-11-17 13:28:31 -05:00
Hasnain
bf2ca3adcd WL-1257 | Removed the hard-coded "edX" related strings from nudges emails. 2017-11-17 12:06:50 +05:00
Christopher Lee
926c745a4c Merge pull request #16372 from proversity-org/proversity/default-course-mobile-availability 
add DEFAULT_MOBILE_AVAILABLE flag
 2017-11-16 11:12:48 -05:00
Brian Mesick
4223bf700b Merge pull request #16567 from edx/bmedx/django111_get_prep_lookup 
Change get_prep_lookup to a Lookup
 2017-11-16 10:16:42 -05:00
Jose Antonio Gonzalez
f38e5ab939 add DEFAULT_MOBILE_AVAILABLE flag 2017-11-16 16:50:37 +02:00
Gabe Mulley
39575bcf4d Merge pull request #16586 from edx/fix-email-tracking 
coerce UUIDs to strings when logging email sent events
 2017-11-16 08:52:46 -05:00
David Ormsbee
b03369579b Merge pull request #16477 from edx/ormsbee/consolidate_theme_js 
Remove collection of JS bundles for themes.
 2017-11-16 03:10:15 -05:00
Gabe Mulley
6de115545a coerce UUIDs to strings when logging email sent events 2017-11-15 22:34:54 -05:00
Alessandro Roux
6634fc7fb8 Merge pull request #16550 from edx/thallada/ret-schedules-readme 
Schedules app readme
 2017-11-15 17:06:23 -05:00
sandroroux
d08d7252f8 Edited according to the comments in my review. 2017-11-15 14:52:37 -05:00
bmedx
31f11709e3 Change OpaqueKeyField's get_prep_lookup to a Lookup 
get_prep_lookup in a Field is deprecated in Django 1.11. This is the new way of doing this check.
 2017-11-15 14:22:49 -05:00
David Ormsbee
255dc79254 Remove collection of JS bundles for themes. 
Comprehensive themes used to allow you to override JS within one of the
bundles created for Studio and LMS (specified in the common.py env
files). So for instance, the bundle that becomes lms-base-application.js
is defined like this:

base_application_js = [
    'js/src/utility.js',
    'js/src/logger.js',
    'js/user_dropdown_v1.js',
    'js/dialog_tab_controls.js',
    'js/src/string_utils.js',
    'js/form.ext.js',
    'js/src/ie_shim.js',
    'js/src/accessibility_tools.js',
    'js/toggle_login_modal.js',
    'js/src/lang_edx.js',
]

You could not add a custom file to this list in your theme, but if you
created a themes/mytheme/lms/static/js/dialog_tab_controls.js, then your
theme's version of that file would be wrapped into the bundle, which
would be created at {staticfiles}/mytheme/js/lms-base-application.js

It doesn't appear that this functionality has seen much use in practice,
and it adds minutes to the compile time for sites compiling multiple
themes, so this commit removes this capability. It is still possible to
create and invoke custom JavaScript that is theme specific, and will
compile out to {staticfiles}/mytheme/js -- it's just not possible to
override a file that becomes part of the standard Studio/LMS bundles.
 2017-11-15 13:29:30 -05:00
Gabe Mulley
b6e12224c6 move helper function to theming helpers 2017-11-15 12:58:09 -05:00
Gabe Mulley
a031bf9587 extract tracking_id logic into a method 2017-11-15 12:56:14 -05:00
Gabe Mulley
46c7327211 make image_url a function instead of a property 2017-11-15 12:37:13 -05:00
Gabe Mulley
52c33107e6 request can be retrieved via crum 2017-11-15 10:24:55 -05:00
Gabe Mulley
53544a708e always include num_courses in the event 2017-11-15 10:21:19 -05:00
Gabe Mulley
6f20cd5cf2 support a GA tracking pixel 2017-11-15 08:35:35 -05:00
Hasnain
71ae2247fb WL-1257 | Site aware context variables. 2017-11-15 11:56:51 +05:00
Tyler Hallada
ee27f7886b Address Gabe's comments 2017-11-14 22:12:51 -05:00
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
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