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

27986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
9902dcb10f Disable FIXME errors on paver run_quality 
Not on `paver run_pylint`
 2014-11-06 09:32:40 -05:00
David Baumgold
58fd091823 Disable TODO comments in paver quality only 2014-11-06 09:32:40 -05:00
David Baumgold
24ad0c31ea Pylint: ignore TODO comments 2014-11-06 09:32:40 -05:00
Nimisha Asthagiri
82a9b84f34 Fix broken test (due to merge conflict). 2014-11-06 09:19:40 -05:00
Ben Patterson
cb5e90fc08 Merge pull request #5865 from edx/benp/skip-broken-MA-117 
Skip test broken on master. Sent to team for review.
 2014-11-06 09:15:33 -05:00
Ben Patterson
bba4014d1e Skip test broken on master. Sent to team for review. 2014-11-06 08:56:55 -05:00
Renzo Lucioni
edba397a20 Return more helpful error messages when a resource conflict occurs 2014-11-05 22:36:27 -05:00
Don Mitchell
5491418cd5 Merge pull request #5847 from edx/dhm/generalize_assets 
Generalize assets to any block_type but using
 2014-11-05 17:32:56 -05:00
Dennis Jen
66b3e3828f added tests for instructor_dashboard.py, added docstring for _is_small_course, removed check for settings.ANALYTICS_DASHBOARD_URL when creating dashboard link 2014-11-05 17:14:33 -05:00
Greg Price
6d5bb9b195 Merge pull request #5813 from edx/gprice/login-oauth-token 
Add endpoint to log in with OAuth access token
 2014-11-05 16:06:46 -05:00
AlasdairSwan
8a0507c977 Merge pull request #5854 from edx/alasdair/logistration-accessibility 
Updated templates in light of accessibility review
 2014-11-05 16:05:39 -05:00
AlasdairSwan
25b53c1d02 Merge pull request #5852 from edx/alasdair/logistration-utils-bug 
Fixed bug with validation templates expecting number but being passed st...
 2014-11-05 16:02:21 -05:00
Don Mitchell
fc83c299ca Generalize assets to any block_type but using 
AssetKey and the metadata store
PLAT-204
 2014-11-05 16:01:50 -05:00
AlasdairSwan
62b5e27cf9 Updated templates in light of accessibility review 2014-11-05 15:53:55 -05:00
Greg Price
067e270a84 Fix spelling of complementary role 2014-11-05 15:48:51 -05:00
AlasdairSwan
d0b1a8ec06 Fixed bug with validation templates expecting number but being passed string. 2014-11-05 15:40:38 -05:00
Sarina Canelake
90b40e7d57 Merge pull request #5823 from edx/sarina/delete-unused-lms-assets 
Remove unused static assets (LMS)
 2014-11-05 15:36:42 -05:00
Akiva Leffert
58d84e4747 Merge pull request #5798 from edx/aleffert/mobile-beta-enrollments-access 
https://openedx.atlassian.net/browse/MA-76
 2014-11-05 14:39:55 -05:00
Greg Price
d2183c58c8 Add endpoint to log in with OAuth access token 2014-11-05 14:09:41 -05:00
Akiva Leffert
ffd6d89451 Update course enrollments API to allow beta users to see a course. 
Also adds me as an author
JIRA: https://openedx.atlassian.net/browse/MA-76
 2014-11-05 13:04:51 -05:00
Daniel Friedman
eaa63da463 Merge branch 'release' 2014-11-05 12:10:55 -05:00
AlasdairSwan
5dc5f5f9b2 Merge pull request #5849 from edx/alasdair/logistration-form-order-update 
ECOM-587 and ECOM-585 Switched tab order based on url and on selection o...
 2014-11-05 11:49:04 -05:00
AlasdairSwan
8a62991ff9 ECOM-585, ECOM-587 and ECOM-588 Changed order of forms based on url, fixed tabbing issue with forgot password link and moved third party quth error message so now does not load buttons if they do not have a url 2014-11-05 11:47:26 -05:00
Sarina Canelake
303b4e66e1 Merge pull request #5822 from edx/sarina/OPEN-303 
Move all lms image files into lms/static/images [OPEN-303]
 2014-11-05 10:58:02 -05:00
John Eskew
db682dae05 Merge pull request #5819 from edx/jeskew/asset_mongo_coursewide 
Implement course-wide asset paging methods.
 2014-11-05 10:05:32 -05:00
