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

1795 Commits

Author SHA1 Message Date
Matt Tuchfarber
1d8613f34e Merge pull request #16602 from edx/tuchfarber/fix_instructor_ordering 
Fix instructors ordering on program marketing page
 2017-11-27 09:52:23 -05:00
Brian Mesick
4a938c1496 Merge pull request #16645 from edx/bmedx/django111_fix_cms_failures 
Fixes to common/openedx tests that reference apps CMS doesn't use
 2017-11-27 09:16:19 -05:00
bmedx
d827d47b48 Tag LMS Unit 2 tests that fail in Django 1.11 2017-11-22 15:47:22 -05:00
bmedx
d3e6836d9e Fixes to common/openedx tests that reference apps CMS doesn't use 2017-11-22 15:46:06 -05:00
Calen Pennington
48abc492ae Fix linting errors from https://github.com/edx/edx-platform/pull/16615 2017-11-22 14:47:49 -05:00
Ned Batchelder
a2e2aace82 Merge pull request #16650 from edx/nedbat/fix-unused-imports 
Fix a number of unused-import pylint violations
 2017-11-22 11:17:07 -05:00
Ned Batchelder
c966707a86 Correct a mock that was at the wrong module 2017-11-22 08:03:22 -05:00
Calen Pennington
7aa1a3460b Merge pull request #16615 from edx/cale/schedules-admin-improvements 
Cale/schedules admin improvements
 2017-11-21 22:06:37 -05:00
Ned Batchelder
e23e3a0486 Fix a number of unused-import pylint violations 2017-11-21 19:57:06 -05:00
Calen Pennington
10970f3034 Allow searching for schedules with known errors in the admin site 2017-11-21 16:08:24 -05:00
Calen Pennington
3ff118eaac Dynamically generate the actions to update to specific experiences 2017-11-21 16:08:23 -05:00
Brian Mesick
c9c67e0827 Merge pull request #16644 from edx/bmedx/django111_fix_startup 
Fix Django 1.11 startup
 2017-11-21 15:36:07 -05:00
Calen Pennington
6756f97d0c Limit schedule resolvers to active schedules 2017-11-21 14:25:57 -05:00
Calen Pennington
fabad1de4d Add actions and filtering to schedules admin page to allow it to function better as a support tool 2017-11-21 14:25:57 -05:00
Calen Pennington
45bbc2daa3 Allow searching by course_id in the schedules django admin page 2017-11-21 14:25:55 -05:00
sandroroux
98233c0a84 New management command for setting up a test environment. The command creates a ScheduleConfig and schedules if they don't exist (the schedule starts three days before the time the command is run). If a schedule already exists, the command updates the schedule's start time and upgrade deadline. The values set by the command will allow send_recurring_nudge to send three-day nudges. 2017-11-21 14:25:55 -05:00
bmedx
048b609f87 Fix Django 1.11 startup 2017-11-21 11:58:38 -05:00
Jeremy Bowman
43a11af735 PLAT-1199 Stop using pycrypto 2017-11-21 11:25:48 -05:00
Matt Tuchfarber
2c67f9647b Fix instructors ordering on program marketing page 
Changed to hold the instructors in a list instead of a dict
because a dict does not keep ordering.
 2017-11-20 11:25:19 -05:00
Gabe Mulley
7dbe2cd89d ensure landing page for scheduled emails is not a redirect 2017-11-20 07:12:31 -05:00
Hasnain Naveed
e1bf86226a Merge pull request #16608 from edx/hasnain-naveed/WL-1257 
WL-1257 | Removed the hard-coded "edX" related strings from nudges em…
 2017-11-20 15:56:14 +05:00
Gabe Mulley
1f3085b2bc rename test methods 2017-11-17 14:05:15 -05:00
Gabe Mulley
a6387c0e5f log changes to the start date 2017-11-17 13:34:15 -05:00
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