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

288 Commits

Author SHA1 Message Date
Alex Dusenbery
7e51f02884 Get edx-platform working with external completion lib, add integration tests. 2018-02-14 15:54:27 -05:00
Simon Chen
db81dfa424 Surface vertical units in the course outline 2018-02-12 14:27:52 -05:00
Diana Huang
eab84c9a0f Use the same ordering for LA dashboard as progress page. 2018-02-12 10:18:07 -05:00
Jae Bradley
a19bc8c30d Merge pull request #17408 from edx/LEARNER-3926-portfolio-project-test-upsell 
LEARNER-3926 Portfolio Project Test Upsell Modal
 2018-02-07 14:57:08 -05:00
jaebradley
345302c7dc portfolio project readme 2018-02-07 08:45:41 -05:00
jaebradley
47b36c6acd implement portfolio project test upsell modal 
update styles

html updates

add waffle flags

fix waffle flags
 2018-02-07 07:41:33 -05:00
Diana Huang
363249908a Merge pull request #17419 from edx/diana/new-portfolio-page 
Force bootstrap on for this page.
 2018-02-06 16:43:05 -05:00
Diana Huang
e2d8e751a0 Force bootstrap on for this page. 2018-02-06 14:30:57 -05:00
Jeremy Bowman
9682e00f4c PLAT-1943 Fix more naive datetime warnings 2018-02-05 17:58:35 -05:00
Gregory Martin
ae56b5a9c9 Update query for flag. 2018-02-05 14:32:26 -05:00
Diana Huang
124e4c2ca1 Create new djangoapp and a new blank tab view. 2018-02-05 11:35:42 -05:00
Bill DeRusha
f4a5a68568 Merge pull request #17379 from proversity-org/proversity/edx-pr-fix-layout-in-learner-profile 
Fix layout in learner profile
 2018-02-05 09:02:56 -05:00
Jose Antonio Gonzalez
356734715b fix layout in learner profile 2018-02-03 21:24:58 +02:00
Gregory Martin
a79f899b4b Update resume button functionality 2018-02-01 22:26:46 -05:00
Bill DeRusha
2eff15b22f Revert "Fix layout in learner profile" 2018-01-31 11:16:40 -05:00
Bill DeRusha
fd8cd2ffbe Merge pull request #17348 from proversity-org/proversity/edx-pr-fix-layout-in-learner-profile 
Fix layout in learner profile
 2018-01-31 09:21:06 -05:00
Robert Raposa
d6c15ffdbf Add new waffle for modals. 2018-01-30 15:27:12 -05:00
jaebradley
070b6ce414 more complete catch 2018-01-30 13:57:54 -05:00
Jose Antonio Gonzalez
238e2f6b47 fix layout in learner profile 2018-01-30 16:42:02 +02:00
Troy Sankey
381af53ad5 Merge pull request #17130 from edx/jeskew/fix_lms_shard_4_tests_django_111 
LMS shard 4 tests Django 1.11
 2018-01-29 14:14:22 -05:00
Robert Raposa
c776b0d7ae Fix title to My Stats with lock. 2018-01-26 16:06:13 -05:00
Robert Raposa
59336cc58a Drop due date section of Learner Analytics and fix grading section. 2018-01-26 13:03:50 -05:00
Qubad786
64555c60c0 Move request_cache to openedx.core.djangoapps 2018-01-26 15:09:25 +05:00
John Eskew
875a127f84 Pylint fixes to move number below allowed threshold. 2018-01-25 11:38:37 -05:00
Harry Rein
2935578b9a Merge pull request #17294 from edx/HarryRein/a11y-footer-upgrade-div 
Ensuring div and not button inside link tag for a11y.
 2018-01-24 11:18:04 -05:00
Harry Rein
98b8eaf27e Ensuring div and not button inside link tag for a11y. 2018-01-24 10:01:50 -05:00
jaebradley
5ab2533b1e add try/catch for analytics api calls 
add comment

update jsx comment

simplify try block and update comment

