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

48037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Piatetsky
e2490d8f8e localize datetime for banner 2018-12-17 08:41:14 -05:00
Waheed Ahmed
0f10260ec3 Merge pull request #19455 from edx/transifex-bot-update-translations2018-12-16 
Update translations
 2018-12-17 11:09:27 +05:00
edX Transifex Bot
916b6299ab Update translations 2018-12-16 20:38:03 +00:00
Matt Tuchfarber
b034f4e0d4 Merge pull request #19450 from edx/tuchfarber/fix_experiment_integrity_error 
Ignore integrity error in revenue holdback experiment
 2018-12-14 16:52:29 -05:00
Cali
ebf4278c7b Merge pull request #19451 from edx/cstenson/update_django_utils 
Update django utils version
 2018-12-14 16:12:23 -05:00
Cali Stenson
7dd6e2d87f Update django utils version 
REVE-69
 2018-12-14 15:30:15 -05:00
Matt Tuchfarber
885850eadb Ignore integrity error in revenue holdback experiment 2018-12-14 14:53:51 -05:00
Bessie Steinberg
04c17192c5 Merge pull request #19444 from edx/bessiesteinberg/REVE-154-feature-based-enrollment-global-kill-switch 
REVE-154 FBE Global Kill Switch
 2018-12-14 12:05:59 -05:00
Bessie Steinberg
6f2a2785e8 REVE-154 FBE Global Kill Switch 
Create a global kill switch for feature based enrollment.  To turn on
the kill switch (and turn off both course duration gating and content
type gating) enable a waffle flag named:
'content_type_gating.global_kill_switch'
 2018-12-14 09:36:56 -05:00
noraiz-anwar
da2319cac1 bumping edxval to 0.1.23 2018-12-14 12:38:41 +05:00
Matthew Piatetsky
77a9b8eedc Merge pull request #19445 from edx/transifex-bot-update-translations2018-12-13 
Update translations
 2018-12-13 23:38:13 -05:00
Matthew Piatetsky
d7a6fb5c0c fix quality error 2018-12-13 16:17:37 -05:00
Gabe Mulley
181a531aca remove translations from support form values 2018-12-13 16:13:10 -05:00
edX Transifex Bot
772d8af669 Update translations 2018-12-13 19:29:23 +00:00
Bill Filler
92551e7b7a Merge pull request #19369 from edx/bfiller/REVE-88 
Add feature-based enrollments search to support form
 2018-12-13 14:01:45 -05:00
Matthew Piatetsky
e4ab7565ed Merge pull request #19443 from edx/update_messaging 
fix upgrade deadline bug
 2018-12-13 13:09:51 -05:00
Matthew Piatetsky
dda5eded24 fix bug with banner deadline logic 2018-12-13 12:32:14 -05:00
Jeremy Bowman
d3d0d0a2ff Merge pull request #19437 from edx/jmbowman/TE-2808 
TE-2808 Fix diff-quality comparison target
 2018-12-13 11:22:43 -05:00
Gabe Mulley
5831a1f73d Merge pull request #19439 from edx/update_messaging 
update banner messaging
 2018-12-13 09:50:01 -05:00
Matthew Piatetsky
eaa07082ed update messaging 2018-12-13 01:15:48 -05:00
Matthew Piatetsky
14a59c7768 Merge pull request #19424 from edx/REVE-156 
remove username from holdback key
 2018-12-12 23:50:45 -05:00
Matthew Piatetsky
93f6dfa330 Remove username from holdback key 2018-12-12 20:46:45 -05:00
Jansen Kantor
b2b92308d8 Merge pull request #19436 from edx/jkantor/list-user-roles2 
Add API call to list roles of the logged-on user
 2018-12-12 15:59:14 -05:00
Jeremy Bowman
f2ee1b5cfe TE-2808 Fix diff-quality comparison target 2018-12-12 15:51:28 -05:00
Alex Dusenbery
e44c6af957 Gradebook: add attempted field to subsection data, remove 2 unused fields. 2018-12-12 15:23:32 -05:00
jansenk
0fb7c101c7 Add API call to list roles of the logged-on user 
EDUCATOR-3796
 2018-12-12 14:54:07 -05:00
