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

35218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mushtaq Ali
7a9991e95c Studio homepage escaping 2016-02-18 21:10:21 +05:00
Muzaffar yousaf
a26d576458 Merge pull request #11499 from mehrozezahid/mehrozezahid/TNL-4096 
Added target='_blank' to both cohort external doc links.
 2016-02-11 12:46:32 +05:00
Renzo Lucioni
074b83ab8b Merge pull request #11511 from edx/renzo/programs-warning 
Address ProgramsApiConfig deprecation warning
 2016-02-10 16:59:51 -05:00
sanfordstudent
d5cee7b376 Merge pull request #11471 from edx/sstudent/MA-1881-null-translation-check 
ma-1881 handling empty translations and testing
 2016-02-10 16:59:09 -05:00
Christina Roberts
fb45a6f33d Merge pull request #11509 from edx/christina/course-global 
Ensure window.course is available before anyone accesses it.
 2016-02-10 16:55:56 -05:00
Clinton Blackburn
219b7f75cf Merge pull request #11432 from edx/clintonb/oauth-client-credentials 
Updated django-oauth2-provider
 2016-02-10 16:44:37 -05:00
cahrens
30c42e724d Ensure that window.course is avaiable before anyone accesses it. 
TNL-4106
 2016-02-10 15:59:45 -05:00
Renzo Lucioni
3809422798 Address ProgramsApiConfig deprecation warning 2016-02-10 15:58:15 -05:00
Sanford Student
24c4c8abed ma-1881 handling empty translations and testing 
using lists for json serializability, if that's a word
 2016-02-10 15:56:42 -05:00
Peter Fogg
5d0ed333a5 Merge pull request #11502 from edx/peter-fogg/audit-cert-cutoff-date 
Explicitly cut off cert eligibility.
 2016-02-10 15:41:16 -05:00
Clinton Blackburn
85591696d8 Merge pull request #11497 from openfun/openfun/fix_generate_course_structure 
Fix generate_course_structure command.
 2016-02-10 13:29:00 -05:00
Peter Fogg
2d028f8246 Add an explicit cutoff date for audit cert granting. 
The previous logic was a convoluted way of doing the same thing, and
has already led to one bug. Instead of hoping that the bugs are ironed
out now and that future devs maintain this logic properly, let's just
set a real cutoff date.
 2016-02-10 12:16:37 -05:00
Ned Batchelder
9fd6bef39f Merge pull request #11496 from open-craft/capa-explanation-i18n 
Make 'Explanation' CAPA header translatable.
 2016-02-10 11:13:40 -05:00
Awais Jibran
eb97c6cfb9 Merge pull request #11421 from edx/aj/ecom3612-beta-tester-self-paced-course-issue 
Fix Beta Testers access courseware in self-paced courses
 2016-02-10 21:02:22 +05:00
Braden MacDonald
ee99cf9c8d Merge pull request #11436 from open-craft/omar/saml-crawl-fix 
Return 404 response from third party auth login when SAML disabled
 2016-02-10 08:00:06 -08:00
Renzo Lucioni
2717f228f8 Merge pull request #11483 from edx/renzo/programs-task-fixes 
Fixes for program certificate generation
 2016-02-10 10:41:01 -05:00
Jesse Zoldak
7ccca469fc Merge pull request #11481 from edx/zoldak/remove-lettuce-homepage-test 
Convert homepage acceptance test to bok-choy
 2016-02-10 08:45:06 -05:00
Awais Jibran
dabda5bc75 Merge pull request #11375 from attiyaIshaque/ai/tnl3573-resetpassword-empty-page-fix 
Resetting password shows empty page.
 2016-02-10 18:39:21 +05:00
Asad Iqbal
64291d3c01 Merge pull request #11391 from edx/asadiqbal08/WL-272 
asadiqbal08/WL-272 - Studio Language Selection
 2016-02-10 18:30:29 +05:00
Jesse Zoldak
f0c54c15ee Convert homepage acceptance test to bok-choy 2016-02-10 06:32:38 -05:00
mehrozezahid
4ed9d0a44a Added target='_blank' to both href attributes 2016-02-10 14:49:44 +05:00
Matjaz Gregoric
d067429c40 Make 'Explanation' CAPA header translatable. 
CAPA <explanation> nodes get transformed into a HTML <div> block
that contains the word 'Explanation'.

This patch makes it translatable.
 2016-02-10 10:49:38 +01:00
Attiya Ishaque
a042cbc7f0 Resetting password shows empty page. 
TNL-3573
 2016-02-10 14:47:41 +05:00
Awais Jibran
5899be9207 Fix Beta Testers access courseware in self-paced courses 
ECOM-3612
 2016-02-10 14:47:03 +05:00
