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

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
31dce7671e Studio: revising element-level xblock information styling 2014-11-06 15:49:10 -05:00
cahrens
08ce09bde7 Display validation messages for any xblock on the container page. 
TNL-683
 2014-11-06 15:48:55 -05:00
Adam
8fee031873 Merge pull request #5869 from edx/adam/unicode-fix 
add logging for cybersource errors; fix minor unicode bug
 2014-11-06 15:43:52 -05:00
David Baumgold
f0a37cf43a Merge pull request #5841 from edx/cms-consistent-branding-image-names 
Rename Studio logo
 2014-11-06 14:56:31 -05:00
Renzo Lucioni
a86c80bb3c Merge pull request #5857 from edx/renzo/add-js-tests 
Fix logistration Jasmine tests
 2014-11-06 14:22:43 -05:00
Don Mitchell
e4e45018fe Merge pull request #5871 from edx/dhm/remove_test 
Remove multi-threading test as unnecessary and flakey
 2014-11-06 14:21:13 -05:00
Diana Huang
a0fbb45ca8 Merge pull request #5868 from edx/diana/add-created-to-orderitem 
Add a `created_at` field to OrderItem.
 2014-11-06 14:03:36 -05:00
Adam Palay
459e4696c0 change djfs settings not to throw an error when the app starts up 2014-11-06 13:56:33 -05:00
Carlos Andrés Rocha
fac73e88d0 Cache user course privileges during OpenID Connect authorization. 2014-11-06 13:46:32 -05:00
Dennis Jen
d3e051ce29 fixed quaility errors in instructor_dashboard.py, moved test_instructor_dashboard under tests/views directory 2014-11-06 13:42:00 -05:00
Don Mitchell
396a8aca07 Remove multi-threading test as unnecessary and flakey 
also fix other users of check_mongo_calls to use None if they don't care about sends
PLAT-239
 2014-11-06 13:22:48 -05:00
Renzo Lucioni
f9ecd8849a Fix logistration Jasmine tests 
Includes several bug fixes caught during test writing, general clean-up, and adds js-url, a lightweight URL parser
 2014-11-06 12:07:49 -05:00
Diana Huang
e932820ae1 Add a created field to OrderItem. 2014-11-06 11:29:31 -05:00
Nimisha Asthagiri
5d920190a9 Merge pull request #5867 from edx/mobile/fix-broken-master 
Fix mobile_api broken test (due to merge conflict).
 2014-11-06 11:17:14 -05:00
Adam Palay
31b200cdcb add logging for cybersource errors; fix minor unicode bug 2014-11-06 10:25:42 -05:00
Usman Khalid
5fa1104787 Wrapped Split MongoConnection in MongoProxy. 
PLAT-71
 2014-11-06 20:13:45 +05:00
Usman Khalid
4a969f9f1b Added autoretry_read decorator to methods which use mongo cursor. 
PLAT-71
 2014-11-06 20:13:45 +05:00
Usman Khalid
328a79cc60 Wrap pymongo connections in MongoProxy. 
PLAT-71
 2014-11-06 20:13:45 +05:00
Renzo Lucioni
d512fe8673 Merge pull request #5859 from edx/renzo/track-form-expansions 
Track logistration form toggles and password reset form views
 2014-11-06 10:05:52 -05:00
Renzo Lucioni
5edb7b9c87 Track logistration form toggles and password reset form views 2014-11-06 10:00:42 -05:00
Renzo Lucioni
5d1143ad06 Merge pull request #5858 from edx/renzo/resource-conflict-error-messages 
Return more helpful error messages when a resource conflict occurs
 2014-11-06 09:52:32 -05:00
David Baumgold
cfaa9dd588 Rename Studio logo 
OPEN-301
 2014-11-06 09:34:17 -05:00
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