Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,696 Commits 1 Branch 0 Tags
4e9bf5e1043ff095dced9ffdef2b052a99b4855b
Commit Graph

26696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarina Canelake
4e9bf5e104 Last reference removed in 3b2c970248 [OPEN-299] 2014-11-07 09:50:45 -05:00
Sarina Canelake
5cedbc7ee6 Rename branded asset; moved to LMS as that's where it is referenced [OPEN-302] 2014-11-07 09:50:45 -05:00
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
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
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
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
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
David Baumgold
cfaa9dd588 Rename Studio logo 
OPEN-301
 2014-11-06 09:34:17 -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
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
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
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
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
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
Renzo Lucioni
d9d09e2b4b Fix track selection tests 2014-11-04 15:25:38 -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
17a3f556fb Fix track selection header copy 2014-11-04 13:54:31 -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