Commit Graph

1966 Commits

Author SHA1 Message Date
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
cahrens
c550963fb9 Set up validation_messages so that it goes through the RequireJS optimizer. 2014-11-10 13:13:44 -05:00
Christina Roberts
fd587b976c Merge pull request #5710 from edx/christina/general-component-errors
Support validation messages for any xblock (on container page).
2014-11-06 16:47:49 -05:00
Brian Talbot
181715f200 Studio: revising xblock validation message list styling 2014-11-06 15:49:10 -05:00
Brian Talbot
31dce7671e Studio: revising element-level xblock information styling 2014-11-06 15:49:10 -05:00
cahrens
08ce09bde7 Display validation messages for any xblock on the container page.
TNL-683
2014-11-06 15:48:55 -05:00
David Baumgold
cfaa9dd588 Rename Studio logo
OPEN-301
2014-11-06 09:34:17 -05:00
David Baumgold
688d4c968a Merge pull request #4806 from edx/talbs/studio-stylesweep-unused
Studio: Removing older/deprecated style rules
2014-11-03 13:36:05 -05:00
zubair-arbi
dd71ca0f8a fix click event for actual target
TNL-138
2014-11-03 09:37:02 -05:00
David Baumgold
2a669e57b9 re-add search-icon.png 2014-10-30 16:25:36 -04:00
David Baumgold
7141e4851b content-types is no longer around 2014-10-30 13:52:31 -04:00
David Baumgold
6577138dff Removed more files from cms 2014-10-30 13:41:30 -04:00
David Baumgold
766fac735f Remove extra large-FOO-icon.png files 2014-10-30 13:34:53 -04:00
Daniel Friedman
355a3b45ad Merge pull request #5764 from edx/dan-f/highlight-active-unit-in-outline
Highlight active unit in studio container page's outline
2014-10-30 13:13:34 -04:00
David Baumgold
22ed23ae8d deleting more things 2014-10-30 12:07:58 -04:00
Brian Talbot
ee368e8740 Studio: cleaning up/removing unused sass
* removing unused font-family-centric Sass variables
* removing unused graphic images and Sass references
* clean up of style removal fallout
2014-10-30 12:07:52 -04:00
Daniel Friedman
3b3b3dcd9e Show current unit in unit outline.
TNL-291
2014-10-30 11:08:49 -04:00
Brian Talbot
a4e1cc483b Studio: correcting minor Sass indent and property syntax issues 2014-10-30 11:08:49 -04:00
Brian Talbot
d88dcfbd7e Studio: visually styling current unit on course unit/container view's mini outline 2014-10-30 11:08:49 -04:00
zubair-arbi
293ac9277a show warning on navigate away from import page only for first two stages
TNL-554
2014-10-24 16:22:33 +05:00
stephensanchez
61436ea195 Merge branch 'release' 2014-10-23 19:41:31 +00:00
Brian Talbot
d238fa1477 Studio: resolving a display issue for longer usernames in Studio's navigation 2014-10-20 16:55:14 -04:00
Jesse Zoldak
1d7c8d39b2 Update js-test config with new sources 2014-10-20 15:23:34 -04:00
polesye
83fbdc2ac4 TNL-481: Add RequireJS Optimizer. 2014-10-20 17:33:21 +03:00
Frances Botsford
c92f52e0bd cleanup and response to PR review 2014-10-17 13:51:43 -04:00
Omar Al-Ithawi
d8bf0ef5a5 Elegant rtl/ltr css switch, LMS RTL fixes, language aware @cache_if_anonymous 2014-10-17 13:51:42 -04:00
Frances Botsford
ce3cb27864 switching RTL on the fly - added bi-app for sass compiling 2014-10-17 13:51:42 -04:00
Frances Botsford
e255ac1f29 Initial pass at LMS and Studio RTL 2014-10-17 13:51:42 -04:00
Jesse Zoldak
9a8753d41e Disable flaky JS FileUploader SystemFeedback and NotificationView tests
TNL-559
2014-10-03 10:50:20 -04:00
Oleg Marshev
f020d1c584 Show date and time on Schedules and Details in UTC (TNL-85). 2014-10-03 11:17:00 +03:00
cahrens
2286366c90 Remove unused files, add missing spec file. 2014-10-02 15:05:17 -04:00
Andy Armstrong
8627fdef32 Support adding students to a cohort via the instructor dashboard.
TNL-163
2014-10-01 09:22:31 -04:00
polesye
2997a80aa5 Video link obfuscation. [BLD-1230] 2014-09-16 18:13:07 +02:00
Nimisha Asthagiri
2930e29a01 LMS-11373 Fix Studio drag and drop race condition. 2014-09-11 10:53:05 -04:00
Ben Patterson
b3594b699a Merge pull request #5169 from edx/benp/solano2-jstest-failure
TE-468 JS test improvement: test for attributes specifically
2014-09-10 18:44:16 -04:00
Ben Patterson
32071af4b6 TE-468 JS test improvement: test for attributes specifically
This test is failing in a different test environment (Solano) because
the built html has reversed the order of the width and height attributes
from what we are expecting. This change focuses the assertion to the
pieces that are important (as noted in the unchanged comment above
the assertion).
2014-09-10 16:59:28 -04:00