Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
32,607 Commits 1 Branch 0 Tags
3849a8fa81663bccd38065ff521364956a5bc779
Commit Graph

4739 Commits

Author SHA1 Message Date
Calen Pennington
7c62d09eba Merge pull request #8930 from ubc/wmono/lti-sso 
Feature: LTI third-party-auth providers
 2015-09-04 10:40:55 -04:00
Matt Drayer
9cc1859eed Merge pull request #9596 from edx/ziafazal/MAYN-118 
MAYN-118: load header extra file
 2015-09-04 10:37:35 -04:00
Peter Pinch
70d3868b81 Merge pull request #9475 from mitocw/fix/aq/email_ccx_non_members 
Fixed CCX display name issue in enrollment/unenrollment email templates for non EDX members
 2015-09-04 10:00:28 -04:00
Zia Fazal
6e0ef385a2 load header extra file if request comes from micro site 
use blank header_extra template instead of if statement
 2015-09-04 11:24:06 +05:00
William Ono
4d1194800e Support LTI third-party-auth providers 
PR #8930
 2015-09-03 22:53:45 -07:00
Muhammad Shoaib
3bbd021a73 MAYN-122 
added the scrolling for the registration_code_generation modal dialog box.
 2015-09-03 18:12:51 +05:00
Andy Armstrong
4be74937df Add searching to the teams view 
TNL-1935
 2015-09-02 12:26:07 -04:00
Matt Drayer
49158fe0c9 Merge pull request #9535 from edx/ziafazal/MAYN-119 
MAYN-119: Hide shopping Cart menu
 2015-09-02 10:05:47 -04:00
Zia Fazal
4b4ca54674 Hide shopping Cart menu 
Shopping Cart menu should not be visible in case of while label site.

added tests
 2015-09-02 14:55:34 +05:00
Amir Qayyum Khan
e15732114d Fixed CCX display name issue in enrollment/unenrollment email templates for non EDX members 2015-09-01 13:22:50 +05:00
frances botsford
072a66e196 Merge pull request #9468 from edx/frances/teams-padding-responsive-followup 
updated responsive body class to .is-view-in-course
 2015-08-31 21:52:01 -04:00
Sarina Canelake
25169ccc4d Merge pull request #9147 from open-craft/OC-791-answer-export 
Move problem responses export from legacy instructor dash to new instructor dash
 2015-08-31 15:12:55 -04:00
Frances Botsford
44d3cb444f updated responsive body class to .is-view-in-course 2015-08-31 14:41:46 -04:00
clrux
5b545c2b0d Revert "Course navigation menu accessibility issue" 2015-08-28 13:28:08 -04:00
clrux
52a8bc50cb Merge pull request #9367 from edx/clrux/ac-76-course-nav 
Course navigation menu accessibility issue
 2015-08-28 13:27:44 -04:00
chrisndodge
69ddbc0dc4 Merge pull request #9370 from edx/cdodge/add-course-id-to-survey-answers 
add the ability to persist the course_key where the user answered the…
 2015-08-28 13:03:58 -04:00
Chris Rodriguez
c20075e8a6 Changing all #accordion for .accordion 2015-08-28 07:50:34 -04:00
Chris Rodriguez
917947d809 Markup and style tweaks to address test reqs 2015-08-28 07:50:34 -04:00
Chris Rodriguez
c0bfdf5e5d Removing instances of old mechanism; tests 2015-08-28 07:50:33 -04:00
Chris Rodriguez
07ca51c3f5 Accordion HTML cleanup, removing old markup 2015-08-28 07:50:33 -04:00
Chris Rodriguez
04ff637016 PR feedback on JS 2015-08-28 07:50:33 -04:00
Chris Rodriguez
a31eb4a815 Jasmine tests 2015-08-28 07:50:32 -04:00
Chris Rodriguez
888030c639 Removing coffeescript and adding custom JS 2015-08-28 07:49:32 -04:00
Chris Rodriguez
4185c11b31 Updating markup and styles 2015-08-28 07:49:31 -04:00
Ahsan Ulhaq
b32d2205d4 Course navigation menu accessibility issue 
Following have been done
1- Change the structure of the course navigation Menu HTML
2- Add some basic styling
3- Add basic JS for html rendering
4- Update tests according to new structure

AC-76
 2015-08-28 07:49:31 -04:00
Muzaffar yousaf
3eaf29fabe Merge pull request #9343 from edx/muzaffar/tnl1930-teams-accessibility 
Muzaffar/tnl1930 teams accessibility
 2015-08-27 22:50:36 +05:00
muzaffaryousaf
76f3ca8655 Accessibility fixes for team profile page. 
TNL-1930
 2015-08-27 22:02:29 +05:00
