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

45731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Babey
1c7720a561 Bump drf-extensions for pagination move 2018-02-23 14:20:00 -05:00
Feanil Patel
c0b5916804 Update setup.py for calc module. 
We've been running with pyparsing 2.2.0 in production this whole time
so I'm pretty sure we can depend on this.
 2018-02-23 14:02:54 -05:00
John Eskew
b292bb43eb Merge pull request #17446 from mitodl/upstream/fix_error_page_themes 
Fixed unthemed error pages in Studio and LMS
 2018-02-23 13:25:08 -05:00
Feanil Patel
a182e50c4b Merge pull request #17536 from edx/feanil/reduce_requirements_complexity 
Reduce requirements complexity.
 2018-02-23 13:12:25 -05:00
Bill DeRusha
4fba472139 Discssions as a plugin 2018-02-23 09:23:53 -05:00
Albert (AJ) St. Aubin
312a9ec160 Merge pull request #17533 from edx/aj/LEARNER-3898 
Added entitlement redeemability method to the check for fulfillable
 2018-02-23 07:44:46 -05:00
hamzamunir7300
9d8c1a266f Merge pull request #17528 from edx/LEARNER-4230 
Incorrect position of the label "Receive course emails"
 2018-02-23 15:34:16 +05:00
Ahsan Ul Haq
3b8d41861f Merge pull request #17508 from edx/ahsan/LEARNER-3729-program-certificate-shareable 
Make sure user is login in credential when redirected from lms
 2018-02-23 15:31:56 +05:00
Ahsan Ulhaq
5a67f50174 Make sure user is login in credential when redirected from lms 
LEARNER-3729
 2018-02-23 13:15:02 +05:00
Feanil Patel
3a4c36b4ef Remove requirements that should be a part of the venv definition. 2018-02-23 00:16:01 -05:00
Feanil Patel
d800ce5673 Move pyparsing to base.txt 
It's unclear why this is in pre.txt
 2018-02-22 23:34:21 -05:00
Feanil Patel
9514f9d3be With wheels this statement is no longer true. 2018-02-22 23:14:10 -05:00
edx-pipeline-bot
92ca38f489 Merge pull request #17535 from edx/release-mergeback-to-master 
Merge release back to master
 2018-02-22 18:32:36 -05:00
Gavin Sidebottom
67442c2641 Fixed unthemed error pages in Studio and LMS 2018-02-22 16:49:06 -05:00
Albert St. Aubin
8c5e37ba20 Added entitlement redeemability method to the check for fulfillable 
entitlements

[LEARNER-3898]
 2018-02-22 15:00:19 -05:00
Ned Batchelder
454db3e09f Merge pull request #17523 from edx/jcdyer-patch-1 
Pin regexes to the start of the matched strings.
 2018-02-22 14:17:45 -05:00
Calen Pennington
67177ac72d Revert "Merge pull request #17325 from cpennington/switch-asset-index-factory-to-webpack" 
This reverts commit 1c46bd89c3, reversing
changes made to eb6064e333.
 2018-02-22 14:12:32 -05:00
Dennis Jen
bcb8cfeffd Added waffle switch for files & uploads search UI 2018-02-22 11:54:53 -05:00
John Eskew
99f66a40b7 Merge pull request #17507 from open-craft/jill/studio-redirect-middleware 
Adds redirect middleware to Studio
 2018-02-22 11:29:52 -05:00
Dennis Jen
b9d6ead3a3 Merge pull request #17522 from edx/dsjen/rename-accessibility-switch 
Renamed contentstore waffle namespace to "studio"
 2018-02-22 11:10:57 -05:00
Matthew Piatetsky
518ab054b3 Merge pull request #17475 from edx/default_unified_course_tab_to_on 
LEARNER-3605: make unified_course_tab on by default
 2018-02-22 10:30:12 -05:00
Diana Huang
972af9ef56 Merge pull request #17520 from edx/diana/remove-flaky-test 
LEARNER-3605: Remove flaky studio test.
 2018-02-22 09:56:48 -05:00
Hamza Munir
74d3f8a0b8 Incorrect position of the label "Receive course emails" 
Needed to rearrange the label of the checkbox

LEARNER-4230
 2018-02-22 19:41:44 +05:00
Matthew Piatetsky
92c94008a2 Fix tests that expected unified_course_tab to be off 2018-02-22 08:45:25 -05:00
Matthew Piatetsky
4fdd15a2a2 make unified_course_tab on by default 2018-02-22 08:45:25 -05:00
Ayub khan
b0d7b04a5c Merge pull request #17526 from edx/update-translations-pull-22-feb 
updated translations
 2018-02-22 17:27:21 +05:00
ayub-khan
523be08e56 updated translations 2018-02-22 15:06:35 +05:00
Ayub khan
cbdd2ec079 Merge pull request #17524 from edx/update-translations-push-22-feb 
updated translations
 2018-02-22 14:16:24 +05:00
ayub-khan
4e27f55f35 updated translations 2018-02-22 12:38:49 +05:00
Tasawer Nawaz
b14bcafc62 fix css issues on oauth authorization page to make it responsive 
LEARNER-4068
 2018-02-22 12:35:59 +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
Dennis Jen
354abd09c8 Renamed contentstore waffle namespace to "studio" 2018-02-21 17:26:05 -05:00
Cliff Dyer
34e45b2af0 Pin regexes to the start of the matched strings. 2018-02-21 16:55:07 -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
Diana Huang
a634c076ba Remove flaky studio test. 2018-02-21 14:59:52 -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