Muhammad Ammar
e8e7e78e09 Merge pull request #5655 from edx/ammar/unit-improvements 
Unit Test Improvements
 2014-11-05 19:55:39 +05:00
Sarina Canelake
ad8bc69f93 Move all lms image files into lms/static/images [OPEN-303] 2014-11-05 09:10:15 -05:00
Mark Hoeber
b7f91eed39 Update doc readme.rst 2014-11-04 19:15:31 -05:00
Mark Hoeber
58f0071475 Update doc readme.rst 2014-11-04 19:14:46 -05:00
Mark Hoeber
1dee2f8549 Merge pull request #5833 from edx/markhoeber-remove-documentation-files 
Remove documentation files moved to edx-documentation repo
 2014-11-04 19:13:46 -05:00
Mark Hoeber
cdd5f4e932 Merge pull request #5843 from edx/markhoeber-doc-readme 
Readme for documentation directory
 2014-11-04 19:13:22 -05:00
Mark Hoeber
27678416bc Readme for documentation directory 2014-11-04 19:12:52 -05:00
John Eskew
3534ba70ca Changes for PR review: More compact tests, enumeration for metadata 
sort order, etc.
https://openedx.atlassian.net/browse/PLAT-74
 2014-11-04 18:49:38 -05:00
Daniel Friedman
f938a5d965 Merge pull request #5840 from edx/renzo/fix-track-selection-tests 
Fix track selection tests
 2014-11-04 16:58:04 -05:00
frances botsford
6047664b99 Merge pull request #5835 from OmarIthawi/omarithawi/fixed-rtl-icon-spacing-in-discussion 
Fixed spacing of RTL icon in discussion
 2014-11-04 16:44:17 -05:00
Ben Patterson
369f2c54d1 Merge pull request #5810 from edx/benp/improve-run-quality 
Reduce complexity in run_quality.
 2014-11-04 16:04:20 -05:00
Ben Patterson
493672b173 Reduce complexity in run_quality. 2014-11-04 16:01:30 -05:00
AlasdairSwan
864040eeb9 Merge pull request #5839 from edx/alasdair/logistraion-css-fix 
ECOM-583 Fixes the CSS bugs
 2014-11-04 15:36:39 -05:00
Renzo Lucioni
d9d09e2b4b Fix track selection tests 2014-11-04 15:25:38 -05:00
AlasdairSwan
588e1db629 ECOM-583 Fixes the CSS bugs 2014-11-04 14:56:34 -05:00
Renzo Lucioni
5d110273a9 Merge pull request #5834 from edx/renzo/fix-track-selection-copy 
Fix track selection header copy
 2014-11-04 14:03:05 -05:00
Renzo Lucioni
1de92697f7 Merge pull request #5771 from edx/renzo/flip-access-view 
Flip order of register and login options in the access view
 2014-11-04 14:01:16 -05:00
Renzo Lucioni
fca44138dd Flip order of register and login options in the access view 2014-11-04 13:59:44 -05:00
Renzo Lucioni
17a3f556fb Fix track selection header copy 2014-11-04 13:54:31 -05:00
Dennis Jen
b27401554c Feature flagged enrollment counts on instructor dashboard. 
* enrollments counts removed from legacy dashboard
 2014-11-04 12:56:53 -05:00
John Eskew
098bba16e1 Implement copy_all_asset_metadata for Old Mongo->Old Mongo. 
Add tests for copying all asset metadata.
https://openedx.atlassian.net/browse/PLAT-74
 2014-11-04 11:38:56 -05:00
John Eskew
062e0b2174 Implement course-wide asset paging methods. 
Add SortedCollection class to help sort lists efficiently.
https://openedx.atlassian.net/browse/PLAT-74
 2014-11-04 11:35:02 -05:00
Sarina Canelake
fece2b9dd2 Merge pull request #5821 from edx/sarina/remove-old-admin-files 
Remove admin files deprecated in Django 1.4
 2014-11-04 10:55:13 -05:00
Diana Huang
a971e71792 Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/course_modes/views.py
 2014-11-04 10:50:09 -05:00
Don Mitchell
436b32a66d Merge pull request #5800 from edx/dhm/xml_assetstore 
Abstract asset methods into own interface class
 2014-11-04 10:43:41 -05:00