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

35199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Attiya Ishaque
a042cbc7f0 Resetting password shows empty page. 
TNL-3573
 2016-02-10 14:47:41 +05:00
asadiqbal
64778cdf69 WL-272 2016-02-10 14:33:38 +05: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
Omar Khan
9b7bb0dc20 Make SAMLAuthBackend._config a cached_property 
Cleaner, and keeps pylint happy
 2016-02-09 15:45:49 +07:00
Omar Khan
2c4e97ebfa Don't remove auth_url method 2016-02-09 15:45:21 +07:00
Omar Khan
78d4ed31a1 Revert "Keep SAML configuration check" 
This reverts commit a020464a41.
 2016-02-09 15:40:27 +07:00
Saleem Latif
c265dfbac4 Merge pull request #11390 from edx/saleem-latif/SOL-1529-translation-updates 
Going to merge, "Remove concatenation of i18n strings."
 2016-02-09 11:35:17 +05:00
Ben Patterson
ffa089a9c6 Remove ruby reference in pipeline arguments. 2016-02-08 18:18:37 -05:00
Ben Patterson
f1b366589b Remove ruby dependencies. 
Sass compilation is no longer dependent on Ruby, so we are
removing its dependencies.
 2016-02-08 17:02:55 -05:00
Ben Patterson
827dd1bdba Merge pull request #11456 from edx/benp/diff-cover-upgrade 
Upgrade diff-cover.
 2016-02-08 15:18:49 -05:00
Andy Armstrong
a27c702517 Merge pull request #11455 from edx/clrux/hotfix-rc-2016-02-09 
Hotfix: ac-201
 2016-02-08 14:35:56 -05:00
Julian Arni
5be4d4b561 Change link text to include researchers 2016-02-08 14:32:32 -05:00
Mark L. Chang
90f561beef simple readme 2016-02-08 14:32:32 -05:00
Julian Arni
06c562b554 Add Mark's index page 2016-02-08 14:32:32 -05:00
Julian Arni
8ac03abd24 Use docs.edx cname 2016-02-08 14:32:32 -05:00
Julian Arni
d4b3f1efd2 New index page for documentation 2016-02-08 14:32:32 -05:00
Julian Arni
4955d02135 Docs index page 2016-02-08 14:32:32 -05:00
Brian Wilson
9201699b89 update docs from master 2016-02-08 14:32:32 -05:00
Mark L. Chang
2e585470f1 added CNAME file as per https://help.github.com/articles/setting-up-a-custom-domain-with-pages 2016-02-08 14:32:32 -05:00
David Ormsbee
013c81176d added xnojekyll file 2016-02-08 14:32:32 -05:00
David Ormsbee
17d3b261cf First public pages commit. 2016-02-08 14:32:32 -05:00