Commit Graph

2914 Commits

Author SHA1 Message Date
Jonathan Piacenti
568acb56b0 Library setting for show/hide children previews + client-side code to toggle it. 2015-03-18 08:59:58 -05:00
David Baumgold
c6992688ac Merge pull request #7314 from edx/load-tender-js-from-tenderapp-subdomain
Define TENDER_SUBDOMAIN so that we can still use vanity URLs
2015-03-16 10:44:00 -04:00
Waqas Khalid
a8457c4fb4 Merge pull request #6871 from edx/waqas/studio-mathjax-unit-problem
Unit page doesn't load when mathjax is down
2015-03-16 18:47:06 +05:00
Waqas Khalid
729dd24c82 Unit page doesn't load when mathjax is down
When mathjax is down studio page doesn't work as
it wait for mathjax to load. I replaced the hard
dependency with soft dependency now unit page can
load with mathjax.
2015-03-16 15:12:01 +05:00
David Baumgold
cfb1ec115a Define TENDER_SUBDOMAIN to that we can still use vanity URLs 2015-03-11 16:36:55 -04:00
Sarina Canelake
9d9dccdb97 Merge pull request #7299 from edx/sarina/indagation/TNL-1461
Add pointer-events: none for fa-lock and fa-eye
2015-03-11 11:04:26 -04:00
Sarina Canelake
d1543b6156 Add pointer-events: none for fa-lock and fa-eye [TNL-1461] 2015-03-11 10:20:26 -04:00
Jonathan Piacenti
8ad4d081fb Added library import and export via .tar.gz'd XML files. 2015-03-10 21:29:29 +00:00
asadiqbal
5a7ac441e5 Entrance Exam authoring and messaging updates
Multi-commit history:
- hide drag functionality for entrance exam section.
- hide entrance exam subsection elements e.g. delete, drag, name etc.
- show unit/verticals expanded in case of entrance exam
- modify code in order to allow user to update entrance exam score from UI.
- write down unit tests.
- write down Jasmine tests.
- add bok-choy test
- updated bok-choy test
- internationalize string
- repositioned sequential block creatori
- SOL-221 (entrance exam message)
- SOL-199 LMS Part (show entrance exam content) and hide the course navigation bar.
- redirect the view in case of entrance exam.
- update code structure as per suggestions
- write down unit tests
- fix pep8
- instead of hiding the exam requirement message, now also showing the exam the completion message (success state).
- write down unit test to show exam completion message.
- Update code as per review suggestions
- update doc string
- addressed review suggestions
- change sequential message text
- css adjustments
- added new css class for entrance exam score in studio
- added Jasmine test for remaning coverage
- sequential message should appear under the context of entrance exam subsection.
- updated text in CMS and LMS as per suggestions.
- added unit text to insure sequential message should not be present in other chapters rather then entrance exam.
- skip setter if empty prerequisite course list
- exclude logic from xblock_info.js that is specifically related to entrance exam.
- added js tests and updated code as per suggestions
- added tests
- addressed several PR issues
- Several small fixes (style, refactoring)
- Fixed score update issue
- added some more unit tests.
- code suggested changes.
- addressed PR feedback
2015-03-10 09:24:43 -04:00
Sarina Canelake
4133740a2f Add default logo to Studio 2015-03-06 13:05:03 -05:00
Xavier Antoviaque
7ac581293d Merge pull request #7059 from open-craft/library-comments
Make UI styling consistent between libraries and courses tabs when empty (SOL-232)
2015-02-26 16:41:05 +01:00
Jonathan Piacenti
f952a33ec3 Make UI styling consistent between libraries and courses tabs when empty. 2015-02-24 20:29:54 +00:00
Dino Cikatic
b597df2e39 Changing search_reindex call to be more inline with DRF convention 2015-02-24 10:58:50 -05:00
Jesse Zoldak
047ca495c6 Disable flakily failing JS tests TNL-559 2015-02-20 10:35:54 -05:00
muzaffaryousaf
a31e38416d Adds content group "Delete" and "Usage" functionality to group configurations page on cms.
TNL-1185
2015-02-20 14:56:22 +05:00
Jesse Zoldak
44ff43ab1f Disable flakily failing JS tests TNL-559 2015-02-19 07:24:27 -05:00
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
Sarina Canelake
011a5f9410 Merge pull request #6754 from OmarIthawi/edraak/omarithawi/bulk-mail-rtl
TinyMCE RTL in course bulk email
2015-01-30 09:12:56 -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
Will Daly
b467ae8cde Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS"
This reverts commit b8184d188f.
2015-01-28 17:26:46 -05:00
Andy Armstrong
6201af652b Merge pull request #6765 from edx/andya/requirejs-in-lms
Add RequireJS to the LMS
2015-01-27 17:57:33 -05:00
Will Daly
b8184d188f Add RequireJS and RequireJS Optimizer configuration to the LMS
[second attempt which addresses bug building Studio]
2015-01-27 17:56:29 -05:00
Omar Al-Ithawi
38db6e695d Giant fixups for the editors around the studio 2015-01-27 11:11:55 +02: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
Will Daly
1f2b155746 Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS"
This reverts commit 1d6fceda50.
2015-01-21 17:13:27 -05:00
Will Daly
1eaf84a443 Merge pull request #6544 from edx/will/requirejs-optimizer-lms
Add RequireJS and RequireJS Optimizer configuration to the LMS
2015-01-21 15:23:35 -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
c2a0b0f06e Merge pull request #6631 from edx/gprice/video-upload-improvements
Improve code for video upload feature
2015-01-20 14:47:14 -05:00
Will Daly
1d6fceda50 Add RequireJS and RequireJS Optimizer configuration to the LMS
Respond to review comments:

- Rename build and config files for consistency between lms/studio.
- Fix merge conflicts with lms require config.
- Devstack uses optimized pipeline to skip require JS optimizer step
- Add tests for render_require_js_path_overrides
2015-01-20 14:27:23 -05:00
Adam
11428fa632 Merge pull request #5237 from mtyaka/mathjax-upgrade
Upgrade MathJax to 2.4
2015-01-20 12:26:38 -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
Matjaz Gregoric
e255f4b021 Upgrade MathJax to 2.4.
Several IE bugs have been fixed in 2.4.
2015-01-19 08:10:45 +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
Brian Talbot
69ed266f7e Studio: removing left whitespace from icons in unit visibility controls 2015-01-15 10:37:25 -05:00
Frances Botsford
6398af715a Make group config styles generic 2015-01-15 10:37:25 -05:00
Frances Botsford
8abec98c3d fixed group config sidebar spacing, icon cleanup 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
Frances Botsford
ebeb9a9948 added cohort group editing styles 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
Frances Botsford
4f99657b6d first pass at adding cohort groups to group configuration page 2015-01-15 10:33:49 -05:00
Andy Armstrong
21a9873757 Don't allow visibility editing in content libraries 2015-01-15 10:33:48 -05:00