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

45395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael LoTurco
9c885ea9f8 Merge pull request #17658 from edx/MLoTurco/learner-3925-search 
Add Search component to entitlement support app
 2018-03-13 12:21:29 -04:00
Albert (AJ) St. Aubin
24d8b04df9 Merge pull request #17683 from edx/aj/LEARNER-4228_bug 
Updates to still retrieve the course Key when sessions are not available
 2018-03-13 11:58:36 -04:00
Michael LoTurco
3e94c7573b Add Store and Search Component 
Add search component to entitlement support app,
requires the addition of a Provider and store to
the EntitlementSupportPage componenet and wraps search
in a Main component to contain additional pieces of the
page as added

Learner-3925
 2018-03-13 11:03:18 -04:00
Albert St. Aubin
3d1ae114be Updates to still retrieve the course Key when sessions are not available 
[LEARNER-4228]
 2018-03-13 11:00:32 -04:00
Waheed Ahmed
bc7f37b1d3 Merge pull request #17622 from edx/waheed/LEARNER-4167-return-hls-in-encoded-videos 
Enable HLS video encodings for mobile.
 2018-03-13 15:37:21 +05:00
Jae Bradley
0945264866 Merge pull request #17676 from edx/update-eslint-config-edx-to-3.0.1 
Update eslint config edx to 3.0.1
 2018-03-12 19:40:39 -04:00
Jeff LaJoie
971126aa27 Merge pull request #17661 from edx/jlajoie/LEARNER-4423 
LEARNER-4423: Adds in PCI compliance checks for complexity
 2018-03-12 16:22:56 -04:00
jaebradley
19bef01b69 update eslint config edx to 3.0.1 
update eslint violations
 2018-03-12 16:17:27 -04:00
Farhanah Sheets
d835bec3a1 Merge pull request #17629 from edx/fsheets/EDUCATOR-2324-part2 
Removal of Config Model for old Studio Assets Page
 2018-03-12 15:49:30 -04:00
Jeff LaJoie
b289bb90b5 LEARNER-4423: Adds in PCI compliance checks for alphabetic and numeric characters 2018-03-12 15:14:41 -04:00
Farhanah Sheets
34a96fb58d Remove NewAssets config model & create migration file 2018-03-12 13:21:16 -04:00
Michael LoTurco
d4df1ad75a Merge pull request #17582 from edx/MLoTurco/learner-3925-feature-view-and-template 
Add EntitlementSupportView, Template, and base react element
 2018-03-12 11:00:42 -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
Waheed Ahmed
c362ff9847 Enable HLS video encodings for mobile. 
Return HLS video encodings from blocks api for mobile.

LEARNER-4167
 2018-03-12 11:24:14 +05:00
edX Transifex Bot
55aca51218 Update translations 2018-03-11 17:38:27 -04:00
Michael LoTurco
3b928e3e99 Adds EntitlementSupportView, Template, and base react element 2018-03-09 14:01:12 -05: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