Commit Graph

9343 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
5cedbc7ee6 Rename branded asset; moved to LMS as that's where it is referenced [OPEN-302] 2014-11-07 09:50:45 -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
cahrens
08ce09bde7 Display validation messages for any xblock on the container page.
TNL-683
2014-11-06 15:48:55 -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
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
Adam Palay
31b200cdcb add logging for cybersource errors; fix minor unicode bug 2014-11-06 10:25:42 -05:00
Nimisha Asthagiri
82a9b84f34 Fix broken test (due to merge conflict). 2014-11-06 09:19:40 -05:00
Ben Patterson
bba4014d1e Skip test broken on master. Sent to team for review. 2014-11-06 08:56:55 -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
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
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
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
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
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
Sarina Canelake
bc20ccb332 Merge pull request #5828 from edx/sarina/moar-pep8
Remove more pep8 violations
2014-11-04 08:58:17 -05:00
Sarina Canelake
725e4908e3 Remove more pep8 violations 2014-11-04 07:37:41 -05:00
Omar Al-Ithawi
b79180bb97 Fixed spacing of RTL icon in discussion 2014-11-04 14:30:23 +02:00
Sarina Canelake
aeb3a7f575 fixup! Remove "ADMIN_MEDIA_PREFIX" (deprecated in Django 1.4) 2014-11-03 16:49:18 -05:00
Gabe Mulley
821c97fbb4 Implement shim for mobile video events.
This PR addresses the following issues:

1) All requests return a 200 OK unless there is an authorization failure. This is deliberate in case the secret key is compromised.
2) Push all of the nasty logic necessary to generate compatible video events into the LMS instead of trying to do that mapping on the mobile devices.
3) Stop using the deprecated "action" field in the segment.io event. According to their support team this field should not be used anymore and is just around for backwards compatibility reasons.

Fixes: AN-3818
2014-11-03 14:12:07 -05:00
Clinton Blackburn
22952af61f Merge pull request #5782 from edx/remove-analytics-demographics
Updates to Demographics Display
2014-11-03 10:07:31 -05:00
Sarina Canelake
15495e6ff3 Remove old 404 page 2014-11-01 00:13:06 -04:00