Muhammad Ammar
d38da773ea Merge pull request #9265 from edx/ammar/use-studio-confirmation-dialog-in-lms 
Confirm when leaving team
 2015-08-27 17:26:07 +05:00
David Ormsbee
ff62a8eaaa Merge branch 'release' into release-2015-08-26-conflict 2015-08-26 14:28:35 -04:00
muhammad-ammar
6134e8b5ed Move studio dialog code into common 2015-08-26 20:26:27 +05:00
Omar Al-Ithawi
e57d8a732c RTL next and prev. arrows in sequence module navigation 2015-08-25 12:37:18 +03:00
unknown
88a038aa1e Fixed email parm function for CCX email 
modified:   lms/djangoapps/instructor/tests/test_enrollment.py
 2015-08-24 20:34:11 +05:00
Chris Dodge
d3c08f89ed add the ability to persist the course_key where the user answered the survey 2015-08-21 13:40:57 -04:00
tasawernawaz
68da716d3d Merge pull request #9399 from edx/tasawer/bugfix/ecom-1932-Upgrade-page-not-displaying-in-French 
Fixing issue for french language
 2015-08-21 11:24:09 +05:00
Alison Hodges
1e374f4d4e Merge pull request #9382 from edx/ahodges/comments_on_roles 
Adds a comment to reduce confusion over remaining role name differences
 2015-08-20 20:18:04 -04:00
Alison Hodges
3547821b1a Adds a comment to reduce confusion over remaining role name differences 2015-08-20 16:09:35 -04:00
zubair-arbi
ec28a75f14 In-course reverification access control 
* Automatically create user partitions on course publish for each ICRV checkpoint.
* Disable partitions for ICRV checkpoints that have been deleted.
* Skip partitions that have been disabled when checking access.
* Add verification access control UI to visibility settings.
* Add verification access control UI to sequential and vertical settings.
* Add partition scheme for verification partition groups.
* Cache information used by verification partition scheme and invalidate the cache on update.
* Add location parameter to UserPartition so the partition scheme can find the associated checkpoint.
* Refactor GroupConfiguration to allow multiple user partitions.
* Add special messaging to ICRV for students in the honor track.

Authors: Zubair Arbi, Awais Qureshi, Aamir Khan, Will Daly
 2015-08-20 08:43:55 -07:00
Tasawer
ad77bc51ec Fixing issue for french language 
ECOM-1932
 2015-08-20 17:49:52 +05:00
tasawernawaz
74c7c2ad77 Merge pull request #9392 from edx/tasawer/bugfix/ecom-1996-hiding-find-course-button-on-edge 
Hiding find courses button from dashboard of edge.edx.org
FYI @wedaly
 2015-08-20 14:13:10 +05:00
Tasawer
46f2adf68c Hiding find courses button from dashboard of edge.edx.org 
ECOM-1996
 2015-08-20 11:45:34 +05:00
Ahsan Ulhaq
a495847b45 Merge pull request #9373 from edx/ahsan/ECOM-2114-Add-USD-to-prices-on-track-selection-pages 
Add USD labels to prices on track selection pages
 2015-08-20 00:37:27 +05:00
Ahsan Ulhaq
3d62580fc2 Add USD labels to prices on track selection pages 
ECOM-2114
 2015-08-19 23:59:15 +05:00
Chris Dodge
c08fbd1406 only include JS when feature flag is on and the course has proctoring enabled 2015-08-19 11:07:14 -04:00
Awais
4ca44effec Change default donation amount to $10. 
ECOM-2113
 2015-08-19 12:52:45 +05:00
David Baumgold
2aa7e266cf Clean up the Django ORM usage a bit 2015-08-18 15:44:26 -04:00
Ahsan Ulhaq
722c5bb90d Style issues on the credit status in the dashboard 
ECOM-2117
 2015-08-18 17:42:03 +05:00
Tim Krones
df5b2dadda Move functionality for exporting a CSV of all student answers to a given 
problem from legacy instructor dash to new instructor dash.
 2015-08-17 22:32:49 +02:00
Mark Sadecki
19604a4a6e Merge pull request #9038 from mitocw/fix/aq/extended_labels_issues_ccx 
Fixed explicit label issues related to CCX accessibility
 2015-08-17 14:31:38 -04:00
Renzo Lucioni
8b704cc2ec Merge pull request #9351 from edx/release 
Release
 2015-08-17 13:17:55 -04:00
Sarina Canelake
5481a6a1a8 Merge pull request #9146 from open-craft/OC-791-course-timeline 
Instructor Dashboard: Display info about course timeline
 2015-08-17 13:10:57 -04:00