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

45363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Hallada
c11ff4cfb7 Merge pull request #17644 from edx/thallada/sfe-bump 
Bump studio-frontend to 1.4.0
 2018-03-08 13:50:44 -05:00
Feanil Patel
9bddcf5546 Merge pull request #17652 from edx/feanil/remove_flaky_lti_tests 
Feanil/remove flaky lti tests
 2018-03-08 13:17:43 -05:00
Troy Sankey
abed3f743d Merge pull request #17653 from edx/pwnage101/revert-memory-monitoring-utils 
Revert "PLAT-1957 Better memory leak diagnostic tooling"
 2018-03-08 13:17:11 -05:00
Troy Sankey
3f1f524953 Revert "PLAT-1957 Better memory leak diagnostic tooling" 
This reverts commit a022461891.

Reverts edx/edx-platform#17486
 2018-03-08 13:16:34 -05:00
Tyler Hallada
395cdcceb5 Fix bok-choy tests 2018-03-08 12:49:14 -05:00
Feanil Patel
d76ad8eb4b Remove LTI tests that build on top of flaky permission alert tests. 2018-03-08 11:24:33 -05:00
Feanil Patel
00ccc879bd Remove flaky lti scenario. 2018-03-08 11:24:33 -05:00
M. Rehan
f02ba65983 Merge pull request #17550 from edx/rehan-ammar/transcript-util 
transcript util
 2018-03-08 17:35:08 +05:00
Jeremy Bowman
a30ae80ef8 Merge pull request #17486 from edx/jmbowman/PLAT-1957 
PLAT-1957 Better memory leak diagnostic tooling
 2018-03-07 18:59:29 -05:00
Tyler Hallada
7721e79395 Bump SFE to 1.4.1 
Includes a hotfix for the page sock on the assets page.
 2018-03-07 18:16:33 -05:00
Matt Tuchfarber
5836b9fca7 Merge pull request #17639 from edx/tuchfarber/add_bundle_to_program_purchase_url 
Add bundle key to program purchase button
 2018-03-07 17:30:13 -05:00
Gregory Martin
515e851eee Merge pull request #17643 from edx/sstudent/safe_settings_check 
guard against missing item
 2018-03-07 16:40:54 -05:00
Jeremy Bowman
a022461891 PLAT-1957 Better memory leak diagnostic tooling 2018-03-07 16:31:26 -05:00
Tyler Hallada
7960688fa5 Bump studio-frontend to 1.4.0 2018-03-07 16:05:50 -05:00
Sanford Student
6f5c49e7b6 guard against missing setting 2018-03-07 15:49:44 -05:00
Matt Tuchfarber
4c7dc0b250 Add bundle key to program purchase button 
In order for a program to be tracked as a bundle in ecommerce and GA
a bundle key must be added to the basket URL. This adds that key to
the purchase button on the program marketing page.
 2018-03-07 15:40:51 -05:00
Michael Youngstrom
730c64011b Merge pull request #17638 from edx/testeng/bokchoy_auto_cache_update_209447065ab7561b19b8beadcbea14d262c667db 
Bokchoy db cache update
 2018-03-07 13:13:06 -05:00
muhammad-ammar
a01ba7621e transcript util 
EDUCATOR-2131
 2018-03-07 23:02:15 +05:00
sanfordstudent
b57b813f1c Merge pull request #17467 from edx/yro/EDUCATOR-2296 
Add resume button to LMS header dropdown
 2018-03-07 12:21:27 -05:00
edx-cache-uploader-bot
0e529264e7 Updating migrations 2018-03-07 12:16:18 -05:00
Bill DeRusha
e213d84c5a Merge pull request #16267 from open-craft/haikuginger/allowed-enrollment-signal 
Switch to using a signal to manage pending enrollments when a user is activated or changes their email address
 2018-03-07 11:58:11 -05:00
Gregory Martin
a5d8cbb8e9 Add "last completed block" to dropdown 2018-03-07 10:58:59 -05:00
Michael LoTurco
335bf4b035 Merge pull request #17575 from edx/MLoTurco/learner-3925-feature-utils 
Add utils for EntitlementSupportApp
 2018-03-07 10:37:10 -05:00
Simon Chen
46956b99e6 Merge pull request #16671 from proversity-org/proversity/edx-pr-customize-course-info-title 
Customize course info title
 2018-03-07 09:31:40 -05:00
Feanil Patel
9cd770a3d4 Merge pull request #17624 from edx/feanil/update_django_1.8 
Update to take new security fix.
 2018-03-07 09:10:50 -05:00
