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

19868 Commits

Author SHA1 Message Date
Bill DeRusha
d4b57bc218 Removed self-paced feature flag from code 2018-02-26 13:44:53 -05:00
Feanil Patel
f6d3421751 Revert "Update setup.py for calc module." 2018-02-23 16:53:41 -05:00
Feanil Patel
d51718c47b Merge pull request #17538 from edx/feanil/fix-version-conflict 
Update setup.py for calc module.
 2018-02-23 15:32:46 -05:00
George Babey
3e840ff268 Merge pull request #17497 from edx/gbabey/move_paginators 
Moved pagination to edx_rest_framework_extensions package
 2018-02-23 15:24:40 -05:00
George Babey
1c7720a561 Bump drf-extensions for pagination move 2018-02-23 14:20:00 -05:00
Feanil Patel
c0b5916804 Update setup.py for calc module. 
We've been running with pyparsing 2.2.0 in production this whole time
so I'm pretty sure we can depend on this.
 2018-02-23 14:02:54 -05:00
John Eskew
b292bb43eb Merge pull request #17446 from mitodl/upstream/fix_error_page_themes 
Fixed unthemed error pages in Studio and LMS
 2018-02-23 13:25:08 -05:00
Albert (AJ) St. Aubin
312a9ec160 Merge pull request #17533 from edx/aj/LEARNER-3898 
Added entitlement redeemability method to the check for fulfillable
 2018-02-23 07:44:46 -05:00
edx-pipeline-bot
92ca38f489 Merge pull request #17535 from edx/release-mergeback-to-master 
Merge release back to master
 2018-02-22 18:32:36 -05:00
Gavin Sidebottom
67442c2641 Fixed unthemed error pages in Studio and LMS 2018-02-22 16:49:06 -05:00
Albert St. Aubin
8c5e37ba20 Added entitlement redeemability method to the check for fulfillable 
entitlements

[LEARNER-3898]
 2018-02-22 15:00:19 -05:00
Calen Pennington
67177ac72d Revert "Merge pull request #17325 from cpennington/switch-asset-index-factory-to-webpack" 
This reverts commit 1c46bd89c3, reversing
changes made to eb6064e333.
 2018-02-22 14:12:32 -05:00
Dennis Jen
b9d6ead3a3 Merge pull request #17522 from edx/dsjen/rename-accessibility-switch 
Renamed contentstore waffle namespace to "studio"
 2018-02-22 11:10:57 -05:00
Matthew Piatetsky
518ab054b3 Merge pull request #17475 from edx/default_unified_course_tab_to_on 
LEARNER-3605: make unified_course_tab on by default
 2018-02-22 10:30:12 -05:00
Diana Huang
972af9ef56 Merge pull request #17520 from edx/diana/remove-flaky-test 
LEARNER-3605: Remove flaky studio test.
 2018-02-22 09:56:48 -05:00
Matthew Piatetsky
92c94008a2 Fix tests that expected unified_course_tab to be off 2018-02-22 08:45:25 -05:00
Albert (AJ) St. Aubin
7484c1b135 Merge pull request #17491 from edx/aj/LEARNER-3898 
Aj/learner 3898
 2018-02-21 20:45:08 -05:00
Dennis Jen
354abd09c8 Renamed contentstore waffle namespace to "studio" 2018-02-21 17:26:05 -05:00
Brian Mesick
714b25a83d Merge pull request #17480 from open-craft/ciuin/fix-user-creation-mgmtcmds 
Fix user creation management commands
 2018-02-21 15:55:09 -05:00
Diana Huang
a634c076ba Remove flaky studio test. 2018-02-21 14:59:52 -05:00
Calen Pennington
1c46bd89c3 Merge pull request #17325 from cpennington/switch-asset-index-factory-to-webpack 
Switch asset index factory to webpack
 2018-02-21 11:48:37 -05:00
Albert St. Aubin
b56fdcc652 Changes to auto enroll users using their entitlement if they have one 
available.

[LEARNER-3898]
 2018-02-21 11:17:02 -05:00
Matthew Piatetsky
6a841d5b2b Merge pull request #17494 from edx/limit_enrollment_count 
limit bundling code to users with less than 4 enrollments
 2018-02-21 11:10:21 -05:00
Calen Pennington
c906c186ce Move the context course and sock into require_page compatible forms 2018-02-21 10:29:41 -05:00
Alex Dusenbery
919355cab1 Revert "Track viewing of individual blocks." 
This reverts commit 4946b6b296.
 2018-02-20 14:42:28 -05:00
