Commit Graph

27806 Commits

Author SHA1 Message Date
Braden MacDonald
c477bab6f4 Update the REST API course_team_handler to support library roles, fix bugs 2015-01-12 13:37:58 +03:00
Braden MacDonald
ea03f6ed76 Unit tests for content library permissions 2015-01-12 13:37:58 +03:00
Braden MacDonald
fefc70c405 Three levels of user permissions for content libraries:
Admin ("Instructor") - Can edit and assign permissions to other users
Normal ("Staff") - Can edit
User - Can view the library and use content from it but cannot edit it or its blocks.
2015-01-12 13:37:58 +03:00
Carol Tong
a42921330e Add reference to library_content advanced setting 2015-01-12 13:37:58 +03:00
Carol Tong
e2a3be8b8b Sidebar text for Content Library page in Studio 2015-01-12 13:37:58 +03:00
Braden MacDonald
c41f607a34 Remove unused method, apply fixes needed after latest rebase 2015-01-12 13:37:58 +03:00
Braden MacDonald
5f5b41d03f Remove state summary from the unit author page until SOL-192 2015-01-12 13:37:58 +03:00
Braden MacDonald
376e698764 Display the library key on the library view in Studio 2015-01-12 13:37:57 +03:00
Braden MacDonald
6f3b46c9df Move code that uses the modulestore to an XBlock service 2015-01-12 13:37:57 +03:00
Braden MacDonald
cdf7c6545a ungettext fix 2015-01-12 13:37:57 +03:00
Braden MacDonald
99c3692902 Validation should be on the descriptor, not the module 2015-01-12 13:37:57 +03:00
Braden MacDonald
eb4b1d57c3 Fix greedy intrusion of split_test documentation 2015-01-12 13:37:57 +03:00
Braden MacDonald
76b6d33b80 Refresh children automatically when library setting is changed 2015-01-12 13:37:57 +03:00
Braden MacDonald
904007a9e4 Fix: don't need to reload the whole page to refresh_children from the container view 2015-01-12 13:37:57 +03:00
Braden MacDonald
e498872ab1 Move update link to the validation area 2015-01-12 13:37:57 +03:00
Jonathan Piacenti
80ea764c9d Made errors on Library blocks use validate functionality. 2015-01-12 13:37:56 +03:00
Jonathan Piacenti
9f85c0f0aa Added explanation to container view of Library Block. 2015-01-12 13:37:56 +03:00
Braden MacDonald
d4e8242477 Friendly error message when library key is invalid 2015-01-12 13:37:56 +03:00
E. Kolpakov
d25673ec72 LibraryContent bok choy acceptance tests 2015-01-12 13:37:56 +03:00
Braden MacDonald
e1f6ca93ec Unit and integration tests of content libraries 2015-01-12 13:37:56 +03:00
Braden MacDonald
eddf44d853 Library Content XModule 2015-01-12 13:37:56 +03:00
Jonathan Piacenti
074e4cfa22 Addressed further review notes for Library Pagination 2015-01-12 13:37:56 +03:00
Jonathan Piacenti
7188c3a328 Factored out Pagination into its own Container view. 2015-01-12 13:37:55 +03:00
Jonathan Piacenti
80c517ecd1 Addressed notes from reviewers on Library Pagination. 2015-01-12 13:37:55 +03:00
Jonathan Piacenti
ed3b972078 Added tests for Library pagination. 2015-01-12 13:37:55 +03:00
E. Kolpakov
ff1a08cbd5 Paging for LibraryView added with JS tests. 2015-01-12 13:37:55 +03:00
Jonathan Piacenti
058176144e Removed the ability to add Discussion and advanced components to Content Libraries. 2015-01-12 13:37:55 +03:00
Braden MacDonald
3e0f08ebc2 Studio support for creating and editing libraries (PR 6046)
SOL-1, SOL-2, SOL-3
2015-01-12 13:37:50 +03:00
Waqas Khalid
80e0d56afd Merge pull request #6368 from sjackso/login_error_fix
Login error fix TNL-140
2015-01-12 15:06:15 +05:00
Renzo Lucioni
7a9ec6bd7a Merge pull request #6546 from edx/renzo/fix-jasmine-tests
Prevent Jasmine tests from redirecting in dev mode
2015-01-11 17:07:11 -05:00
Renzo Lucioni
8ef0e77e46 Prevent Jasmine tests from redirecting in dev mode
Also prevent Jasmine from attempting to load deleted templates
2015-01-11 16:08:29 -05:00
Nimisha Asthagiri
66e6d1cf7a Merge pull request #6352 from edx/gprice/video-upload-csv
Add CSV download button to Studio video upload page
2015-01-09 21:48:54 -05:00
Nimisha Asthagiri
4b53f4df27 Studio video upload CSV download changes. 2015-01-09 20:48:48 -05:00
Greg Price
8d8ca83d94 Add download button to Studio video upload page
The button downloads the CSV data containing all video URLs.
2015-01-09 19:45:31 -05:00
Greg Price
4e1925129e Add URL download endpoint for Studio video uploads
The endpoint returns an Excel-dialect CSV file for download.
2015-01-09 19:45:31 -05:00
Renzo Lucioni
cc306843bc Merge pull request #6508 from edx/renzo/split-payment-verification-fixes
Fix cosmetic issues with the split payment and verification flow
2015-01-09 17:42:48 -05:00
Dennis Jen
47f3252215 Merge pull request #6529 from edx/release
Merge release back into master
2015-01-09 17:22:15 -05:00
Jesse Zoldak
ff4f0787ec Merge pull request #6522 from edx/zoldak/video-troubleshooting
Add debug logging to video tests
2015-01-09 16:21:07 -05:00
Dennis Jen
0e03834d00 Merge pull request #6524 from edx/hotfix/2014-01-09
Handle children pointers to non-existent children in has_changes
2015-01-09 15:58:59 -05:00
David Baumgold
03d20e09fa Merge pull request #6537 from edx/translate-brands
Translate link titles
2015-01-09 15:55:34 -05:00
David Baumgold
a6f3edcad5 Translate link titles 2015-01-09 15:10:44 -05:00
David Baumgold
3b9001fca5 Merge pull request #6533 from edx/social-icon-classes
Make all the social links show icons
2015-01-09 15:05:28 -05:00
David Baumgold
7fe267b261 Make all the social links show icons 2015-01-09 14:27:59 -05:00
Renzo Lucioni
10cb7f10fa Fix cosmetic issues with the split payment and verification flow
Use honor code ribbon if verification status is not missing, submitted, or approved; title column on payment confirmation page holding dollar amounts more appropriately
2015-01-09 13:13:00 -05:00
Brian Talbot
c93817962e Merge pull request #6515 from edx/talbs/fix-update-font-awesome
FIX: Upgrade Font Awesome - Part III: Revenge of the Glyph
2015-01-09 12:50:14 -05:00
David Ormsbee
5abf2e78e8 Merge pull request #6528 from edx/ormsbee/coursemodes_admin
Add search, sort, and slug dropdown to Course Modes admin.
2015-01-09 12:44:30 -05:00
Brian Talbot
f128629f48 fixing styling and class syntax (to new FA-based classes) for missing UI elements 2015-01-09 12:01:26 -05:00
Sarina Canelake
76660e3ace Merge pull request #6484 from edx/sarina/move-branded-lms-assets
Remove edX branding from default Open edX LMS [OPEN-307]
2015-01-09 11:59:39 -05:00
David Ormsbee
18495e97a0 Add search, sort, and slug dropdown to Course Modes admin. 2015-01-09 11:43:22 -05:00
Don Mitchell
a969755661 Handle children pointers to non-existent children in has_changes
TNL-1141
2015-01-09 11:34:46 -05:00