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

35174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Weeks
52e8db34fd course id/org/name -> display_stuff_with_default 2016-02-11 10:25:12 -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
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
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
Peter Fogg
275b2f5c71 Merge pull request #11460 from edx/peter-fogg/edx-header-profile-image 
Correctly add profile image to edX header.
 2016-02-08 14:14:01 -05:00
Jesse Zoldak
fc4866054f Remove duplicate staff debug acceptance tests 2016-02-08 13:17:14 -05:00
Peter Fogg
f3c20e7360 Correctly add profile image to edX header. 2016-02-08 12:47:27 -05:00
Andy Armstrong
1109404a7b Merge pull request #11459 from edx/adam/mathjax-rendering-bug-rc 
address mathjax rendering bug (TNL-4080)
 2016-02-08 11:58:40 -05:00
Adam Palay
ae279569db address mathjax rendering bug (TNL-4080) 2016-02-08 10:32:22 -05:00
David Ormsbee
9ae0dada4c Merge pull request #11445 from edx/ormsbee/clear_cache_in_tests 
Clear caches between tests for ModuleStoreTestCase/SharedModuleStoreTestCase
 2016-02-08 10:23:54 -05:00
John Eskew
07c542d8cb Merge pull request #11420 from edx/jeskew/ensure_indexes_fix 
Make ensure_indexes mgmt cmd semi-idempotent.
 2016-02-08 09:55:05 -05:00
Ben Patterson
5415f66d46 Upgrade diff-cover. 2016-02-08 09:17:21 -05:00
Chris Rodriguez
ad36f761c1 Hotfix: ac-201 2016-02-08 09:05:52 -05:00
sanfordstudent
c51bcdbf91 Merge pull request #11418 from edx/sstudent/MA-1918-handle-no-handouts 
MA-1918 returning None for courses with no handouts
 2016-02-08 08:52:41 -05:00
David Ormsbee
8fa8b209a7 Remove query counts from Bookmarks HTTP API tests. 
Query counts already happen at the model and Python API test layers.
Having query counts in the HTTP API tests makes things more brittle
because that includes middleware that this code should not be aware
of. We don't want to have to revisit these tests every time
another piece of middleware is added or removed.
 2016-02-08 08:05:13 -05:00
Christina Roberts
74bdef1eca Merge pull request #11430 from edx/christina/tnl-4057 
Remove flaky decorator from test_cancel_comment_edit
 2016-02-08 07:32:29 -05:00
Ehtesham
b9c8b3308d [TNL-3962] moving DEPRECATED_ADVANCED_COMPONENT_TYPES to dJango admin 2016-02-08 17:26:49 +05:00
Saleem Latif
dc502ea913 Remove concatenation of i18n strings. 2016-02-08 11:24:19 +05:00
David Ormsbee
be25bb8aba Clear caches between tests for ModuleStoreTestCase/SharedModuleStoreTestCase 
Cached values were leaking across tests, causing difficult to debug errors,
particularly when using Config Models. As part of this work, certain tests
that had query counts that relied on those values being cached needed to
be adjusted up.
 2016-02-06 00:01:15 -05:00
cahrens
d8a63fbd93 Remove flaky decorator from test_cancel_comment_edit. 
Test passed over 100 times in Jenkins.
TNL-4057
 2016-02-05 21:22:39 -05:00
John Eskew
77d2456542 Make MongoDB index creation idempotent by catching errors about existing 
indexes with different options. Emit warning instead and continue.
 2016-02-05 14:04:41 -05:00
Jim Abramson
ba2c6b79fb Merge pull request #11341 from edx/jsa/ecom-3354 
Implement celery task to award program certs.
 2016-02-05 13:47:16 -05:00
Andy Armstrong
d731b07bd4 Add UXPL to edx-platform 
UITK-39
 2016-02-05 13:33:55 -05:00
Jesse Zoldak
84e9df5982 Ignore venv directory when running jshint on circleci 2016-02-05 12:21:59 -05:00
jsa
92aa346fdf Implement celery task to award program certs. 
ECOM-3354
 2016-02-05 12:21:20 -05:00
Toby Lawrence
409a947c0d Merge pull request #11435 from edx/bugfix/add-admin-for-ext-exclusion 
Fix up the excluded extensions bit.
 2016-02-05 12:15:07 -05:00