asadiqbal
64778cdf69 WL-272 2016-02-10 14:33:38 +05:00
Julien Paillé
ea2633d485 Fix generate_course_structure command. 2016-02-10 10:23:20 +01:00
Saleem Latif
ccbd88acc1 Merge pull request #11402 from edx/saleem-latif/WL-298 
WL-298: Create a theme named 'stanford-style' to be used by comprehensive theming
 2016-02-10 10:38:46 +05:00
Renzo Lucioni
23dc424ca6 Merge pull request #11488 from edx/renzo/remove-extra-p-tag 
Remove unnecessary p tag from XSeries dashboard message
 2016-02-09 22:49:26 -05:00
Nimisha Asthagiri
dced810138 Merge pull request #11489 from edx/release 
Hotfix for reducing mobile warnings in tracking logs
 2016-02-09 21:33:31 -05:00
David Ormsbee
35eb5a1629 Merge pull request #11413 from edx/ormsbee/course_image_cdn 
Allow course images to be served from the CDN.
 2016-02-09 17:42:41 -05:00
David Ormsbee
1a5b9172d8 Allow course images to be served from the CDN. 
Previously, course images on the student dashboard were always
served from the localhost, even if the CDN was enabled.
 2016-02-09 16:45:18 -05:00
John Eskew
3f58954f3a Merge pull request #11469 from edx/jeskew/fix_django_19_warnings 
Remove deprecation warnings from Django models.
 2016-02-09 16:38:23 -05:00
Renzo Lucioni
67f8b49056 Fixes for program certificate generation 
ECOM-3528
 2016-02-09 16:27:16 -05:00
Nimisha Asthagiri
a56692755e Merge pull request #11484 from edx/hotfix/2016-02-09 
Reduce mobile Warning errors in tracking logs
 2016-02-09 16:11:46 -05:00
Renzo Lucioni
cceeff3657 Remove unnecessary p tag from XSeries dashboard message 2016-02-09 16:05:06 -05:00
Nimisha Asthagiri
a5574792fb Fix mobile Warning errors in tracking logs. 2016-02-09 13:22:15 -05:00
Andy Armstrong
84773d2ff7 Merge pull request #11482 from edx/release 
Merge release back to master
 2016-02-09 12:49:41 -05:00
Andy Armstrong
caf4cfbd3a Merge pull request #11268 from edx/andya/add-pattern-library 
Add edX Pattern Library to edx-platform
 2016-02-09 12:07:03 -05:00
Ben Patterson
f12c415ed6 Merge pull request #11470 from edx/benp/remove-ruby-deps 
[S&B] Remove ruby dependencies.
 2016-02-09 10:56:21 -05:00
clrux
a5e34d4e12 Merge pull request #11105 from edx/clrux/ac-23 
Updating forum buttons and overall icon cleanup
 2016-02-09 10:53:31 -05:00
clrux
0b3f9ee5e8 Merge pull request #11457 from edx/clrux/ac-252 
LMS: updating response status messaging
 2016-02-09 10:22:18 -05:00
Andy Armstrong
b858644ca8 Merge pull request #11448 from edx/rc/2016-02-09 
Release Candidate rc/2016-02-09
 2016-02-09 10:18:29 -05:00
Chris Rodriguez
4454c819c8 LMS: forum markup tweaks and cleanup 2016-02-09 09:34:58 -05:00
John Eskew
bb5c28c0c5 Remove deprecation warnings from Django models. 
Add app_label definitions in Meta classes for models.
Move import of course_mode model into methods to prevent importing
the models at startup time.
 2016-02-09 09:28:43 -05:00
Jesse Zoldak
f8c66c1a16 Merge pull request #11463 from edx/zoldak/staff-debug-test 
Remove duplicate staff debug acceptance tests
 2016-02-09 09:24:19 -05:00
Jesse Zoldak
baf79e8b55 Merge pull request #11446 from jzoldak/zoldak/TE-1174 
Ignore venv directory when running jshint on circleci
 2016-02-09 09:21:32 -05:00
Chris Rodriguez
9e0497dfab Updating response status messaging 2016-02-09 08:16:20 -05:00
wajeeha-khalid
9d6df1e132 Merge pull request #11189 from edx/ekafeel/discussion-api-namespace-pagination 
Ekafeel/discussion api namespace pagination
 2016-02-09 17:42:48 +05:00
Ehtesham Kafeel
cf5dc1075f Merge pull request #11289 from edx/ekafeel/Deprecated-Advanced-Component-Types 
Ekafeel/deprecated advanced component types
 2016-02-09 15:07:59 +05:00
Omar Khan
ed2cba2e2d Keep SAML configuration check 2016-02-09 16:10:31 +07:00