Brian Mesick
9eda60a5c2 Merge pull request #17521 from edx/bmedx/test_user_create_mgmt 
Add tests for create_user / create_random_users management commands
 2018-03-07 09:09:22 -05:00
Jose Antonio Gonzalez
99f6d78def customize course info title 2018-03-07 10:12:08 +02:00
Michael LoTurco
a4f294b441 Add convenience functions for Entitlement Support Tool 
Adds getter for ecommerce order dashboard url and for getting
the entitlement support details reasons.

Learner-3925
 2018-03-06 17:49:08 -05:00
Ari Rizzitano
60ed509684 Merge pull request #17557 from edx/ari/no-textbooks-interop 
convert textbooks page to webpack
 2018-03-06 17:28:31 -05:00
bmedx
7dc2e75778 Add tests for create_user / create_random_users management commands 2018-03-06 17:04:39 -05:00
Ari Rizzitano
c5b199a1a2 fix linting errors and un-vendor backbone-associations 
remove erroneous asset_index listing

remove indirect define

remove pageFactoryArguments index

max length seems excessive for this file

lintfix

un-vendor backbone associations
 2018-03-06 15:35:47 -05:00
Calen Pennington
970bc6a50d Move the context course and sock into require_page compatible forms 2018-03-06 15:35:46 -05:00
Ari Rizzitano
6998b311fe fix page_bundle 2018-03-06 15:35:46 -05:00
Calen Pennington
52e7af4148 Move pattern-replacement file lists into a separate file 
Move pattern-replacement file lists into a separate file

punt the react stuff for now
 2018-03-06 15:35:23 -05:00
Calen Pennington
c8e1e14479 Fix all text!*.underscore import issues in webpack 2018-03-06 15:35:23 -05:00
Rabia Iftikhar
3be942bf8f upgrade backbone-associations, fix tests 
Merge pull request #17559 from edx/ri/EDUCATOR-2231-remove-enrollment-dates-references

EDUCATOR-2231 remove course run enrollment dates references from studio

add NoTextbooks component

make backbone-associations work

webpackify context course

test fixup
 2018-03-06 15:30:56 -05:00
Eric Fischer
5d0d37112a Merge pull request #17593 from edx/efischer/clean_git_checkout 
Fail js tests if dirty package-lock
 2018-03-06 14:50:38 -05:00
Michael LoTurco
229d3b81cb Merge pull request #17627 from edx/MLoTurco/learner-3925-model-tweak 
Remove reference to reason field, add action field
 2018-03-06 14:32:06 -05:00
Michael LoTurco
d6f910d5da Remove reference to reason field, add action field 
As work progressed on entitlement support tool,
additional clarity around the entitlement support
detail fields was needed, this adds the action field
at a later point the reason field will be removed

Learner-3925
 2018-03-06 13:35:17 -05:00
Sofiya Semenova
2e0ee010c5 Merge pull request #17555 from edx/sofiya/course-outline 
Auto-open first unit in course outline if user has no completion data
 2018-03-06 12:02:57 -05:00
Eric Fischer
383d67f879 Fail js tests if dirty package-lock 2018-03-06 11:45:26 -05:00
Sofiya Semenova
774fe73ca9 Auto-open first unit in course outline if user has no completion data 2018-03-06 10:52:22 -05:00
Feanil Patel
a6cec7779c Update to take new security fix. 2018-03-06 09:59:39 -05:00
Jesse Shapiro
1f5c94d9b6 Process pending enrollments when a user is activated or changes their email address 2018-03-06 16:38:00 +02:00
Mushtaq Ali
14e462e966 Merge pull request #17488 from edx/mushtaq/export-transcripts 
Export video transcripts
 2018-03-06 18:03:06 +05:00
Mushtaq Ali
ff175923e6 VAL version bump 2018-03-06 15:26:29 +05:00
Mushtaq Ali
36483f938d Export video transcripts - EDUCATOR-1789 2018-03-06 15:25:46 +05:00
Alessandro Roux
89d8e7b539 Merge pull request #17619 from edx/five-hundos-on-stage 
Fix 500 error in the LMS student dashboard
 2018-03-05 16:26:28 -05:00
Ned Batchelder
6bbb68ee1c Merge pull request #17370 from mitodl/pdpinch/tensor-variables 
Allow primes and tensor notation in variable names
 2018-03-05 15:32:48 -05:00
sandroroux
22b7da39b6 Add resume buttons to the edx.org dashboard. 2018-03-05 15:14:50 -05:00