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

2348 Commits

Author SHA1 Message Date
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
41879e0087 Update comment. 2018-02-01 10:08:40 -05:00
Feanil Patel
14b57f14ff Remove unnecessary var. 
Previously it was useful because we updated it conditionally but now
it's just reducing information locality.
 2018-02-01 10:08:40 -05:00
Feanil Patel
8d84e8b4a2 Consolidate overrides into base config. 
They used to be in a conditional but aren't anymore so we don't need to have
them be separate.
 2018-02-01 10:08:40 -05:00
Feanil Patel
caff4b5720 console_loglevel never used, remove it. 2018-02-01 10:08:40 -05:00
Feanil Patel
3d6fe85703 syslog_addr config never used. 2018-02-01 10:08:40 -05:00
Feanil Patel
bc08698592 Remove dev_env specific settings. 
Since we never used dev_env and have removed it.
 2018-02-01 10:08:40 -05:00
Feanil Patel
779bc1d772 The dev_env parameter is never used in any of our configs. 2018-02-01 10:08:40 -05:00
Feanil Patel
147ea0c12c Remove un-necessary conditional. 2018-02-01 10:08:40 -05:00
Feanil Patel
de80ab751a Remove the debug override. 2018-02-01 10:08:40 -05:00
Jeremy Bowman
5289c7e828 PLAT-1915 Stop using deprecated BaseException.message 2018-01-31 17:22:01 -05:00
Bill DeRusha
2eff15b22f Revert "Fix layout in learner profile" 2018-01-31 11:16:40 -05:00
Bill DeRusha
fd8cd2ffbe Merge pull request #17348 from proversity-org/proversity/edx-pr-fix-layout-in-learner-profile 
Fix layout in learner profile
 2018-01-31 09:21:06 -05:00
Robert Raposa
093fefaf74 Merge pull request #17360 from edx/robrap/fix-la-waffle 
Add new waffle for modals.
 2018-01-31 09:05:21 -05:00
Albert (AJ) St. Aubin
55c6387db6 Merge pull request #17349 from edx/aj/LEARNER-3800 
Aj/learner 3800
 2018-01-31 07:03:34 -05:00
Robert Raposa
d6c15ffdbf Add new waffle for modals. 2018-01-30 15:27:12 -05:00
jaebradley
070b6ce414 more complete catch 2018-01-30 13:57:54 -05:00
Albert St. Aubin
b0e670e0de Used the incorrect version of the Course Key when building Course 
Entitlements list
 2018-01-30 09:55:31 -05:00
Albert St. Aubin
ddab8123c1 Updates to the Course Entitlement API to block Learners from enrolling 
in runs that are not available.

[LEARNER-3800]
 2018-01-30 09:52:06 -05:00
Albert (AJ) St. Aubin
01553ff1bc Revert "Aj/learner 3800" 2018-01-30 09:45:05 -05:00
Jose Antonio Gonzalez
238e2f6b47 fix layout in learner profile 2018-01-30 16:42:02 +02:00
Albert (AJ) St. Aubin
b41019f304 Merge pull request #17308 from edx/aj/LEARNER-3800 
Aj/learner 3800
 2018-01-30 07:42:05 -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
Albert St. Aubin
12e77b27e4 PR updates 2018-01-29 12:22:56 -05:00
Albert St. Aubin
1bd4bde9a4 PR and quality updates 2018-01-29 09:07:29 -05:00
Robert Raposa
c776b0d7ae Fix title to My Stats with lock. 2018-01-26 16:06:13 -05:00
John Eskew
5a71fa1e33 Allow inactive users to authenticate in Django 1.10+ 2018-01-26 14:04:19 -05:00
Robert Raposa
59336cc58a Drop due date section of Learner Analytics and fix grading section. 2018-01-26 13:03:50 -05:00
M. Rehan
777eb1a3ab Merge pull request #17314 from edx/mrehan/move-request-cache-to-openedx 
Move request_cache to openedx.core.djangoapps
 2018-01-26 17:10:17 +05:00
noraiz-anwar
0d40dba7ff fix gating api exception handling 2018-01-26 15:41:54 +05:00
Qubad786
64555c60c0 Move request_cache to openedx.core.djangoapps 2018-01-26 15:09:25 +05:00
Albert St. Aubin
cac22680e2 Updates to the Course Entitlement API to block Learners from enrolling 
in runs that are not available.

[LEARNER-3800]
 2018-01-25 14:53:03 -05:00
John Eskew
27edca3c5e Replace all clean_course_id form methods with common method. 2018-01-25 11:38:46 -05:00
John Eskew
875a127f84 Pylint fixes to move number below allowed threshold. 2018-01-25 11:38:37 -05:00
John Eskew
ff545e2a60 Handle different cookie processing for Django 1.11 2018-01-25 11:33:51 -05:00
John Eskew
efbde03ce0 Move param addition for POST request to creation. 2018-01-25 11:33:51 -05:00
Jeremy Bowman
182a5bcb23 Merge pull request #17302 from edx/jmbowman/PLAT-1900 
PLAT-1900 Remove dependency on abandoned django-pipeline-forgiving
 2018-01-25 09:37:50 -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
Jeremy Bowman
36e321a5a2 PLAT-1900 Remove dependency on abandoned django-pipeline-forgiving package 2018-01-24 17:53:12 -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
bmedx
1d45c85135 Refactor student login for readability and fix Django 1.11 issues 2018-01-24 11:26:43 -05:00
Harry Rein
2935578b9a Merge pull request #17294 from edx/HarryRein/a11y-footer-upgrade-div 
Ensuring div and not button inside link tag for a11y.
 2018-01-24 11:18:04 -05:00
Harry Rein
98b8eaf27e Ensuring div and not button inside link tag for a11y. 2018-01-24 10:01:50 -05:00
bmedx
46cb89e55d Fixes to CMS failures in Django 1.11 tests 2018-01-23 14:11:06 -05:00
jaebradley
5ab2533b1e add try/catch for analytics api calls 
add comment

update jsx comment

simplify try block and update comment

fix comment
 2018-01-23 11:10:04 -05:00
Jae Bradley
407bc5ff2b Merge pull request #17256 from edx/add-passing-grade-to-learner-analytics 
LEARNER-3922: Add Grade Information
 2018-01-23 09:59:54 -05:00
jaebradley
d52aa8c6ec add grade information 
remove console

remove whitespace

update logic

remove console statement
 2018-01-23 08:41:12 -05:00
Adeel Khan
b497210f17 strip_all_tags_but_br_filter would return HTML safe string. 
Now returning HTML safe string to template instead
of just bleaching string for br tags.

LEARNER-3930
 2018-01-23 17:15:33 +05:00
Matthew Piatetsky
e17527c570 Merge pull request #17280 from edx/add_price_url_to_context 
Add price and url to context
 2018-01-22 17:01:08 -05:00