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

45382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stuart Young
53fe34615e Test fixes to prepare for firefox upgrade on jenkins 2018-03-12 15:40:25 -04:00
Awais Jibran
81899bdaee Merge pull request #17642 from edx/aj/change-spainish-language-month-to-lower 
Convert date to lower if language is spainish.
 2018-03-12 17:10:28 +05:00
Albert (AJ) St. Aubin
87f126e551 Merge pull request #17580 from edx/aj/LEARNER-4228_bug 
Updates to filter out Entitlements by Site
 2018-03-12 07:58:49 -04:00
Awais Jibran
74341b7dd5 Convert date to lower if language is spainish. 2018-03-12 15:57:25 +05:00
Awais Jibran
e73513f99b Merge pull request #17660 from edx/aj/do-not-include-currency-in-audit-emails 
Do not show Currencies: usd in bulk email task history Sent To:
 2018-03-12 15:55:11 +05:00
edX Transifex Bot
55aca51218 Update translations 2018-03-11 17:38:27 -04:00
Eric Fischer
07208acf7d Merge pull request #17663 from edx/efischer/lang_locale 
make use of to_locale in studiofrontend templating
 2018-03-09 12:53:32 -05:00
Diana Huang
741253483f Merge pull request #17655 from edx/diana/gdpr-toggle 
LEARNER-4431: Add new waffle flag for toggling GDPR work.
 2018-03-09 12:27:31 -05:00
Albert (AJ) St. Aubin
f9ded880ee Merge pull request #17654 from edx/aj/LEARNER-4484 
correct check for enrollment
 2018-03-09 12:14:03 -05:00
Awais Jibran
5eb176039c Do not show Currencies: usd in bulk email task history Sent To: 
This is a bad course team experience that when they send email to Audit track learners, `send to` includes currency (usd) which is set default. This PR fixes the bug and will not include currency with `audit` or `honor` enrollment tracks.
EDUCATOR-2489
 2018-03-09 21:06:50 +05:00
Eric Fischer
4ce21c328c make use of to_locale in studiofrontend templating 2018-03-09 10:01:57 -05:00
Albert St. Aubin
bd9fedb27b corrected another enrollment edge case 2018-03-09 09:48:33 -05:00
Albert St. Aubin
f81f74514a Updates to filter out Entitlements by Site 
[LEARNER-4228]
 2018-03-09 06:58:57 -05:00
Diana Huang
4dd164de91 Add new waffle flag for toggling GDPR work. 2018-03-08 14:52:33 -05:00
Albert St. Aubin
7acff0a39e correct check for enrollment on an entitlement 
[LEARNER-4484]
 2018-03-08 14:20:02 -05:00
Michael LoTurco
0d07a89b78 Merge pull request #17583 from edx/MLoTurco/learner-3925-feature-client-api 
Add Client API

Learner-3925
Learner-4388
 2018-03-08 14:17:14 -05:00
Farhanah Sheets
b6469642fd Merge pull request #17599 from edx/fsheets/EDUCATOR-2324 
Clean up old Studio Assets Page
 2018-03-08 14:06:02 -05:00
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
Michael LoTurco
a117f6fa42 Add client api for entitlement support page 
Learner-3925
Learner-4388
 2018-03-08 12:46:00 -05:00
Farhanah Sheets
8dd967448f Remove old assets page from mako template, tests, & config model references 2018-03-08 12:05:08 -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