cahrens
08ce09bde7
Display validation messages for any xblock on the container page.
...
TNL-683
2014-11-06 15:48:55 -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
Don Mitchell
436b32a66d
Merge pull request #5800 from edx/dhm/xml_assetstore
...
Abstract asset methods into own interface class
2014-11-04 10:43:41 -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
Gabe Mulley
9e98810832
Merge pull request #5781 from mulby/mobile-eventing-v2
...
Implement shim for mobile video events.
2014-11-03 18:45:38 -05:00
Mark Hoeber
d008ef611a
Remove documentation files moved to edx-documentation repo
2014-11-03 18:35:15 -05:00
Sarina Canelake
aeb3a7f575
fixup! Remove "ADMIN_MEDIA_PREFIX" (deprecated in Django 1.4)
2014-11-03 16:49:18 -05:00
Sarina Canelake
bf298f9bed
Merge pull request #5832 from edx/sarina/20141103-update-translations
...
Update translations '
2014-11-03 15:25:25 -05:00
Don Mitchell
aa07355e87
Abstract asset methods into own interface class
...
then impl the read ones as NotImplementedError placeholders on xml modulestore
PLAT-70
2014-11-03 14:45:30 -05:00
Sarina Canelake
67ebd5ecd8
Update translations '
...
(autogenerated message)
2014-11-03 14:21:41 -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
David Baumgold
688d4c968a
Merge pull request #4806 from edx/talbs/studio-stylesweep-unused
...
Studio: Removing older/deprecated style rules
2014-11-03 13:36:05 -05:00
Christina Roberts
7f98540e21
Merge pull request #5808 from edx/zub/bugfix/tnl-138-createunitthrowserror
...
fix click event for actual target
2014-11-03 10:36:17 -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
zubair-arbi
dd71ca0f8a
fix click event for actual target
...
TNL-138
2014-11-03 09:37:02 -05:00
Sarina Canelake
15495e6ff3
Remove old 404 page
2014-11-01 00:13:06 -04:00
Sarina Canelake
6a06ff6a75
Remove unused static assets
2014-11-01 00:11:23 -04:00
Sarina Canelake
ed76907c0d
Remove "ADMIN_MEDIA_PREFIX" (deprecated in Django 1.4)
...
Delete lms/static/admin resources as they are no longer needed
for the admin page as of Django 1.4
Moved two files that were referenced elsewhere:
lms/static/admin/js/jquery.min.js -> lms/static/js/admin/jquery.min.js
lms/static/admin/js/urlify.js -> lms/static/js/admin/urlify.js
2014-11-01 00:01:17 -04:00
Carlos Andrés Rocha
09c1f524c1
Merge pull request #5820 from rocha/dont-raise-error-on-course-export-command-cleanup
...
Ignore errors during cleanup of course export command.
2014-10-31 14:46:41 -07:00
