Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

4229 Commits

Author SHA1 Message Date
Greg Price
3978d91644 Sort Studio video uploads by creation date 
This provides a better UX for video uploaders, because recent uploads
are readily visible at the beginning of the table.
 2015-01-30 13:23:44 -05:00
Muzaffar yousaf
ae102de3be Merge pull request #6777 from edx/muzaffar/student-info-tnl836 
Get user anonymous id via xblock user service.
 2015-01-30 19:35:26 +05:00
Jonathan Piacenti
f1fff439a6 Add clearer error message for library content blocks on incompatible modulestores. 2015-01-29 20:36:19 +00:00
Jim Abramson
116dba39a8 Merge pull request #6711 from edx/jsa/fix-rerun-exception 
avoid database error when recording task exception
 2015-01-29 12:51:02 -05:00
jsa
ace2bffae6 avoid database error when recording task exception 2015-01-29 11:25:45 -05:00
muzaffaryousaf
3a09af07e5 Fixing the broken tests. 
TNL-1185
 2015-01-29 18:37:22 +05:00
Régis Behmo
c3c35f076c Fix csrf error on studio login 
Context: We have witnessed multiple, seemingly random "CSRF verification
failed" errors while signing in (with valid ID) to the Studio.

Explanation: The login form does not initially include a CSRF field.
The CSRF header of the request is appended to the studio login request
headers by intercepting the form validation. This intercept is performed
by the login.js script. Unfortunately, the login.js script is loaded
pretty late (at the end of the template). So if the login form is
validated sufficiently fast, the login.js script has no time to load and
append the X-CSRFToken header to the request.

Proposed solution: the CSRF token is already passed to the template via
the login view, so we just add a hidden field to the login form to
include the csrf token.
 2015-01-29 09:10:59 +01:00
Matt Drayer
1c839cc09d Addressed several outstanding issues related to initial entrance exams feature delivery 2015-01-28 23:56:32 -05:00
Davorin Sego
e09d47b122 Courseware Search integration 2015-01-28 21:34:58 -05:00
Greg Price
ef8843ab1a Fix bugs in CSV download of video upload data 
This fixes two bugs:
1. All statuses were listed as "Unknown"
2. Non-ASCII characters in a header column translation resulted in a 500
 2015-01-28 18:23:22 -05:00
Matt Drayer
ce5c7948fa Added field to FILTERED_LIST plus a new bokchoy test 2015-01-28 13:11:36 -05:00
Waheed Ahmed
4ac7b55757 Fixed transcript skip first line if it contains BOM(Byte Order Mark). 
TNL-935
 2015-01-28 12:26:16 +05:00
Braden MacDonald
025f046b04 Fix errors with libraries when old mongo is default (first) modulestore 2015-01-21 11:01:52 -08:00
Greg Price
874cd5c78f Improve code for video upload feature 
Fix i18n for video status strings (broken in commit 4b53f4d) and remove
unnecessary complexity from a test case. This also removes the status
whitelist in the video upload configuration. Because status is included
in the CSV report, it is not necessary to filter the included videos by
status.
 2015-01-20 11:45:21 -05:00
Ned Batchelder
e64d45b705 Merge pull request #6563 from edx/ned/fix-6013 
Fixes for #6013: Implement user service to return currently-logged-in user
 2015-01-16 15:12:31 -05:00
Martyn James
9ac7176b8f Merge pull request #6223 from edx/feature/SOL-20 
Merge feature SOL-20
 2015-01-16 12:54:45 -05:00
Martyn James
dcc8e95648 Implements SOL-20. Filtering for assets table by asset type 2015-01-16 12:53:24 -05:00
Jason Bau
7f1b60b286 Implement user service to return currently-logged-in user 
returns XBlockuser with 2 data layers
 2015-01-16 11:40:06 -05:00
Waheed Ahmed
47a372282a Fixed transcript skip first line if it contains BOM(Byte Order Mark). 
TNL-935
 2015-01-16 12:21:43 +05:00
Matt Drayer
3c669e3838 New feature contribution: Entrance Exams 2015-01-15 20:35:24 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00
Christina Roberts
2897a8efb3 Merge pull request #6299 from edx/cohorted-courseware 
Cohorted courseware
 2015-01-15 11:50:13 -05:00
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