fix comment
 2018-01-23 11:10:04 -05:00
jaebradley
d52aa8c6ec add grade information 
remove console

remove whitespace

update logic

remove console statement
 2018-01-23 08:41:12 -05:00
Matthew Piatetsky
e17527c570 Merge pull request #17280 from edx/add_price_url_to_context 
Add price and url to context
 2018-01-22 17:01:08 -05:00
Matthew Piatetsky
ca8a1fcb29 Add price and url to context 2018-01-22 15:46:52 -05:00
Harry Rein
9dab9d2c20 a11y issues on upgrade footer. 
LEARNER-3055
 2018-01-22 13:14:47 -05:00
Nimisha Asthagiri
2e9efe6472 Fix Certificates import and signals code 2018-01-19 15:12:28 -05:00
Bill Filler
733c275db0 Merge pull request #17083 from edx/bfiller/gated-content-combined 
Conditionally display gated content in outline and courseware
 2018-01-19 12:41:11 -05:00
Bill Filler
4fe5f3457d Conditionally display gated content in courseware 
Display gated sections in course outline, navigation and in the course
when user has met prerequiste condition.

WL-1273, WL-1317
 2018-01-18 12:34:19 -05:00
Robert Raposa
121a2dda9e Enable Learner Analytics for staff users. 
LEARNER-3905
 2018-01-18 10:22:42 -05:00
Robert Raposa
2a38e25601 Merge pull request #17221 from edx/robrap/LEARNER-3881-LA-for-verified-only 
LEARNER-3881: Disable Learner Analytics for non-verified users.
 2018-01-17 15:11:50 -05:00
Robert Raposa
740be6b304 Disable Learner Analytics for non-verified users. 2018-01-17 13:59:28 -05:00
jaebradley
3218f64326 implement upsell modal 
update css

updated css

make modal experimental

add waffle flag
 2018-01-17 11:26:57 -05:00
Saleem Latif
2ae02a6559 Update Registration/Signin Page to include static message 2018-01-17 13:07:27 +05:00
Diana Huang
7af52bf125 Add Learner Analytics dashboard. 
Add the back-end and front-end React app for Learner Analytics.
This was mostly authored by @AlasdairSwan and @dianakhuang.

LEARNER-3376
 2018-01-16 11:57:12 -05:00
Michael Youngstrom
fb387c9633 Revert "jaebradley/learner 3600 upsell modal" 2018-01-12 14:48:00 -05:00
Robert Raposa
3afa83c0c4 Merge pull request #15598 from edx/andya/developer-doc-cleanups 
Improve documentation for the Open edX features
 2018-01-12 13:40:08 -05:00
Andy Armstrong
7c09ebb794 Improve documentation for the Open edX features 2018-01-12 10:52:07 -05:00
Jae Bradley
725d354463 Merge pull request #17128 from edx/jaebradley/LEARNER-3600-Upsell-Modal 
jaebradley/learner 3600 upsell modal
 2018-01-12 09:57:09 -05:00
jaebradley
4573b63018 implement modal and carousel 
wip

upsell modal css

remove unnecessary newline

accidentally removed feature

update props

update modal component

update css

add additional slides

update styling

update copy
 2018-01-12 01:35:15 -05:00
Nimisha Asthagiri
bb738571ce Merge pull request #17093 from edx/arch/django-app-plugin 
Django App Plugins
 2018-01-11 15:49:45 -05:00
Jeremy Bowman
4026c25f7a Merge pull request #17133 from edx/jmbowman/PLAT-1873_2 
PLAT-1873 to_deprecated_string() cleanup part 2
 2018-01-10 13:45:15 -05:00
Matthew Piatetsky
222b356900 Fix course upsell styling when bootstrap is enabled 2018-01-09 16:09:26 -05:00
zubair-arbi
0b13d25b08 ENT-768 Display friendly error message for third party auth error 2018-01-09 16:57:14 +05:00
Nimisha Asthagiri
a37d09aefb Move PluginManager out of api folder 2018-01-08 19:15:23 -05:00