Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

2657 Commits

Author SHA1 Message Date
cahrens
9607aa233c Remove unnecessary pylint suppression. 
Possibly caused by a bad merge.
 2015-01-15 10:37:25 -05:00
Daniel Friedman
fff84928fa Create and edit content groups in Studio 2015-01-15 10:37:24 -05:00
Andy Armstrong
21a9873757 Don't allow visibility editing in content libraries 2015-01-15 10:33:48 -05:00
cahrens
4b00566e4d Update course access check. 2015-01-15 10:33:48 -05:00
Andy Armstrong
b77e65cdc2 Assign cohorts to groups in the instructor dashboard 
TNL-653
 2015-01-15 10:33:46 -05:00
Andy Armstrong
4fa33e25ed Studio support for cohorted courseware 
TNL-652
 2015-01-15 10:33:45 -05:00
jsa
17d892c521 make block.get_parent() work. 
Co-Authored-By: Christina Roberts <christina@edx.org>
Co-Authored-By: Daniel Friedman <dfriedman@edx.org>
Co-Authored-By: Don Mitchell <dmitchell@edx.org>
 2015-01-15 10:33:44 -05:00
John Eskew
df5ba26ac6 Handle the correct exception to cause a 404 error upon asset not found 
instead of a 500 error. Add 404 test.
 2015-01-15 09:44:05 -05:00
polesye
c7153be040 TNL-213: Let Students Add Personal Notes to Course Content. 
Co-Authored-By: Jean-Michel Claus <jmc@edx.org>
Co-Authored-By: Brian Talbot <btalbot@edx.org>
Co-Authored-By: Tim Babych <tim@edx.org>
Co-Authored-By: Oleg Marshev <oleg@edx.org>
Co-Authored-By: Chris Rodriguez <crodriguez@edx.org>
 2015-01-14 23:34:11 +02:00
Braden MacDonald
6be35e0fc1 Merge pull request #6459 from edx/content-libraries 
Content libraries MVP
 2015-01-13 11:20:20 -08:00
Adam Palay
ba102b4a66 fix quality violation 2015-01-12 13:52:15 -05:00
Adam Palay
7e45858276 resolve merge conflicts between release and master 2015-01-12 13:47:30 -05:00
Braden MacDonald
e4ea28f7f6 Minor pylint fixes 2015-01-12 10:39:12 -08:00
E. Kolpakov
195d5b57bc pylint fixes 2015-01-12 09:58:51 -08:00
Don Mitchell
2bf3966716 Add a fix_not_found command to get rid 
of dangling children references to blocks.
TNL-1141
 2015-01-12 10:42:52 -05:00
E. Kolpakov
1a387d8217 Test for paging in items.py 2015-01-12 13:42:55 +03:00
E. Kolpakov
d0919c93ce Added docstrings 2015-01-12 13:42:55 +03:00
E. Kolpakov
e59071ed67 Test for ValueError when updating_children for non-existing library 2015-01-12 13:42:55 +03:00
Jonathan Piacenti
5342fa27b9 Quality fixes. 2015-01-12 13:42:54 +03:00
Matjaz Gregoric
116abf1fc0 Modify error message when library with same org/code exists. 
Users are unlikely to change their organization name.
 2015-01-12 13:42:54 +03:00
Matjaz Gregoric
ccc392893e Update tests. 
Most of the updates are related to the My Courses -> Studio Home change.
 2015-01-12 13:41:45 +03:00
Jonathan Piacenti
eabd6c8d27 Quality check and test fixes. 2015-01-12 13:41:03 +03:00
Jonathan Piacenti
c17ba15fbf Made empty course url the 'home' url instead. 2015-01-12 13:41:02 +03:00
Braden MacDonald
325c36069a Unrelated: fix two bugs when duplicating a LibraryContentModule 2015-01-12 13:41:02 +03:00
Braden MacDonald
3857a1c1ee Support for overriding Scope.settings values when library content is used in a course 2015-01-12 13:41:02 +03:00
E. Kolpakov
21b02544c0 Added tests for editor_saved library content xblock method 
Retriggering Jenkins
 2015-01-12 13:41:01 +03:00
Braden MacDonald
7303966c13 Check permissions when updating LibraryContent blocks 2015-01-12 13:40:59 +03:00
Braden MacDonald
42ee0571e7 Read-only users get "Details" instead of "Edit" button, remove "Save" option 2015-01-12 13:40:55 +03:00
Braden MacDonald
93bb1f58cd Basic UI for managing library users with limited editing functionality (shared with course code) 2015-01-12 13:37:59 +03:00
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
Braden MacDonald
c41f607a34 Remove unused method, apply fixes needed after latest rebase 2015-01-12 13:37:58 +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
d4e8242477 Friendly error message when library key is invalid 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
Jonathan Piacenti
074e4cfa22 Addressed further review notes for Library Pagination 2015-01-12 13:37:56 +03:00
Jonathan Piacenti
80c517ecd1 Addressed notes from reviewers on 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
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
Nimisha Asthagiri
fe40fa6deb Merge pull request #6495 from edx/mobile/MA-212 
MA-212 Mobile API support for backward compatibility of course updates.
 2015-01-09 10:05:59 -05:00
Jesse Zoldak
d29127055e Merge pull request #6509 from edx/zoldak/fix-textbook-test 
Fix flaky textbook upload lettuce tests
 2015-01-09 07:45:05 -05:00
Jesse Zoldak
3efb377d1c Fix flaky textbook upload lettuce tests 2015-01-08 16:52:55 -05:00
Dennis Jen
d2660e530f Merge branch 'release' 
Conflicts:
	lms/templates/verify_student/make_payment_step.underscore
 2015-01-08 15:02:26 -05:00
Steve Jackson
531dbbe3b9 [TNL-140] Fix unresponsive Studio login error message 
Clear the 'invalid login' error message when the user edits her username
or password.  This fix makes makes it clear that future attempts to
login are not being ignored if they continue to generate the same error.

Add an acceptance test case to verify this behavior.

Fixes https://openedx.atlassian.net/browse/TNL-140
 2015-01-08 10:48:45 -08:00