Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,007 Commits 1 Branch 0 Tags
dc25ece02acccaeaf3c5d93b00f0b2b00567abd0
Commit Graph

13734 Commits

Author SHA1 Message Date
Renzo Lucioni
dc25ece02a Merge pull request #11879 from edx/schen/ECOM-3194 
ECOM-3194 Create the listing page of Programs (x-series) which learners have enrolled in
 2016-03-31 16:35:54 -04:00
Adam
d93e4c33a8 Merge pull request #12005 from edx/adam/max-from-address-no-translation 
make sure email from addresses don't exceed 320 characters (TNL-4264)
 2016-03-31 16:00:36 -04:00
Simon Chen
21be72048a Create the listing page of Programs (x-series) which learners have enrolled in 2016-03-31 15:35:50 -04:00
Eric Fischer
59ab5d2a62 Merge pull request #11886 from edx/efischer/make_edx_safe_again 
Verify student template safety
 2016-03-31 14:49:42 -04:00
Adam Palay
6e43d97fe7 make sure email from addresses don't exceed 320 characters (TNL-4264) 
clean up and fix quality violations

since get_course can never return None, we can remove these lines
 2016-03-31 14:23:08 -04:00
Ned Batchelder
259cbdd630 Merge pull request #11993 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-03-31 14:16:15 -04:00
Braden MacDonald
374ab7d1ec Merge pull request #11984 from open-craft/enable-azuread-default 
Enable Azure AD third party auth provider by default
 2016-03-31 08:52:09 -07:00
Simon Chen
cd737b6fcc Merge pull request #11992 from edx/schen/ECOM-3673 
ECOM-3673 Update the course end date description text to remove the reference to certificates
 2016-03-31 11:50:52 -04:00
Simon Chen
33fc268d21 ECOM-3673 Update the course end date description text to remove the reference to certificate when course enrollment is in audit mode 2016-03-31 10:47:31 -04:00
Diana Huang
ced32800a6 Add new djangoapp that allows for configuration of 
Verified Track Cohorts through the admin interface.
 2016-03-31 09:45:22 -04:00
Saleem Latif
7b549bc354 Merge pull request #11806 from edx/saleem-latif/WL-327 
WL-327: Add SiteConfiguration and SiteConfigurationHistory models to LMS
 2016-03-31 18:39:38 +05:00
Saleem Latif
d7f781db20 Add SiteConfiguration configuration model to LMS 2016-03-31 12:46:42 +05:00
attiyaIshaque
b912aa453f Merge pull request #11948 from edx/atiya/ECOM-3963-specific-student 
Fixed error on Course Home, when viewed as specific student.
 2016-03-31 10:48:43 +05:00
Clinton Blackburn
bc5e6c8da2 Merge pull request #11985 from edx/clintonb/course-api-pacing 
Added pacing field Course API
 2016-03-30 17:27:07 -04:00
Ned Batchelder
38a9ace7bf Update translations (autogenerated message) 2016-03-30 19:35:49 +00:00
jsa
52657af81d add edx-management-commands dependency. 2016-03-30 14:59:09 -04:00
Clinton Blackburn
1185fff1ec Added pacing field Course API 
ECOM-3994
 2016-03-30 14:36:43 -04:00
Eric Fischer
7077c933a4 Make verify_student templates safe 
Fixes safe_template_linter errors for everything under verify_student. Includes
fixes to Jasmine tests and usage of HtmlUtils functionality.
 2016-03-30 13:47:42 -04:00
Andy Armstrong
79f44357ab Merge pull request #11904 from edx/andya/static-html-utils 
Add static HtmlUtils/StringUtils into edx namespace
 2016-03-30 12:04:48 -04:00
Diana Huang
70145de7bb Merge pull request #11061 from CredoReference/impossible-to-click-check-without-answer 
PR-154 - Make it impossible to click "final check" without selecting a choice
 2016-03-30 11:33:11 -04:00
Cliff Dyer
2c7241a3ce Merge pull request #11883 from edx/cdyer/safe-marathon-1 
Added safety to lms/templates/student_account/account_settings.html
 2016-03-30 11:14:39 -04:00
Andy Armstrong
2a204f7ffa Add static HtmlUtils/StringUtils into edx namespace 
This is a temporary workaround for code that needs
access to these classes from the UI Toolkit but
without using RequireJS.
 2016-03-30 10:30:39 -04:00
Dmitry Viskov
4c83a2f0de Make it impossible to click "final check" without selecting a choice 2016-03-30 16:50:00 +03:00
Matt Drayer
db3b2f0c97 Merge pull request #11954 from edx/mattdrayer/theme-ecommerce-url 
mattdrayer/theme-ecommerce-url: Theme support for ECOMMERCE_PUBLIC_URL_ROOT
 2016-03-30 09:41:30 -04:00
Christina Roberts
a2faef242a Merge pull request #11926 from edx/christina/course-discovery-template 
Clean up escaping in course discovery templates.
 2016-03-30 09:37:45 -04:00
