Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
27,950 Commits 1 Branch 0 Tags
df5dd1a4dbfce2df4e828db5dc75ca9f33c7e774
Commit Graph

2001 Commits

Author SHA1 Message Date
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
Braden MacDonald
6be35e0fc1 Merge pull request #6459 from edx/content-libraries 
Content libraries MVP
 2015-01-13 11:20:20 -08:00
Waheed Ahmed
05d9d139b5 Fixed CodeMirror editor view height in studio. 
TNL-920
 2015-01-13 12:11:20 +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
Matjaz Gregoric
f8f08b78a9 Libraries UI: remove underline on hover. 
This changes the style of the inactive libraries/courses tab when hovering.

Only the active tab on the dashboard page gets the blue underline.
When hovering over an inactive tab, the color of the text changes,
but the underline does not appear.
 2015-01-12 13:41:03 +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
Braden MacDonald
376e698764 Display the library key on the library view in Studio 2015-01-12 13:37:57 +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
David Baumgold
1b02ed5d95 Merge pull request #6252 from edx/studio-move-branded 
Placeholder image for Open edX Studio logo, when not running on edx.org
 2015-01-08 12:42:40 -05:00
David Baumgold
96d86e4e17 Placeholder image for Open edX Studio logo, when not running on edx.org 2015-01-08 12:42:26 -05: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
Marco Morales
f91c5ffd1f Merge pull request #6099 from edx/marco/sass-variable-patterns-cleanup 
SASS compilation variable conventions update
 2015-01-06 14:47:24 -05:00
Syed Hassan Raza
1e11baede4 Add aria-disabled attribute 
TNL-997
 2015-01-06 17:21:49 +05:00
Marco Morales
7d110a86d4 cleanup to PR feedback for shoppingcart and instructor2 scss partials 2015-01-05 18:57:58 -05:00
Marco Morales
38b7e4cc50 SASS compilation variable conventions update, focusing on basic colors, baseline variable usage for padding and margins, ui-depth extends, along with other small fixes. The intent with this is to not have any user-facing impact, and instead move us closer toward having files that use our newer sass conventions. 2015-01-05 17:30:13 -05:00
cahrens
6846e25bbb Revert #6192. It was causing a JS error on devstack. 
TNL-1070
 2014-12-23 16:13:45 -05:00
David Baumgold
5360d77b79 Refactor sock HTML to have text in Mako template 2014-12-19 14:20:14 -05:00
Fred Smith
251407d7d2 Merge pull request #6314 from edx/release 
Release
 2014-12-19 13:23:22 -05:00
Waheed Ahmed
2ffe6032bf Fixed CodeMirror editor view height in studio. 
TNL-920
 2014-12-18 11:42:18 +05:00
Chris
578c96a8c3 Studio video upload feature template and styling 
Co-authored-by: Greg Price <gprice@edx.org>
 2014-12-15 13:22:02 -05:00
Greg Price
61cb51596d Add front end for Studio video upload feature 
Co-authored-by: Chris <crodriguez@edx.org>
Co-authored-by: Mark Hoeber <hoeber@edx.org>
 2014-12-15 13:09:59 -05:00
Calen Pennington
d919d2ae46 Teach LMS how to render XBlockAsides 
[PLAT-217]
 2014-12-13 08:26:28 -05:00
Sarina Canelake
5c433ec9a1 Merge pull request #5731 from Stanford-Online/ataki/upstream 
Limit Upload File Sizes to GridFS
 2014-12-11 16:36:30 -05:00
zubair-arbi
f62e5347e1 round-off weight, min_count and drop_count values while returing grading policy 
TNL-884
 2014-12-11 12:27:01 +05:00
Jim
fb9320afc1 Limit Upload File Sizes to GridFS. 
This commit puts a limit on the size of files that
course staff can upload to MongoDB. The limit is
enforced on the frontend in javascript as well
as backend via the /upload endpoint.

The limit is hard-coded in cms/envs/common.py and
may be changed according to the user's custom
needs.

If the user tries to upload a file that's too
large, an error message will pop up, with a
customizable url that pointing the user to an
external page with an alternate upload procedure.
This url is specified im cms/envs/common.py.
If not set, this url will not be displayed.
 2014-12-09 13:30:45 -08:00
Andy Armstrong
356b2335e9 Add base support for cohorted group configurations 
TNL-649
 2014-12-05 09:52:26 -05:00
Renzo Lucioni
55922f896d hotfix-2014-11-20 2014-11-20 12:00:19 -05:00
Adam Palay
624360d1d6 serve mathjax from mathjax's cdn (TNL-823) 2014-11-20 09:36:16 -05:00
polesye
b6d8291996 TNL-772: Fix course time settings. 2014-11-20 14:56:12 +02:00
Waheed Ahmed
2d46a79345 Updated open sans webfonts with latest. 
TNL-395
 2014-11-18 12:18:12 +05:00
David Baumgold
e00424a091 Moved Studio images from img/ directory to images/ directory 
OPEN-304
 2014-11-12 17:19:23 -05:00
cahrens
99c4413bd0 Simply check for existing text and type. 2014-11-10 13:13:48 -05:00