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

7982 Commits

Author SHA1 Message Date
Jeremy Bowman
11e134c552 PLAT-1916 Ignore existing usage of deprecated field_data 2018-02-02 16:12:00 -05:00
Awais Jibran
5ddcfc5607 Merge pull request #17343 from edx/aj/validate-course-team-user 
Course team Validation
 2018-02-02 14:32:39 +05:00
Gregory Martin
61306c8f10 Merge pull request #17377 from edx/fysheets/EDUCATOR-2230 
Update video record handling defensiveness
 2018-02-01 14:10:36 -05:00
Feanil Patel
bc790400a9 Merge pull request #17374 from edx/feanil/hackathon_logging 
Make the logging config easier to read.
 2018-02-01 11:14:16 -05:00
Feanil Patel
de80ab751a Remove the debug override. 2018-02-01 10:08:40 -05:00
Awais Jibran
1e16bfd936 On course run create request, validate course team user and raise validation error 2018-02-01 14:17:35 +05:00
Jeremy Bowman
5289c7e828 PLAT-1915 Stop using deprecated BaseException.message 2018-01-31 17:22:01 -05:00
Gregory Martin
61b8bd4d7a Update video record handling defensiveness 2018-01-31 16:58:51 -05:00
Calen Pennington
f2c3aed8e7 Merge pull request #17316 from cpennington/switch-cms-login-to-webpack 
Migrate login.js to webpack
 2018-01-30 14:24:08 -05:00
Calen Pennington
b701ad77c8 Rename require_page to invoke_page_bundle 2018-01-30 10:32:31 -05:00
Calen Pennington
5772042199 Migrate login.js to webpack 2018-01-30 10:32:31 -05:00
Jeremy Bowman
5ca1a51460 PLAT-1350 Log Python warnings in production 2018-01-29 15:50:13 -05:00
Troy Sankey
381af53ad5 Merge pull request #17130 from edx/jeskew/fix_lms_shard_4_tests_django_111 
LMS shard 4 tests Django 1.11
 2018-01-29 14:14:22 -05:00
ayub-khan
08863b3930 updated-translations-29-jan 2018-01-29 14:51:52 +05:00
Douglas Hall
96caad7f4f Merge pull request #17324 from edx/douglashall/add_enterprise_reporting_secret_to_cms 
Add ENTERPRISE_REPORTING_SECRET to cms settings.
 2018-01-26 15:59:52 -05:00
Ned Batchelder
921ea67cac Merge pull request #17312 from caesar2164/allow-theming-files-uploads-header 
Allows insertion of content above Files & Uploads
 2018-01-26 15:38:12 -05:00
Ned Batchelder
fb5f253e1c Merge pull request #17306 from caesar2164/themable-course-outline-header-extra 
Extends <head> in Studio course outline
 2018-01-26 15:37:27 -05:00
John Eskew
fa7bb1ea81 Merge pull request #17311 from mitodl/python_lib_import_fix_v2 
Enabled python code lib import with GIT_IMPORT_STATIC set to False
 2018-01-26 14:41:12 -05:00
Douglas Hall
2775b9c382 Add ENTERPRISE_REPORTING_SECRET to cms settings. 
This is required due to the way we run migrations, starting with cms.
 2018-01-26 14:29:11 -05:00
Ayub khan
bc497d35c0 Merge pull request #17318 from edx/update-translations-26-jan 
updated translations
 2018-01-26 23:53:34 +05:00
ayub-khan
9a50e018f0 updated translations 2018-01-26 16:38:12 +05:00
Qubad786
64555c60c0 Move request_cache to openedx.core.djangoapps 2018-01-26 15:09:25 +05:00
Giulio Gratta
5b0344d87f Allows insertion of content above Files & Uploads 2018-01-25 13:11:55 -08:00
Gavin Sidebottom
382b6069d8 PR feedback (added docstring notes, cleared up log messages) 2018-01-25 16:09:13 -05:00
Gavin Sidebottom
ec0263bc5b changed 'course code lib' references to 'python lib' to maintain consistency 2018-01-25 16:08:57 -05:00
Gavin Sidebottom
8476f19463 Enabled python code lib import with GIT_IMPORT_STATIC set to False 2018-01-25 16:08:25 -05:00
Giulio Gratta
794630824e Extends <head> in Studio course outline 
- Can add meta, link, and script tags
- Adds to rather than replaces edX tags
 2018-01-25 11:28:06 -08:00