Zubair Afzal
14009d3a6b Merge pull request #19425 from edx/zub/ENT-1324-add-enterprise-customer-types 
ENT-1324 Update enterprise app version to 1.1.2
 2018-12-12 16:33:36 +05:00
zubair-arbi
217b63b492 ENT-1324 Update enterprise app version to 1.1.2 2018-12-12 15:46:26 +05:00
raeeschachar
dc37fb2cbc Merge pull request #19416 from edx/raees/update-bootstrap 
Updated edx-bootstrap version to 1.0.3. Updating it on platform as part of
 2018-12-12 15:30:43 +05:00
Awais Jibran
fda85ddcf5 Merge pull request #19418 from edx/aj/fix-segmentio-event 
Handle string datetime with datetime parser.
 2018-12-12 12:08:08 +05:00
Ned Batchelder
9aef89ab2d Merge pull request #19419 from edx/nedbat/constraints-file 
Constraints file for pinning packages
 2018-12-11 19:35:13 -05:00
Ned Batchelder
fe57498a4d $ make upgrade 2018-12-11 17:13:41 -05:00
Ned Batchelder
e4adce6869 Pin edx-lint to keep the version stable 2018-12-11 17:13:41 -05:00
Ned Batchelder
75b051b336 Use a contraints.txt file to force versions. 2018-12-11 17:13:41 -05:00
Awais Jibran
ddd69db7cf Handle string datetime with datetime parser. 2018-12-11 13:24:10 -05:00
Ned Batchelder
6d4e49458d Remove a pin that is no longer needed 2018-12-11 12:25:08 -05:00
Calen Pennington
bbc1326685 Merge pull request #19089 from mitodl/xblock_aq_changes 
Refactored XBlockAside rendering and added support for student view
 2018-12-11 12:13:37 -05:00
Calen Pennington
472407cf04 Merge pull request #19415 from edx/dsheraz/static_fix 
Static storage fix test
 2018-12-11 10:13:31 -05:00
Simon Chen
b18116d093 Merge pull request #19412 from edx/schen/frozen_grades 
Add grades_frozen flag to grading info api for Gradebook
 2018-12-11 10:02:22 -05:00
Bill Filler
6606ddefff Add feature-based enrollment search to support form 2018-12-11 09:53:19 -05:00
Simon Chen
cbffeedb07 Add grades_frozen flag to grading info api for Gradebook 2018-12-11 08:33:22 -05:00
raeeschachar
76cfbf9a2f Updated https://www.npmjs.com/package/@edx/edx-bootstrap version to 1.0.3. Updating it on platform as part of 
https://openedx.atlassian.net/browse/LEARNER-3659
 2018-12-11 16:49:47 +05:00
DawoudSheraz
7b75e18f04 Static storage fix test 2018-12-11 13:58:28 +05:00
Gavin Sidebottom
3dad2be55d Refactored XBlockAside rendering and added support for student view 2018-12-11 12:27:03 +05:00
Alex Dusenbery
353fe07c27 Remove flaky test_logout_cancel_no_redirect bokchoy test 2018-12-10 16:43:15 -05:00
Alex Dusenbery
a853c03615 Remove flaky test_hls_video_with_youtube_blocked bokchoy test 2018-12-10 15:29:56 -05:00
Jeremy Bowman
4fbefc616f Merge pull request #19395 from edx/jmbowman/TE-2812 
TE-2812 Better output when print_setting fails
 2018-12-10 14:28:29 -05:00
Alex Dusenbery
89f3825220 Gradebook: check if subsection grade has an override when including earned/possible scores. 2018-12-10 14:11:21 -05:00
Ned Batchelder
36689eb27d Merge pull request #19388 from edx/nedbat/pin-idna 
Pin idna<2.8 to resolve 'make upgrade' conflict
 2018-12-10 14:08:07 -05:00
Michael Youngstrom
45f834aef0 Merge pull request #19402 from edx/testeng/bokchoy_auto_cache_update_9e270636e02e8c783099fbd262c60f2d3f748b16 
Bokchoy db cache update
 2018-12-10 12:12:26 -05:00