Commit Graph

19654 Commits

Author SHA1 Message Date
Miles Steele
cc737cb1b2 rename enrollment section to membership 2013-08-02 09:52:12 -04:00
Miles Steele
02432e05cc integrate slickgrid, add instructor.enrollment, add instructor.access, refactor & clean 2013-08-02 09:52:12 -04:00
Miles Steele
5d4a5fcdb0 add slickgrid assets 2013-08-02 09:52:12 -04:00
Miles Steele
6ff568ce9d remove pid and version 2013-08-02 09:52:12 -04:00
Miles Steele
daeabb06bf add instructor dashboard beta (partial) (view, template, coffeescript, api endpoints) 2013-08-02 09:52:12 -04:00
Miles Steele
4238cb569f fix repoint dump_grades script 2013-08-02 09:52:11 -04:00
Miles Steele
2e1d729e57 move instructor views.py to views/legacy.py 2013-08-02 09:52:11 -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
jkarni
8b34ee08a3 Merge pull request #525 from edx/jkarni/docs-merge
Jkarni/docs merge
2013-08-02 06:25:41 -07: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
Peter Fogg
0cf42edc80 Merge pull request #552 from edx/peter-fogg/course-update-notifications
Notifications for course updates.
2013-08-02 06:10:50 -07:00
Julian Arni
a4d7bff4b1 Fix reference issues 2013-08-02 08:08:51 -04:00
Julian Arni
2bb7372a6b Remove django.utils dependency
And fix path issues.
2013-08-02 08:08:51 -04:00
Julian Arni
78ca8fb7be Add rtd-specific syspath 2013-08-02 08:08:51 -04: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
Peter Fogg
1ebedc9a4b Don't show update in the DOM on AJAX error. 2013-08-01 17:17:36 -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
John Jarvis
3d87dd8c58 Merge pull request #551 from edx/jarv/remove-ADMINS
changing default ADMINS to an empty tuple
2013-08-01 14:02:26 -07:00
Vik Paruchuri
178be44333 Remove legend, start to edit rubric 2013-08-01 16:25:21 -04:00
David Baumgold
2ad78d949a Merge pull request #538 from edx/db/course-team-admin-grants
Add error messaging to course team page
2013-08-01 11:58:52 -07:00
Adam
76cf2027e9 Merge pull request #424 from edx/fix/adam/dash-reset
convert user objects to unicode, improve error logging
2013-08-01 11:57:07 -07:00
Adam Palay
0076d6a64d fix error handling
distinguish logged error and instructor-facing error
2013-08-01 14:56:28 -04:00
Adam Palay
bbd52e05a2 converts user objects to unicode, improve error logging 2013-08-01 14:56:27 -04:00
David Ormsbee
b6b4f0f987 Dependency warning message on requirements files 2013-08-01 14:49:49 -04:00
David Baumgold
1b83cfc409 Merge pull request #546 from edx/db/dev-views
Create urls/views/templates for dev-only views
2013-08-01 11:47:39 -07:00
David Baumgold
d8a7901688 Add a lettuce test for removing own admin permission on course team 2013-08-01 14:44:38 -04:00
Julian Arni
0908ce408a Fix 'images' capitalization 2013-08-01 14:29:53 -04:00
David Baumgold
741bbb3f92 pylint cleanup 2013-08-01 14:16:55 -04:00
Adam
244e731f5d Merge pull request #553 from edx/adam/i18n-bug-fixes
Adam/i18n bug fixes
2013-08-01 11:16:21 -07:00
Adam Palay
3be155bd88 fix tests, remove zh_CN from config until we have support 2013-08-01 14:13:41 -04:00
Adam Palay
ac1ac2d93d i18n template fixes
syntax fix
2013-08-01 14:13:41 -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
Anton Stupak
aefb1aa9c8 Hides Error notification when subtitle file is missing
Refactors bind and indexOf.
Adds error message when specify the wrong selector.
Adds some of the requested documentation.
Refactors 01_initialize.js.
Fixes to 03_video_player.js
2013-08-01 20:48:24 +03:00
Anton Stupak
7d215e12b7 Fixes InvalidStateError failures in FF and more.
Fixes HD button
Disables Fullscreen mode in the Studio
Fixes ui controls bug
2013-08-01 20:47:55 +03:00
David Baumgold
53ae177178 Curly quotes around course name 2013-08-01 13:46:40 -04:00
jmclaus
af0149e52a Fixes of different issues
Video_player_spec wouldn't run because of a syntax error.
All test would fail when error() was called
on an undefined JQuery object.
Tidy up spy on onTouchBaseDevice.
Fix dependecies between RequireJs modules
2013-08-01 20:46:33 +03:00
jmclaus
47dac695fa Reduces the number of calls to initialize() in video_caption_spec.
All the tests run and pass when enabled.
Only video_player has issues left
Adds error logging to console if captions not found
Fix problems with memory leaks
2013-08-01 20:45:31 +03:00
David Baumgold
16e2ee8011 Abstract out the unknown error message and i18n 2013-08-01 13:43:40 -04:00
David Baumgold
1eae675952 Create a dedicated CMS.Models.Course Backbone model
Initialize on every page that has a context_course set
2013-08-01 13:39:47 -04:00
Peter Fogg
d2194b2211 Notifications for course updates. 2013-08-01 13:23:41 -04:00
Valera Rozuvan
4778c535ac Restructuring Video Alpha Jasmine tests.
Fixing more tests.
Turned on all Video Alpha tests.
More tests fixing.
Turned on all tests.
Fixing more tests.
Worked on tests at the beginning of video_player_spec.js. Not finished
All Video Alpha tests completed and can be run individually. When run individually - they all pass.
Added jasmine_test_runner.html to gitignore.
2013-08-01 20:08:45 +03:00
jmclaus
8c3f4388d6 video_speed_control passes all tests except 1
Mocked loading of captions.
Fixed remaining tests in captions.
Fixed failing tests in speed control, and quality control. Turned off all VideoAlpha tests because browser crashes when all are run at once. To check that they are passing, go through each file one by one, replacing xdescribe with describe. Dont forget to change back to xdescribe when the test was run and turns out to be OK.
Some tests at the end of video_player_spec.js pass
Further fixing tests in video_player_spec file.
transfers changes to test_logic from master to __init__ and other files
Fixing more tests.
2013-08-01 20:08:45 +03:00
Valera Rozuvan
c49ad095d5 Broken initialize.js. First try at making all submodules functions public (available via state object).
More work on making modules completely visible via state object.
All tests pass in video_volume_control_spec.js
Cleanup of initial CoffeeScript generated video_speed_control_spec.js
Some cleaning up in volume_control. Most tests pass in speed_control
Cleanup of CoffeeScript generated video_progress_slider_spec.js
Most tests in video_progress_slider_spec.js pass (except for those having an issue with subtitles). progressSlider functions again in Chrome
Cleanup of CoffeeScript generated video_control_spec.js
All tests pass in video_control_spec.js
Cleanup of CoffeeScript generated video_caption_spec.js
Some progress in video_caption_spec.js
Fix bug with video progress slider. Now browser doesnt freeze any more. ^_^
Some cleaning up.
2013-08-01 20:08:45 +03:00