Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,917 Commits 1 Branch 0 Tags
54f62a85f6164545151c32a063916cbeec94de46
Commit Graph

30917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Hoeber
831453c531 Merge pull request #5817 from edx/markhoeber-1138 
Export Template Update with Caution
 2014-11-07 09:39:03 -05:00
Mark Hoeber
5015aa5515 Export Template Update with Caution 2014-11-07 09:38:27 -05:00
Waheed Ahmed
b6d4a533a9 Fixed jump_to_id in problem solution. 
TNL-729
 2014-11-07 19:16:49 +05:00
AlasdairSwan
e7e2574754 Merge pull request #5872 from edx/alasdair/logistration-form-errors-and-submit-methods 
Moved to setting ajaxType with passed in method for models and now handl...
 2014-11-07 08:48:20 -05:00
Renzo Lucioni
0459094968 Fix logistration Jasmine tests 
Includes several bug fixes caught during test writing, general clean-up, and adds js-url, a lightweight URL parser
Moved to setting ajaxType with passed in method for models and now handling form load fail errors
Added tests.
 2014-11-07 08:47:16 -05:00
chrisndodge
01c029aa9f Merge pull request #5805 from edx/cdodge/make-customizeable-region-in-receipt-page 
allow for a customized region on the receipt page that is microsite bran...
 2014-11-06 21:13:43 -05:00
Adam
893cb9c21a Merge pull request #5873 from edx/release 
Release
 2014-11-06 16:53:05 -05:00
Christina Roberts
fd587b976c Merge pull request #5710 from edx/christina/general-component-errors 
Support validation messages for any xblock (on container page).
 2014-11-06 16:47:49 -05:00
Brian Talbot
181715f200 Studio: revising xblock validation message list styling 2014-11-06 15:49:10 -05:00
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