Peter Fogg
f317244ac4
Convert Video Alpha to metadata-only.
2013-08-06 13:23:33 -04:00
Peter Fogg
74b815274f
Add a list view for metadata editor.
...
This is to be used with VideoAlpha's functionality allowing a choice
of multiple HTML5 video sources.
2013-08-06 13:23:33 -04:00
Adam Palay
402d50bbf1
tz fix in openendedchild
2013-08-06 11:17:39 -04:00
Chris Dodge
7a180c290b
handle cases where the 'base-asset-url' is undefined, e.g. in Jasmine tests
2013-08-06 11:16:37 -04:00
cahrens
3732d418c9
Add helper methods to hide internals of how users are enrolled in courses.
...
Remove _
Minor cleanup.
2013-08-06 09:36:39 -04:00
Alexander Kryklia
f3a4d49591
Adds RawDescriptro for VideoAlpha
2013-08-06 11:29:51 +03:00
Chris Dodge
dff3312178
refactor the coffeescript a bit more. Hopefully to resolve Jasmine failures
2013-08-05 21:50:55 -04:00
Chris Dodge
d2f911211e
fix cut/paste comment confusion
2013-08-05 16:15:04 -04:00
Chris Dodge
da9a4b5d4f
alter the HTML editor so that it can do the /static/ <--> /c4x/ substitutions when toggling back and forth between the visual and advanced editors
2013-08-05 16:15:03 -04:00
Chris Dodge
3dbe4c189f
add unit tests around asserting that /static/ links are not re-written on import
2013-08-05 16:15:03 -04:00
Chris Dodge
d329e3c833
don't attempt to do URL rewriting in the import step, let the LMS/CMS runtimes do it on the fly on reference
2013-08-05 16:15:03 -04:00
Chris Dodge
6200b2903f
have the Files and Upload pages surface a 'portable_url' which uses the /static/ shorthand which is more portable across course runs
2013-08-05 16:15:03 -04:00
Chris Dodge
9e96b9525b
tie in the normal courseware link url rewriting in capa module since that presents HTML via an Ajax callbacks and not via module_render.py
2013-08-05 15:24:19 -04:00
Alexander Kryklia
16cee198b1
Merge pull request #386 from edx/alex/editor-tabs-for-videoalpha
...
adds TabsEditingDescriptor, pluggen in VideoAlphaDescriptor
2013-08-05 08:57:53 -07:00
Valera Rozuvan
a0aa652df4
Fixed typo of function call. Added comment why it is necessary.
2013-08-05 15:00:18 +03:00
Alexander Kryklia
6225c2a532
Fixes
2013-08-05 13:38:32 +03:00
Alexander Kryklia
da4f295d00
Add TabsEditingDescriptor for VideoAlpha
...
Updates comment
Make Model descriptor class property.
Fix tests
2013-08-05 13:38:32 +03:00
chrisndodge
85267e6a73
Merge pull request #535 from edx/feature/cdodge/add-display-org-and-coursenum
...
add display_coursenumber and display_organization fields on the CourseModule
2013-08-04 18:00:29 -07:00
Chris Dodge
192d51bf7a
touch-ups per review feedback
2013-08-02 21:37:27 -04:00
Julian Arni
562456ade7
Make descriptorsystem inherit from Runtime
2013-08-02 15:36:15 -04:00
Vik Paruchuri
ea2b9191c1
Allow student to switch between rubrics, tell user once peer grading required amount is done
2013-08-02 15:30:17 -04:00
marco
478fa18beb
merge edit cleanup, nothing new
2013-08-02 14:30:04 -04:00
Diana Huang
4005b3bd79
Merge pull request #554 from edx/diana/django-ratelimit
...
Limit the rate of logins
2013-08-02 11:02:04 -07:00
Vik Paruchuri
aa09006247
Hide and show multiple rubrics
2013-08-02 13:53:07 -04:00
Vik Paruchuri
5da5d55630
Fix peer grading feedback issue
2013-08-02 13:41:37 -04:00
marco
ec99e20a35
styled rubric, dividers between sections
2013-08-02 13:37:53 -04:00
Vik Paruchuri
932bbd2592
Fix text issue
2013-08-02 13:23:03 -04:00
Vik Paruchuri
bca308e70e
No more log.info
2013-08-02 13:10:03 -04:00
Miles Steele
3d44c83fa7
Merge pull request #322 from edx/feature/msteele/instrdash
...
Instructor Dashboard v2 (disabled)
2013-08-02 10:03:06 -07:00
Vik Paruchuri
a939c152c8
Add in support for multiple rubrics
2013-08-02 12:56:31 -04:00
Vik Paruchuri
e2c4b5016a
Merge remote-tracking branch 'origin/feature/vik/oe-ui' into feature/vik/oe-ui
2013-08-02 12:13:02 -04:00
Vik Paruchuri
30e506777e
Render multiple rubrics, collapse rubrics
2013-08-02 12:12:38 -04:00
Adam
eb9f03479a
Merge pull request #558 from edx/fix/adam/mrev-rounding
...
change int to float for student progress display
2013-08-02 09:00:23 -07:00
Adam Palay
1a463962b9
change int to float for student progress display
2013-08-02 11:34:12 -04:00
Diana Huang
c867be7961
Limit the rate of logins.
2013-08-02 11:23:59 -04:00
Chris Dodge
ebbeeb16a2
add some unit tests for the new fields
2013-08-02 09:56:19 -04:00
Miles Steele
5d4a5fcdb0
add slickgrid assets
2013-08-02 09:52:12 -04:00
Chris Dodge
3a2bb7ba01
add escaping
2013-08-02 09:51:41 -04:00
Chris Dodge
93df9c4c30
resolve merge conflicts
2013-08-02 09:41:02 -04:00
Christina Roberts
23efbf74fd
Merge pull request #557 from edx/christina/html-latex
...
Fix missing source_code in LaTeX HTML.
2013-08-02 06:11:36 -07:00
polesye
042b7d5f60
Merge pull request #428 from edx/valera/video_alpha2_refactor
...
Valera/video alpha2 refactor
2013-08-02 01:04:13 -07:00
marco
cc7c025478
Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui
2013-08-02 00:57:50 -04:00
marco
0e8c29989c
style cleanup for open ended assessments, cleaning up workflow header, style definitions for rubrics are commented out momentarily, and an open issue for unicode rendering on the show and hide prompt area still remains
2013-08-02 00:57:31 -04:00
cahrens
d63813b4aa
Fix missing source_code in LaTeX HTML.
...
STUD-565
2013-08-01 17:27:34 -04:00
brianhw
a628b62d1e
Merge pull request #511 from edx/feature/brian/audit-log
...
Use audit logger for logging of logins in external_auth...
2013-08-01 14:08:08 -07:00
Vik Paruchuri
178be44333
Remove legend, start to edit rubric
2013-08-01 16:25:21 -04:00
Anton Stupak
6ba5d472b3
Fix with sequence switching and more.
...
Studio: adds in new Sass file for Studio-specific
xmodule presentation and removes full screen control
from video alpha display UI.
Adds jasmine test for subtitles scroll.
Adds tests for caption change height functionality.
Uses gettext wrapper.
Fixes caption change height functionality.
Removes IS_CMS, isCms flags.
2013-08-01 20:50:32 +03:00
Anton Stupak
65aa7d4f2e
Fixes bug with Fullscreen mode and more.
...
Fixes subtitles hiding on slidermove and their height.
2013-08-01 20:50:16 +03:00
Anton Stupak
bf237b3762
Change naming of private functions and more.
...
Disables tests.
Refactors creation of video element.
Renames renderElements to initialize.
Fixes bug on slider move, subtitles are hidden.
2013-08-01 20:49:49 +03:00
jmclaus
a77c386f76
Removes empty bindHandlers function from video_progress_slider
...
Refactors trigger function.
Fixes Ui bugs: captions.
Fixes bug with Youtube on page load.
Hotfixes html5 video streaming bug.
Adds test video files to the project.
2013-08-01 20:49:08 +03:00
