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

5637 Commits

Author SHA1 Message Date
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
Greg Price
629b0a3c7a Merge pull request #6733 from edx/gprice/video-upload-progress-bar 
Add progress bars for Studio video uploads
 2015-01-26 17:34:37 -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
Carlos Andrés Rocha
78375b797b Merge pull request #6738 from edx/rc/2015-01-20 
Rc/2015 01 20
 2015-01-23 16:10:28 -05:00
David Baumgold
f2d549b619 Proxy TENDER_DOMAIN variable from environment to Studio settings 2015-01-22 10:56:30 -05:00
Will Daly
fcd7736d29 Merge pull request #6721 from edx/will/revert-requirejs-changes 
Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS"
 2015-01-21 19:07:34 -05:00
Braden MacDonald
4198da1ae1 Merge pull request #6657 from open-craft/fix-library-old-mongo-default 
Fix errors with libraries when old mongo is default (first) modulestore (SOL-234)
 2015-01-21 15:05:12 -08: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
Braden MacDonald
025f046b04 Fix errors with libraries when old mongo is default (first) modulestore 2015-01-21 11:01:52 -08:00
David Baumgold
e6e443c712 Merge pull request #6674 from edx/disable-pylint-name-errors-on-settings 
Ignore invalid-name errors for settings files
 2015-01-21 10:40:05 -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
Marco Re
d65902ed3c Add themes files to staticfiles_dir in Studio 2015-01-17 13:24:54 +01: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
David Baumgold
ef43840a79 Ignore invalid-name errors for settings files 
path.py objects report themselves as class objects, which confuses the heck out of
pylint. It tries to match variable names using the class-rgx regular expression
instead of the constant-rgx regular expression, and it doesn't match, so it
throws an error. Not sure how to fix pylint, so we'll just ignore these errors.
 2015-01-16 11:37:28 -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
John Eskew
9e20057da1 Merge pull request #6478 from edx/jeskew/change_handled_exception_for_assets 
Handle the correct exception upon asset not found.
 2015-01-15 10:44:01 -05:00
cahrens
9607aa233c Remove unnecessary pylint suppression. 
Possibly caused by a bad merge.
 2015-01-15 10:37:25 -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
Andy Armstrong
bca6274eb5 Miscellaneous text updates 2015-01-15 10:33:48 -05:00
Andy Armstrong
798342e177 Rename 'cohorted content group' to 'content group' 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
cahrens
4b00566e4d Update course access check. 2015-01-15 10:33:48 -05:00
Brian Talbot
d556cdd586 syncing icon class syntax + semantically hiding changed icons from assistive tech 
TNL-1137
 2015-01-15 10:33:47 -05:00
Andy Armstrong
b77e65cdc2 Assign cohorts to groups in the instructor dashboard 
TNL-653
 2015-01-15 10:33:46 -05:00
Brian Talbot
6fb45ef95c Studio: resolving scroll/overflow UI in component visibility settings 2015-01-15 10:33:45 -05:00
Brian Talbot
95ee72607d Studio: resolving visual spacing of hide from students checkboxes 2015-01-15 10:33:45 -05:00
Andy Armstrong
4fa33e25ed Studio support for cohorted courseware 
TNL-652
 2015-01-15 10:33:45 -05:00
Brian Talbot
206ea8caeb Studio: adding UI and styling for component-level access modal 2015-01-15 10:33:45 -05:00