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

35993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Diana Huang
1defe4c3a3 Merge pull request #11981 from edx/diana/track-configuration 
Verified track configuration
 2016-03-31 11:13:59 -04:00
Nimisha Asthagiri
133f0f790a Merge pull request #11997 from edx/tnl/update-name-to-subsection 
Rename Section to Subsection in a11y label
 2016-03-31 11:06:01 -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
Nimisha Asthagiri
3fedb4f057 Rename Section to Subsection in a11y label 2016-03-30 18:46:32 -04: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
Jim Abramson
2fe4df77d0 Merge pull request #11794 from edx/jsa/add-user-mgmt-commands 
add edx-management-commands dependency.
 2016-03-30 16:17:50 -04:00
Robert Raposa
62793ade7d Merge pull request #11979 from edx/robrap/linter 
TNL-4214/TNL-4287: Enhance safe template linter
 2016-03-30 15:13:31 -04: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
Robert Raposa
916723fcaa Enhance safe template linter 
- Check includes for Mako templates
- Check display_name_with_default_escaped uses
- Add exceptions for Underscore and <%=
- Skip templates that are Django and not Mako
- Add pragma to disable errors
- Enhance unit tests
- Remove violation mako-js-string-missing-quotes
- Refactor line processing into StringLines
 2016-03-30 14:16:51 -04:00
sanfordstudent
f730936d76 Merge pull request #11937 from edx/sstudent/MA-2164-followup 
followup to MA-2164, cleaning up unused steps
 2016-03-30 13:30:55 -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
sanfordstudent
fd37948726 Merge pull request #11989 from edx/release 
Release
 2016-03-30 11:22:23 -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
sanfordstudent
2e2687ba05 Merge pull request #11955 from edx/rc/2016-03-29 
Release Candidate rc/2016-03-29
 2016-03-30 09:29:07 -04:00
attiyaishaque
acc6d4f282 Fixed error on Course Home, when viewed as specific student. 2016-03-30 17:09:25 +05:00
Carol Tong
84e88ebaaa Merge pull request #11969 from edx/carol/DOC-2216 
DOC-2216: Modify message text when Adv Settings saved
 2016-03-29 17:11:55 -04:00
Carol Tong
9b128695d6 Merge pull request #11944 from edx/carol/DOC-2533 
DOC-2533: Update help text on Assignment Types page
 2016-03-29 16:33:47 -04:00
Carol Tong
a33e703910 Modify message text when Adv Settings saved 2016-03-29 16:12:00 -04:00
Carol Tong
4ab75c7c00 Update help text on Grading Assignment Types page 2016-03-29 15:39:24 -04: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
Christina Roberts
dab77fda41 Merge pull request #11976 from edx/christina/update-bok-choy 
Update Bok Choy to 0.5.1 release.
 2016-03-29 14:07:14 -04:00
Sanford Student
a8c77f8d78 followup to MA-2164, cleaning up unused steps 2016-03-29 13:46:52 -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
Calen Pennington
37813d1820 Merge pull request #11958 from cpennington/cale/xss 
Make (some) Mako templates HTML escaped by default
 2016-03-29 11:03:31 -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
cahrens
9dcbce2155 Update Bok Choy to 0.5.1 release. 2016-03-29 10:15:05 -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
David Ormsbee
5ccb1ea025 Merge pull request #11933 from Woutifier/master 
Added random seed to metadata that is sent to external grader
 2016-03-29 09:06:21 -04:00
Calen Pennington
683151a238 XSS escape cms/templates/course-create-rerun.html 2016-03-29 08:51:22 -04:00
Calen Pennington
b81a15d57f XSS escape cms/templates/course_outline.html 2016-03-29 08:51:22 -04:00
tasawernawaz
3e3f5361bc Merge pull request #11870 from edx/tasawer/story/ecom-2935-update-dashboard-for-multi-provider 
Updated dashboard with providers text
 2016-03-29 15:43:15 +05: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