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

44976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Bowman
11e134c552 PLAT-1916 Ignore existing usage of deprecated field_data 2018-02-02 16:12:00 -05:00
Gregory Martin
7d67583bb9 Merge pull request #17310 from edx/yro/EDUCATOR-2088 
Yro/EDUCATOR 2088
 2018-02-02 08:40:44 -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
Noraiz Anwar
612fb259e6 Merge pull request #17381 from edx/noraiz/EDUCATOR-2228 
Clean grade sevice
 2018-02-02 13:02:20 +05:00
noraiz-anwar
d56bd58063 clean grades service 2018-02-02 11:52:12 +05:00
Gregory Martin
a79f899b4b Update resume button functionality 2018-02-01 22:26:46 -05:00
Albert (AJ) St. Aubin
0b9cf78355 Merge pull request #17388 from edx/aj/entitlement_leave_session 
Updates to allow leaving a session on entitlements with only 1 run
 2018-02-01 14:19:37 -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
Albert St. Aubin
97165d3460 Updates to allow leaving a session on entitlements with only 1 run 
available

[LEARNER-4050]
 2018-02-01 13:05:05 -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
Jeremy Bowman
938c9670cc Merge pull request #17376 from edx/jmbowman/PLAT-1915 
PLAT-1915 Stop using deprecated BaseException.message
 2018-02-01 10:24:06 -05:00
Feanil Patel
0d8c30e58d Fix pep8 violation. 2018-02-01 10:08:40 -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
49cbd581e9 Remove tracking_filename override. 
The override value is the same as the default value.
 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
37ae5e5218 Move LOG_DIR setting next to LOGGING setting. 2018-02-01 10:08:40 -05:00
Feanil Patel
de80ab751a Remove the debug override. 2018-02-01 10:08:40 -05:00
Feanil Patel
7dd16638bd Merge pull request #17358 from edx/feanil/flaky_html5_test 
Remove a flaky html5 video test.
 2018-02-01 09:41:23 -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
Tasawer Nawaz
c00c245005 Merge pull request #17364 from edx/tasawer/learner-4041/link-new-support-form-from-lms-footer 
update link of "Contact" in lms footer to lead new support form
 2018-02-01 12:29:52 +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
Bill DeRusha
daaeb6b8fe Merge pull request #17371 from edx/revert-17348-proversity/edx-pr-fix-layout-in-learner-profile 
Revert "Fix layout in learner profile"
 2018-01-31 12:50:06 -05:00
Bill DeRusha
2eff15b22f Revert "Fix layout in learner profile" 2018-01-31 11:16:40 -05:00
Douglas Hall
71bd63e361 Merge pull request #17354 from edx/douglashall/ENT-854_part3 
Add migration for removing old edx-enterprise password fields from the database.
 2018-01-31 10:21:46 -05:00
Michael Roytman
60bc10e7ea Merge pull request #17357 from edx/mroytman/bump-studio-frontend 
bump version of studio-frontend
 2018-01-31 10:18:26 -05:00
Uzair Rasheed
9aff0ba9a0 Merge pull request #17344 from edx/LEARNER-3465/catch-sailthru-connection-error 
Handle Exception in getting cookies from Sailthru
 2018-01-31 20:05:04 +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
uzairr
4e91ce19b1 Handle Exception in getting cookies from Sailthru 
In order to send email, cookies are required from Sailthru,
ocassionally, celery task fails possibly because of request timeout
that ultimately fails login.To avoid it,generic exception handler
is added so that login will not fail in future.

LEARNER-3465
 2018-01-31 18:35:19 +05:00
Tasawer Nawaz
ab744a2516 update link of "Contact" in lms footer to lead new support form 
LEARNER-4041
 2018-01-31 17:53:52 +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
Albert (AJ) St. Aubin
71991887dd Merge pull request #17353 from edx/aj/LEARNER-3186 
Updates the Branch IO Mobile App banner to not show in the web app
 2018-01-31 07:00:55 -05:00
Jeremy Bowman
0514e0a907 Merge pull request #17361 from edx/jmbowman/always_recreate_tox_env 
Always use a fresh tox env in Jenkins
 2018-01-31 00:28:07 -05:00
Jeremy Bowman
a56fd66270 Always use a fresh tox env in Jenkins 2018-01-30 18:43:43 -05:00
Michael Roytman
8fff350284 bump version of studio-frontend 2018-01-30 15:54:53 -05:00
Robert Raposa
d6c15ffdbf Add new waffle for modals. 2018-01-30 15:27:12 -05:00
Feanil Patel
6c70147e86 Remove a flaky html5 video test. 2018-01-30 15:13:19 -05:00
Robert Raposa
8b7701df9e Merge pull request #17355 from edx/learner-analytics-handle-all-comment-client-errors 
More complete try/catch for the User Profile request in the Learner Analytics View
 2018-01-30 14:47:38 -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
jaebradley
070b6ce414 more complete catch 2018-01-30 13:57:54 -05:00
Douglas Hall
1410209a11 Add migration for removing old edx-enterprise password fields from the database. 2018-01-30 13:43:10 -05:00
Albert St. Aubin
7f6b2d6ac5 Updates the Branch IO Mobile App banner to not show in the web app 2018-01-30 13:35:12 -05:00
Brittney Exline
73f3a63ea2 Merge pull request #17276 from edx/bexline/configure_saml_certs 
ENT-839 Add ability to configure SP metadata for an IdP
 2018-01-30 11:18:09 -07:00