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

45192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ayub-khan
4e27f55f35 updated translations 2018-02-22 12:38:49 +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
Bill DeRusha
79acf36881 Merge pull request #17462 from proversity-org/proversity/edx-pr-add-context-to-enroll 
Add context to 'enroll' word
 2018-02-21 16:48:08 -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
Sofiya Semenova
46fbffb0f2 Merge pull request #17484 from edx/sofiya/educator-2203 
Add visual progress checkmarks to course outline
 2018-02-21 15:50:42 -05:00
David Ormsbee
6ba6b7fc46 Merge pull request #17495 from edx/ormsbee/bootstrap_themeing 
First pass at adding styling docs
 2018-02-21 14:15:38 -05:00
Sofiya Semenova
f4ec7cca5f Add visual progress checkmarks to course outline 2018-02-21 12:53:43 -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
Awais Jibran
eb6064e333 Merge pull request #17517 from edx/aj/fix-discussion-submit-button 
fix discussion submit button
 2018-02-21 21:28:48 +05:00
David Ormsbee
e9d77db841 Adding Sass/CSS overview from wiki. 
Covers some of the basics of how our Sass is compiled in edx-platform.
 2018-02-21 11:27:11 -05:00
Awais Jibran
56364ec41b Merge pull request #17512 from edx/aj/discussion-topic-css-issue 
fix-topic-select-wdith
 2018-02-21 21:17:19 +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
cb5ae11b13 Move pattern-replacement file lists into a separate file 2018-02-21 10:52:43 -05:00
Awais Jibran
2bb56a232f fix discussion submit button 2018-02-21 20:36:50 +05:00
Calen Pennington
a352fc47e3 Fix all text!*.underscore import issues in webpack 2018-02-21 10:29:42 -05:00
Calen Pennington
c906c186ce Move the context course and sock into require_page compatible forms 2018-02-21 10:29:41 -05:00
Calen Pennington
569066edf5 Convert cms/static/js/factories/asset_index.js to be bundled using webpack 2018-02-21 10:29:41 -05:00
Awais Jibran
12f0e475c4 fix-topic-select-with 2018-02-21 16:13:02 +05:00
McKenzie Welter
95a4caa02a Merge pull request #17511 from edx/McKenzieW/learner-3918-fix 
don't link to API endpoint from support page
 2018-02-20 16:47:56 -05:00
Ned Batchelder
59ba4a51b5 Merge pull request #17502 from stvstnfrd/up/loosen-contentstore-test 
Loosen login lockout text check
 2018-02-20 16:42:03 -05:00
Ned Batchelder
85a7c9bc13 Merge pull request #17487 from open-craft/jill/update-django-storage-swift 
Update to django-storage-swift v1.2.18
 2018-02-20 16:39:56 -05:00
McKenzie Welter
3e675c36eb don't link to API endpoint from support page 2018-02-20 15:46:55 -05:00
Brian Beggs
de68a01627 Merge pull request #17469 from mitodl/pdpinch/bump-edx-sga 
bump edx-sga to 0.8.0
 2018-02-20 15:46:54 -05:00
Sofiya Semenova
4a6109891d Merge pull request #17470 from edx/sofiya/2095-2 
Auto-open course outline to last viewed block
 2018-02-20 15:20:14 -05:00
Alex Dusenbery
919355cab1 Revert "Track viewing of individual blocks." 
This reverts commit 4946b6b296.
 2018-02-20 14:42:28 -05:00
McKenzie Welter
9cf7f45099 Merge pull request #17468 from edx/McKenzieW/learner-3918 
Add Support endpoint for Course Entitlements
 2018-02-20 14:29:12 -05:00
Michael LoTurco
449c6903a6 Add Support endpoint for Course Entitlements 2018-02-20 13:20:47 -05:00
Matt Tuchfarber
f1694661e8 Merge pull request #16683 from edx/tuchfarber/add_intructor_bio_program_marketing 
Add intructor bio program marketing
 2018-02-20 12:23:17 -05:00
Sofiya Semenova
7c1c5af763 Auto-open course outline to last viewed block 2018-02-20 12:10:26 -05:00
Waheed Ahmed
72903b8022 Merge pull request #17496 from edx/waheed/LEARNER-4177-assign-new-sailthru-var-upon-signup 
Assign new sailthru var upon signup.
 2018-02-19 12:50:39 +05:00
M. Rehan
4403b4b633 Merge pull request #17474 from edx/mrehan/refactor-val-api-utils 
Integrate with the updated VAL api utils.
 2018-02-19 03:31:07 +05:00
Matthew Piatetsky
70ec5e47c6 limit bundling code to users with less than 4 enrollments 2018-02-16 14:24:23 -05:00
stv
7a0baa5578 Loosen login lockout text check 
On our fork at Stanford, we override the template for the login lockout
to provide additional information. This means that the second sentence
here, `Try again later.` does not immediately follow the first in our
rendering. As a result, this test fails for us.

Instead, by checking for the most important part of the message
(the first sentence), we're able to ensure that:
- the user is still locked out
- the lockout message is shown on the template
- the test does not fail unnecessarily
 2018-02-16 10:34:56 -08:00
Waheed Ahmed
07a0aac814 Assign new sailthru var upon signup. 
In SailThru, randomly set a var value of 0-9 on each user upon signup.

LEARNER-4177
 2018-02-16 19:20:37 +05:00
Qubad786
eb5867199b bump edxval version. 2018-02-16 19:09:07 +05:00
Qubad786
c90aa33cb8 Integrate with the updated VAL api utils. 2018-02-16 19:06:44 +05:00
hamzamunir7300
15e07d7cc5 Merge pull request #16997 from edx/LEARNER-3131/bootstrap_footer_design_fixes 
Footer Bootstrap new design fixes WIP
 2018-02-16 15:48:57 +05:00
Hamza Munir
a5e0989021 Footer Bootstrap new design fixes WIP 
Fixes for new design as per instruction in this ticket.

LEARNER-3131
 2018-02-16 13:12:11 +05:00
Matt Tuchfarber
a20e797f94 Fix Stylelint errors 2018-02-15 15:34:46 -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
17ddd07838 Merge pull request #17417 from edx/thallada/sfe-dist-1.0.0 
Upgrade SFE, use built files, and allow development via SFE docker container
 2018-02-15 14:15:27 -05:00
Tyler Hallada
400c81d4b8 Fix pylint error 2018-02-15 13:20:20 -05:00
Tyler Hallada
17ff3889eb Upgrade SFE to 1.2.5 2018-02-15 13:20:20 -05:00
Tyler Hallada
4a6d8f78f0 Fix borked rebase conflict resolution 2018-02-15 13:20:20 -05:00
Tyler Hallada
a26492922d Upgrade SFE to 1.2.4 2018-02-15 13:20:20 -05:00
Tyler Hallada
1865cb933b Upgrade SFE to 1.2.3 2018-02-15 13:20:20 -05:00
Tyler Hallada
06dfd98233 Upgrade SFE to 1.2.2 2018-02-15 13:20:20 -05:00
Tyler Hallada
6707f8d428 Add class=SFE to AccessibilityPage root div 2018-02-15 13:20:19 -05:00
Tyler Hallada
682365a1dd Remove loading spinner in new assets page 2018-02-15 13:20:19 -05:00