Commit Graph

920 Commits

Author SHA1 Message Date
Martyn James
a46b4daf7f Merge pull request #6937 from edx/mjames/SOL-353
Reorganise reindexing operation
2015-02-10 10:58:49 -05:00
Martyn James
181d0e46c5 Reorganise reindexing operation 2015-02-09 22:13:25 -05:00
Braden MacDonald
2982ecd40d Disabled flaky JS tests pending refactor to Backbone 2015-02-09 15:00:17 -08: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
5f341423a3 Add progress bars for Studio video uploads
The CSS is also restructured a bit to style both the progress bar and
the status text based on the state of the upload using a single class
on the parent element.
2015-01-26 16:13:45 -05:00
Daniel Friedman
1920ab4149 Merge pull request #6650 from edx/dan-f/validate-group-configuration-group-names
Require unique group names in group configurations
2015-01-20 15:27:49 -05: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
Daniel Friedman
5cd58897ab Require unique group names in group configurations
TNL-1142
2015-01-20 11:25:11 -05:00
Xavier Antoviaque
0c7620a544 Merge pull request #6637 from open-craft/mtyaka/validate-chars
Improve JS course key validation to not allow special chars.
2015-01-20 16:02:32 +01: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
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
Frances Botsford
6398af715a Make group config styles generic 2015-01-15 10:37:25 -05:00
cahrens
66375b8541 Bok choy test for editing of content groups on Group Configuration page. 2015-01-15 10:37:24 -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
1897fb65f9 Update for paged container not having a visibility editor. 2015-01-15 10:33:48 -05:00
Andy Armstrong
4fa33e25ed Studio support for cohorted courseware
TNL-652
2015-01-15 10:33:45 -05:00
Bertrand Marron
c4a7d770cc Remove all ellipses
It's a problem for accessibility
2015-01-15 09:03:12 -05:00
Matjaz Gregoric
d8e076566d Improve JS course key validation to not allow special chars.
Course and Library keys cannot contiain !'()* special characters,
but the JS validation on the new course/library failed to detect
these characters.

`encodeURIComponent` is used to check the string for special characters,
but `encodeURIComponent` does not encode these characters: -_!~*'().
(see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent)

The -_~ characters are allowed in course keys, but !'()* are not,
so add an explicit check for these characters to make sure a field
containing these characters does not pass the validation.
2015-01-15 08:32:19 +01:00
Tim Babych
dbfc12ce01 Merge pull request #6321 from edx/feature/edxnotes
TNL-213: Student Notes
2015-01-15 02:02:13 +02: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
David Baumgold
df5dd1a4db Merge pull request #6385 from ataki/ataki/gridfs-hotfix
Fix visual bug with large file error msg in cms.
2015-01-14 10:42:56 -05:00
Jonathan Piacenti
91469f902f Refactored shared elements of create factories into base class. 2015-01-12 13:42:54 +03:00
E. Kolpakov
99caf602cb Refactoring create_course_utils and create_library_utils to reduce the amount of differences (mostly renames 2015-01-12 13:42:54 +03:00
Matjaz Gregoric
6a09809cdd Slower scroll to 'Add New Component'. 2015-01-12 13:42:54 +03:00
Matjaz Gregoric
fe9ae3123f Add 'Add Component' button to library page.
It looks like the 'New Course'/'New Library' buttons on the studio home page.

Clicking the 'Add Component' button scrolls down to the 'Add New Component' buttons.
2015-01-12 13:42:53 +03:00
Matjaz Gregoric
0b8471d6b3 Toggle aria-disabled attribute on New Course/New Library buttons. 2015-01-12 13:42:50 +03:00
Braden MacDonald
4d454e3078 Documentation updates from catong 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
d38e69c69a Acceptance & Jasmine tests for library permissions editor 2015-01-12 13:37:59 +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
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
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
E. Kolpakov
ff1a08cbd5 Paging for LibraryView added with JS tests. 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
ataki
2b18f3213f Fix visual bug with large file error msg in cms.
This hotfix patches the functionality of the GridFS PR
by dismissing the error msg when the user uploads a large
file and fails, then uploads a regular file. This
includes a Jasmine test to cover this case.
2015-01-10 11:53:11 -08: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
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
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
Chris
c5d2dd7536 Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0
* updating vendor files
* updating class syntax (to new FA-based classes) for all UI elements
* correcting broken tests
2015-01-06 15:24:12 -05:00
Syed Hassan Raza
1e11baede4 Add aria-disabled attribute
TNL-997
2015-01-06 17:21:49 +05:00
David Baumgold
5360d77b79 Refactor sock HTML to have text in Mako template 2014-12-19 14:20:14 -05:00