Commit Graph

26717 Commits

Author SHA1 Message Date
Sarina Canelake
92c1efe85c Last reference removed in 94886643b0 2014-11-07 11:18:49 -05:00
Sarina Canelake
20c13096ed Last references removed in ab2995fc85 2014-11-07 11:18:49 -05:00
Sarina Canelake
d5ba04874e Last references removed in ab2b7f344d 2014-11-07 11:18:49 -05:00
Sarina Canelake
1843dc4dda Last references removed in 854621be60 2014-11-07 11:18:49 -05:00
Sarina Canelake
47e185d12b Last reference removed in 1bc0b323b1 2014-11-07 11:18:48 -05:00
Sarina Canelake
6d415e484c Last reference removed in 2bfe0cb92d 2014-11-07 11:18:48 -05:00
Sarina Canelake
b16d04afec Last reference removed in 300d55cbd5 2014-11-07 11:18:48 -05:00
Sarina Canelake
826251c166 Last reference removed in 81a56a35ab 2014-11-07 11:18:48 -05:00
Sarina Canelake
ae1343ba2c Last references removed in 14345401cc 2014-11-07 11:18:48 -05:00
Sarina Canelake
f15ddb8e8c Last reference removed in e21e5284de 2014-11-07 11:18:48 -05:00
Sarina Canelake
4ebd5c188d Last reference removed in 89ba90a695 2014-11-07 11:18:48 -05:00
Sarina Canelake
6584df39e1 Last reference removed in 58c5066e66 2014-11-07 11:18:48 -05:00
Sarina Canelake
92b86af2c1 Last reference removed in 5ef94f1496 2014-11-07 11:18:47 -05:00
Sarina Canelake
f3aa21f5ba Last reference removed in 988e4e6da5 2014-11-07 11:18:47 -05:00
Sarina Canelake
a0b3ab2a0a References removed in 4dc527d119 2014-11-07 11:18:47 -05:00
Sarina Canelake
759fae2978 Can't find any references (current or historical) to these files 2014-11-07 11:18:47 -05:00
Sarina Canelake
6a5bb4f20d References removed in e1113d9ca9 2014-11-07 11:18:47 -05:00
Sarina Canelake
b69169a690 Remove unused images
Moved images in folders to top level where appropriate, and change references.

OPEN-297
2014-11-07 11:18:47 -05:00
Sarina Canelake
2cdbabc0b8 Merge pull request #5880 from edx/sarina/name-branded-assets-in-common
Sarina/name branded assets in common
2014-11-07 11:13:51 -05:00
Waheed Ahmed
dbc47600fc Merge pull request #5809 from edx/waheed/tnl729-fix-jump-to-id-in-problem-solution
Fixed jump_to_id in problem solution.
2014-11-07 20:30:04 +05:00
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
Waheed Ahmed
b6d4a533a9 Fixed jump_to_id in problem solution.
TNL-729
2014-11-07 19:16:49 +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