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

15756 Commits

Author SHA1 Message Date
Albert (AJ) St. Aubin
273ec926d3 Merge pull request #17744 from edx/aj/LEARNER-4494 
Updating the default long term expiration to be 730 days for entitlem…
 2018-03-22 11:57:02 -04:00
Alex Dusenbery
a996822094 Revert "Revert "Track viewing of individual blocks."" 
This reverts commit e2675f57b5f747b6a9e21067c75911fbd0341943.
 2018-03-22 10:37:40 -04:00
Bill Filler
305bd7dd4b Merge pull request #17650 from edx/ibrahimahmed443/WL-1473-add-fields-instructor-dashboard 
Ibrahimahmed443/wl 1473 add fields instructor dashboard
 2018-03-22 09:56:43 -04:00
Albert St. Aubin
7010eff423 Adding migration to update the expiration_period default 2018-03-21 17:09:03 -04:00
Albert (AJ) St. Aubin
9ac87b5ea3 Merge pull request #17741 from edx/aj/increase_enrollments_throttle 
LEARNER-4676: Increase the Throttle on the enrollments API to allow ecommerce to re…
 2018-03-21 16:22:47 -04:00
Albert St. Aubin
eeb97318b6 Updated tests to use new 24 months 2018-03-21 15:57:15 -04:00
Albert St. Aubin
7a02324bf1 Updating the default long term expiration to be 730 days for entitlements 
[LEARNER-4494]
 2018-03-21 15:45:38 -04:00
Albert St. Aubin
f2ee173aae Increase the Throttle on the enrollments API to allow ecommerce to request more frequently 
[LEARNER-4676]
 2018-03-21 14:14:52 -04:00
Michael Terry
a576d682ff Improve password complexity messaging 
Send password form instructions that include password complexity and
also send error messages back that include all parts of the
complexity instead of single parts at a time.

And clean up phrasing to be more consistent.
 2018-03-21 10:29:53 -04:00
attiyaishaque
1bca5bab10 Fix incorrect message feedback in discussion feature. 2018-03-21 14:13:08 +05:00
Troy Sankey
fdf8f0da46 Merge pull request #17735 from edx/pwnage101/maintenance-banner 
maintenance banner for 1.11 migration
 2018-03-20 19:00:18 -04:00
Troy Sankey
9afe485f44 add the maintenance banner to the student dashboard and course homepage 2018-03-20 17:55:31 -04:00
Eric Fischer
f1fa7b8e06 pass title/label to LTI consumers 2018-03-20 12:51:39 -04:00
Waheed Ahmed
d82aaa9892 Merge pull request #17706 from edx/waheed/LEARNER-4513-fix-none-type-entitlement-passing 
Fix None type entitlement passing.
 2018-03-16 18:50:44 +05:00
Michael Terry
a0c6f66252 Check policy during pw live validation 
The password live validation was not considering the full password
complexity settings. This branch hooks that up and refactors the
various ways to validate a password to all go through the same code
path.

LEARNER-4502
LEARNER-4504
 2018-03-16 09:23:43 -04:00
Waheed Ahmed
7128370666 Fix None type entitlement passing. 
LEARNER-4513
 2018-03-16 16:41:49 +05:00
Ibrahim
2bb790680a add role and expose reason field to Instructor Dashboard Manual Enrollment 
WL-1473
 2018-03-16 15:47:53 +05:00
Robert Raposa
0d60d85e2f Merge pull request #17688 from edx/robrap/update-waffle-docs 
Add docs for handling default values.
 2018-03-15 17:26:02 -04:00
Michael Roytman
7ae119562e Merge pull request #17695 from edx/mroytman/bump-studio-frontend-1.5.0 
bump studio-frontend package version to 1.5.0
 2018-03-15 12:51:17 -04:00
Muhammad Ammar
04bf165ec9 Merge pull request #17696 from edx/ammar/update-transcripts-util 
update get_transcript util
 2018-03-15 20:47:01 +05:00
Robert Raposa
a814c8d44c Removing flaky test test_can_add_remove_allowance. 
EDUCATOR-2514
 2018-03-15 11:46:55 -04:00
Alex Dusenbery
82d5bef4f6 EDUCATOR-1290 | Create a new random.Random instance when selecting from library content blocks. 2018-03-15 11:31:41 -04:00
Michael Roytman
ad90e60759 bump studio-frontend package version to 1.5.0 2018-03-15 10:08:43 -04:00
muhammad-ammar
f6315483cd update get_transcript util 2018-03-15 15:15:20 +05:00
edx-cache-uploader-bot
917bb7d20c Updating migrations 2018-03-14 12:50:06 -04:00
Tasawer Nawaz
8a0b2d2d45 Merge pull request #17680 from edx/tasawer/learner-4428/stop-using-single-basket-derecated-view 
stop using deprecated single item basket view
 2018-03-14 21:40:07 +05:00
Michael Terry
d40ce8c8d0 Use Levenshtein not nltk 2018-03-14 11:49:09 -04:00
Tasawer Nawaz
4912888168 stop using deprecated single item basket view 
LEARNER-4428
 2018-03-14 20:29:51 +05:00
Albert (AJ) St. Aubin
2335b57afc Merge pull request #17686 from edx/aj/LEARNER-4228_bug 
Uses the entitlements course run enrollment to get the course key when
 2018-03-14 10:59:43 -04:00
Michael Youngstrom
eea527e896 Merge pull request #17673 from edx/youngstrom/test-improvements 
Bokchoy test fixes for firefox upgrade
 2018-03-14 09:51:53 -04:00
Albert St. Aubin
85eb168a34 Uses the entitlements course run enrollment to get the course key when 
available

[LEARNER-4228]
 2018-03-14 09:09:12 -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
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
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
Stuart Young
53fe34615e Test fixes to prepare for firefox upgrade on jenkins 2018-03-12 15:40:25 -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
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
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
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
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
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
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
Tyler Hallada
395cdcceb5 Fix bok-choy tests 2018-03-08 12:49:14 -05:00
Farhanah Sheets
8dd967448f Remove old assets page from mako template, tests, & config model references 2018-03-08 12:05:08 -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
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