attiyaishaque
acc6d4f282 Fixed error on Course Home, when viewed as specific student. 2016-03-30 17:09:25 +05:00
Braden MacDonald
ee444ed67f Enable Azure AD third party auth provider by default 2016-03-29 15:24:00 -07:00
J. Cliff Dyer
32729eb838 Added safety to account_settings template 2016-03-29 19:37:15 +00:00
Nimisha Asthagiri
74a9989f04 Merge pull request #11705 from edx/tnl/next_button 
Activate LMS Navigation Button across sections
 2016-03-29 15:05:59 -04:00
cahrens
bdef3bed9f Fix escaping in course discovery templates. 2016-03-29 14:28:57 -04:00
Nimisha Asthagiri
2f037f04e9 seq_module.html XSS - Safe by default 2016-03-29 12:59:15 -04:00
Nimisha Asthagiri
2c90cac962 Accessible Sequence navigation 
MA-2190
 2016-03-29 12:59:05 -04:00
Nimisha Asthagiri
8cbf99aca4 Activate Next and Previous Buttons across sections 
MA-2152
MA-2153
 2016-03-29 12:58:08 -04:00
Nimisha Asthagiri
2fc9ffd51a Merge pull request #11929 from edx/nasthagiri/css-template2 
XSS Safe templates
 2016-03-29 11:50:38 -04:00
John Eskew
7e9a139d03 Merge pull request #11766 from CredoReference/too-many-mongo-queries-in-instructor-api-gradebook 
Reduce the number of queries to mongodb in /courses/<course-id>/instructor/api/gradebook API
 2016-03-29 10:27:02 -04:00
Christina Roberts
a8f274d542 Merge pull request #11970 from edx/christina/tnl-4284 
Delete out-of-date test.
 2016-03-29 10:13:50 -04:00
Renzo Lucioni
b1f3b7d10f Merge pull request #11971 from edx/renzo/bypass-home 
Add option to bypass course home
 2016-03-29 09:12:20 -04:00
Tasawer
05898df1c1 updated dashboard with providers text 
ECOM-2935
 2016-03-29 09:26:35 +00:00
Nimisha Asthagiri
9af1aa30a9 XSS Safe Templates 2016-03-29 02:46:25 -04:00
Brian Beggs
1dff9d45f3 Merge pull request #11787 from mitocw/enhancement/aq/add_master_course_staff_in_ccx_fix_migration_issue 
Adds staff and instructor users of the master course to CCX
 2016-03-28 18:49:46 -04:00
Renzo Lucioni
6f49579166 Add option to bypass course home 
Exposes an advanced setting in Studio allowing course teams to bypass the home tab when students arrive from the dashboard, sending them directly to course content. ECOM-3961.
 2016-03-28 17:49:55 -04:00
Christina Roberts
1fa1faeee5 Merge pull request #11903 from edx/christina/cohort-template-cleanup 
Perform escaping in the templates.
 2016-03-28 16:25:28 -04:00
Matt Drayer
ed0c26160b Merge pull request #11885 from edx/saleem-latif/WL-328 
WL-325: Multi-Site Comprehensive Theming
 2016-03-28 16:23:34 -04:00
cahrens
39dc8a5915 Perform esacaping in the templates. 
Use new best practices.
 2016-03-28 15:05:40 -04:00
Zia Fazal
a796b56314 saleem-latif/WL-328: Multi-Site Comprehensive Theming 
ziafazal: improvements need for multi-tenancy
ziafazal: fixed broken tests
ziafazal: no need to add setting in test.py
ziafazal: added hostname validation
ziafazal: changes after feedback from mattdrayer
ziafazal: fixed branding and microsite broken tests
ziafazal: make STATICFILES_DIRS to list
ziafazal: added theme directory to mako lookup for tests
ziafazal: added more protection in test_util
saleem-latif: Enable SCSS Overrides for Comprehensive Theming
saleem-latif: Incoporate feedback changes, Correct test failures, add tests and enable theming for django templates
saleem-latif: Correct errors in python tests
mattdrayer: Fix invalid release reference
mattdrayer: Update django-wiki reference to latest release
saleem-latif: Update Theme storages to work with Caching, Pipeline and collectstatic
saleem-latif: Incorporate feedback changes
mattdrayer: Pylint violation fix
mattdrayer: Fix broken pavelib test
 2016-03-28 14:57:01 -04:00
cahrens
db3596546e Delete out-of-date test. 
TNL-4284
 2016-03-28 14:53:38 -04:00
Peter Fogg
374e97c15f Admin access for API requests. 
ECOM-3943
 2016-03-28 11:42:42 -04:00
Amir Qayyum Khan
795ead82b5 Added master course staff and admins to ccx and fixed same issues related to ccx 2016-03-26 03:18:39 +05:00
Toby Lawrence
90f41ed2cb Merge pull request #11878 from edx/PERF-279 
Use a module/path mapping for RequireJS overrides instead of just paths.
 2016-03-25 14:45:07 -04:00
Matt Drayer
000ad0a326 mattdrayer/theme-ecommerce-url: Add theme support for ECOMMERCE_PUBLIC_URL_ROOT setting 2016-03-25 11:19:15 -04:00