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

17832 Commits

Author SHA1 Message Date
David Ormsbee
f5a4ad20aa Merge pull request #17451 from mitodl/fix_outline_aq_course_structure_api 
Fixed edX block structure api to load override data
 2018-02-28 09:39:09 -05:00
Bill DeRusha
071594392b Merge pull request #17384 from edx/bderusha/zendesk-plugin 
zendesk proxy plugin
 2018-02-26 17:06:56 -05:00
Bill DeRusha
44469a9ba4 Merge pull request #17386 from edx/bderusha/generic-zendesk 
Create generic support ticket interface (remove zendesk specific code)
 2018-02-26 15:21:37 -05:00
Bill DeRusha
9abec119fc Merge pull request #17503 from edx/bderusha/sp-cleanup 
Removed self-paced feature flag from code
 2018-02-26 14:42:53 -05:00
Bill DeRusha
9611284df0 zendesk proxy plugin 2018-02-26 14:20:32 -05:00
Bill DeRusha
d4b57bc218 Removed self-paced feature flag from code 2018-02-26 13:44:53 -05:00
Bill DeRusha
1aca252e19 Merge pull request #17383 from edx/bderusha/disc-plugin 
Convert discussion to plugin
 2018-02-26 13:18:10 -05:00
Daniel Clemente Laboreo
628892667b Add template block to allow redefining the details section in themes 2018-02-26 11:20:28 +02:00
George Babey
3e840ff268 Merge pull request #17497 from edx/gbabey/move_paginators 
Moved pagination to edx_rest_framework_extensions package
 2018-02-23 15:24:40 -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
Bill DeRusha
4fba472139 Discssions as a plugin 2018-02-23 09:23:53 -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
Gavin Sidebottom
67442c2641 Fixed unthemed error pages in Studio and LMS 2018-02-22 16:49:06 -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
ayub-khan
523be08e56 updated translations 2018-02-22 15:06:35 +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
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
Sofiya Semenova
f4ec7cca5f Add visual progress checkmarks to course outline 2018-02-21 12:53:43 -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
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
Awais Jibran
2bb56a232f fix discussion submit button 2018-02-21 20:36:50 +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
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
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
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
Bill DeRusha
8ea03ad9d2 Create generic support ticket interface (remove zendesk specific code) 2018-02-16 14:58:11 -05:00
George Babey
26bac9f611 Moved paginators to edx_rest_framework_extensions package 
Pagination should be standard and easy to adopt so moved the paginators
into the edx_rest_framework_extensions package so they can be easily
installed into other app/projects
 2018-02-16 09:46:01 -05: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
c90aa33cb8 Integrate with the updated VAL api utils. 2018-02-16 19:06:44 +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
Amir Qayyum Khan
aa6f88382d Fixed edX block structure api to load override data 2018-02-16 11:10:17 +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
e6da9a22db Migrate StatusBarAlert to pargaon static build 2018-02-15 13:20:18 -05:00
Matt Tuchfarber
6028cc7d72 Add instructor modal to program marketing page 
The Paragon+Bootstrap work wasn't ready yet, so this is using leanModal. This also cleans up some of the instructor formatting.
 2018-02-15 12:30:10 -05:00
Eric Fischer
fda5fa6d2b JAWS a11y fixes 2018-02-15 09:23:05 -05:00
Jillian Vogel
068a5d06eb Update to django-storage-swift v1.2.18 
and enable lazy connections by default.

cf https://github.com/dennisv/django-storage-swift/pull/97
 2018-02-15 20:38:18 +10:30
Alex Dusenbery
7e51f02884 Get edx-platform working with external completion lib, add integration tests. 2018-02-14 15:54:27 -05:00
ayub-khan
eae37a2b45 updated-translations 2018-02-14 13:21:04 +05:00
Sofiya Semenova
de8e256172 Merge pull request #17359 from edx/schen/EDUCATOR-2095 
Surface vertical units in the course outline
 2018-02-13 14:15:17 -05:00
Dennis Jen
20349e88bd Merge pull request #17160 from open-craft/tomaszgy/fix_layout_of_enrollment_in_ccx_dashboard 
Simplify layout of the Enrollment tab of CCX dashboard
 2018-02-13 09:39:58 -05:00