John Eskew
27edca3c5e Replace all clean_course_id form methods with common method. 2018-01-25 11:38:46 -05:00
John Eskew
d21a098280 Merge pull request #17146 from open-craft/clemente/move-heartbeat-settings-to-env 
Allow customizing heartbeat checks
 2018-01-24 20:21:51 -05:00
sanfordstudent
fda773721c Merge pull request #17285 from edx/sstudent/hide_cert_setting 
deprecate html setting for web certs and set to true by default
 2018-01-24 16:27:40 -05:00
Sanford Student
e2becea8cb deprecate html setting for web certs and set to true by default 2018-01-24 15:02:44 -05:00
Brian Mesick
bffd906909 Merge pull request #17115 from edx/bmedx/django111_cms_test_failures 
Fixes to CMS failures in Django 1.11 tests
 2018-01-24 14:46:52 -05:00
Jeremy Bowman
ebc54c8f1a PLAT-1890 Fixed assorted ModifyingEnforceTypeWarning warnings 2018-01-24 11:49:42 -05:00
bmedx
1d45c85135 Refactor student login for readability and fix Django 1.11 issues 2018-01-24 11:26:43 -05:00
Calen Pennington
69348d06d7 Merge pull request #17009 from cpennington/cms-login-factory-page 
Convert cms login.html to the require_page pattern in preparation for…
 2018-01-24 10:19:27 -05:00
Michael Frey
90bb8af3c6 Merge pull request #15618 from open-craft/bdero/failed-password-reset-email 
Add optional password reset failure emails
 2018-01-24 10:06:16 -05:00
Michael Roytman
8e667d8bdf Merge pull request #17287 from edx/mroytman/assets-api-zero-assets 
mroytman/assets api zero assets
 2018-01-23 16:16:43 -05:00
Calen Pennington
974f099835 Teach the xss_linter about the require_page tag 2018-01-23 15:58:12 -05:00
Michael Roytman
97954d48fb add condition for when no assets are found in the database 2018-01-23 15:13:12 -05:00
bmedx
46cb89e55d Fixes to CMS failures in Django 1.11 tests 2018-01-23 14:11:06 -05:00
Eric Fischer
097e000a24 Merge pull request #16191 from proversity-org/proversity/course-visibility-in-catalog 
add DEFAULT_COURSE_VISIBILITY_IN_CATALOG flag
 2018-01-23 08:10:25 -05:00
Tyler Hallada
ad773dac5c Add text_search param for searching by displayname 2018-01-22 19:05:43 -05:00
Jose Antonio Gonzalez
cd2a31aacc set default course visibility in catalog 2018-01-22 08:35:57 +02:00
Nimisha Asthagiri
2e9efe6472 Fix Certificates import and signals code 2018-01-19 15:12:28 -05:00
Calen Pennington
2d89f1b2ab Put Require.js in debug mode in acceptance tests, because they don't run with optimized assets 2018-01-18 13:49:44 -05:00
Calen Pennington
58bb7167c1 Convert cms login.html to the require_page pattern in preparation for webpack 2018-01-18 13:49:44 -05:00
Nimisha Asthagiri
a5c5325a27 Merge pull request #17196 from edx/arch/plugin-signals-support 
Django App Plugins: support for Signal Receivers
 2018-01-18 13:23:18 -05:00
Calen Pennington
bacd4334ed Add a form of static:require_module that assumes that the factory is self-initializing 2018-01-18 10:10:30 -05:00
Tyler Hallada
8dcba2737a If SFE enabled, hide sidebar and upload button 2018-01-17 15:34:02 -05:00
ayub-khan
5033dbcd91 update translations 2018-01-17 19:26:02 +05:00