Michael LoTurco
449c6903a6 Add Support endpoint for Course Entitlements 2018-02-20 13:20:47 -05:00
Matthew Piatetsky
70ec5e47c6 limit bundling code to users with less than 4 enrollments 2018-02-16 14:24:23 -05:00
George Babey
26bac9f611 Moved paginators to edx_rest_framework_extensions package 
Pagination should be standard and easy to adopt so moved the paginators
into the edx_rest_framework_extensions package so they can be easily
installed into other app/projects
 2018-02-16 09:46:01 -05:00
Qubad786
c90aa33cb8 Integrate with the updated VAL api utils. 2018-02-16 19:06:44 +05:00
J. Cliff Dyer
4946b6b296 Track viewing of individual blocks. 
* Implement a ViewedEvent handling system which calls handlers when a
  block has been viewed for 5 seconds (configurable).
* Hook up Verticals to register their children blocks with this event,
  and submit completions once seen.

OSPR-2093
OC-3358
 2018-02-15 15:13:48 -05:00
Tyler Hallada
4a6d8f78f0 Fix borked rebase conflict resolution 2018-02-15 13:20:20 -05:00
Tyler Hallada
6bc1d34022 Add class=SFE to root div to increase specificity 2018-02-15 13:20:18 -05:00
Tyler Hallada
3e7a742177 Fix integration of accessibility policy page 2018-02-15 13:20:18 -05:00
Tyler Hallada
73cffad5ce Dev in sfe container & prod use /dist of sfe 2018-02-15 13:20:18 -05:00
Michael Youngstrom
8cf2911ec9 Merge pull request #17483 from edx/testeng/bokchoy_auto_cache_update_6c6de6119c17e97f88707f1cc9a06be35827e4b9 
Bokchoy db cache update
 2018-02-14 18:28:23 -05:00
Peter Pinch
54b85ddd13 allow prime and tensor notation 
fix epsilon_max test

add tests
 2018-02-14 16:06:43 -05:00
edx-cache-uploader-bot
98defce09d Updating migrations 2018-02-14 15:45:39 -05:00
George Schneeloch
6aa87d43c0 Fix broken link in comment 2018-02-14 14:48:07 -05:00
John Hensley
c7c01e4a22 Fix user creation management commands 
Two user creation scripts were broken by the move of
student.views._do_create_account to student.helpers.do_create_account.

This patch just catches the scripts up.
 2018-02-14 11:32:26 -05:00
Michael Frey
ed54cdc1d9 increase limit for staff users 2018-02-13 12:49:26 -05:00
Michael Roytman
7fc5a78528 Merge pull request #17457 from edx/mroytman/EDUCATOR-1613-i18n 
pass language to mako template
 2018-02-13 09:58:00 -05:00
Dennis Jen
20349e88bd Merge pull request #17160 from open-craft/tomaszgy/fix_layout_of_enrollment_in_ccx_dashboard 
Simplify layout of the Enrollment tab of CCX dashboard
 2018-02-13 09:39:58 -05:00
Simon Chen
4459be9d1d Merge pull request #17338 from edx/sstudent/EDUCATOR-2189 
progress indicators on courseware ribbon
 2018-02-12 16:37:09 -05:00
Tomasz Gargas
605f080b9a Simplify the content enrollment tab in the CCX Dashboard. 
Signed-off-by: Tomasz Gargas <tomasz@opencraft.com>
 2018-02-12 21:47:49 +01:00
Michael Roytman
3496bb9a0a pass language to mako template 2018-02-12 15:44:20 -05:00
Sanford Student
8956739a34 Add the visual indicator to the sequence horizontal nav bar to mark verticals completed 
EDUCATOR-2189
 2018-02-12 15:26:40 -05:00
edx-cache-uploader-bot
41926a99e0 Updating migrations 2018-02-12 14:24:58 -05:00
Michael LoTurco
82f4ce4252 Add CourseEntitlementSupportDetail model and related admin model 
Learner-3919
 2018-02-12 11:43:44 -05:00
Jeremy Bowman
a600ef4c25 Merge pull request #17444 from edx/jmbowman/PLAT-1948 
PLAT-1948 Update the cached lettuce test databases
 2018-02-12 08:25:37 -05:00
Jeremy Bowman
b15882e277 PLAT-1948 Update the cached lettuce test databases 2018-02-09 16:07:35 -05:00