Alexander Kryklia
04294b04df
Adds oauth checking to acceptance tests
2013-09-09 19:13:21 +03:00
Alexander Kryklia
b5dc03ec36
Acceptance test for LTI module (not finished), but working
2013-09-09 19:13:20 +03:00
Valera Rozuvan
e4bad0a6a1
Fixing Jasmine tests.
2013-09-09 19:13:20 +03:00
Valera Rozuvan
729d74f129
Fixing issues found by Anton during review of PR 804.
...
Changed use of IDs to classes. Simplified lti.js - now simple one function.
Updated tests.
2013-09-09 19:13:20 +03:00
Alexander Kryklia
c8ea4da2cc
Change h2 to h3
2013-09-09 19:13:20 +03:00
Alexander Kryklia
e4e7a4e30b
Remove ipdb.
2013-09-09 19:13:20 +03:00
Valera Rozuvan
417ddcaaa1
LTI module with tests
2013-09-09 19:13:20 +03:00
Brian Talbot
0052b87c37
Merge pull request #886 from edx/talbs/lms-disabledui
...
LMS: General Disabled Link/Button State Styling
2013-09-09 08:50:59 -07:00
Brian Talbot
422c6282e4
LMS: adds in pseudo-state styling for disabled buttons/links (by attribute or standard class names)
2013-09-09 11:43:55 -04:00
jkarni
b53d55543d
Merge pull request #823 from edx/jkarni/feature/multiple-assets-upload
...
Add support for multiple file uploads
2013-09-09 06:47:58 -07:00
chrisndodge
9c6987d010
Merge pull request #873 from edx/fix/cdodge/enable-course-image-setting
...
also even when we have a marketing site, we still need a course image fo...
2013-09-06 16:58:54 -07:00
Vik Paruchuri
499d272adc
Merge pull request #825 from edx/fix/vik/staff-information
...
Staff information about duplicate ORA submissions
2013-09-06 14:14:31 -07:00
Adam
3184939138
Merge pull request #885 from edx/release
...
Release
2013-09-06 13:51:03 -07:00
Adam
c5a732206c
Merge pull request #883 from edx/hotfix/cdodge/fix-tab-rename
...
fix edit tab bug and add unit test
2013-09-06 13:47:48 -07:00
Sarina Canelake
d84de2f890
Merge pull request #884 from edx/sarina/instrument-bulk-email
...
Add datadog tracking for bulk email
2013-09-06 13:28:07 -07:00
Sarina Canelake
4b9df2e998
Add datadog tracking for bulk email
2013-09-06 16:18:40 -04:00
Chris Dodge
10b7c13652
add comment
2013-09-06 16:05:41 -04:00
Chris Dodge
12bd7309d2
add content assertions
2013-09-06 16:03:09 -04:00
David Baumgold
3b627e8c80
Merge pull request #879 from edx/db/remove-template-loader
...
Remove Studio JS template loader
2013-09-06 12:26:50 -07:00
Don Mitchell
0848360436
Merge pull request #844 from edx/dhm/editable_metadata
...
refactoring of platform to xblock 0.3 w/ refactoring of inheritance in the platform to a consistent representation.
2013-09-06 11:58:36 -07:00
Chris Dodge
c7f2f27708
fix bug and add unit test
2013-09-06 14:47:59 -04:00
Calen Pennington
0cac1c3bee
Merge pull request #881 from cpennington/dhm/editable_metadata
...
Include mixins in advanced component class loading and preview modules
2013-09-06 10:52:03 -07:00
Calen Pennington
38de05c76c
Include mixins in advanced component class loading and preview modules
2013-09-06 13:37:03 -04:00
Vik Paruchuri
d3580994c8
Merge pull request #870 from edx/fix/vik/oe-nopath
...
Fix nopathtoitem error
2013-09-06 10:01:19 -07:00
Adam Palay
8fe38236d0
Merge branch 'release' after hotfix 5c39c79
2013-09-06 12:36:53 -04:00
Adam
12e82221e5
Merge pull request #877 from edx/hotfix/jsa/FOR-150
...
update mitxmako lookup / fixes FOR-150
2013-09-06 09:33:50 -07:00
Will Daly
99b47da2f4
Merge pull request #878 from edx/will/static-page-test-fix
...
Updated static-pages test to add retry logic
2013-09-06 09:22:46 -07:00
Will Daly
e20f2109d2
Updated static-pages test to add retry logic
2013-09-06 12:21:02 -04:00
Don Mitchell
0099ee0970
Clarify repr by naming
2013-09-06 12:19:51 -04:00
Don Mitchell
b81e5504db
Fix pylint and typos
2013-09-06 12:19:51 -04:00
Don Mitchell
fc131fa841
Add InheritanceKVS and standardize inherited attr patterns
2013-09-06 12:19:50 -04:00
David Ormsbee
ed508f8400
Merge pull request #556 from edx/ormsbee/requirments_notice
...
Dependency warning message on requirements files
2013-09-06 08:35:36 -07:00
Vik Paruchuri
0fbbaa83d6
Fix some staff-facing messages
2013-09-06 11:17:46 -04:00
Vik Paruchuri
66655080f6
Log a warning if assumption about path is not correct.
2013-09-06 11:12:10 -04:00
chrisndodge
b92d88fcbc
Merge pull request #401 from edx/feature/ichuang/cas-authentication
...
Provide CAS authentication integration
2013-09-06 07:36:28 -07:00
David Baumgold
bcef1994dd
remove load_templates.html template
2013-09-06 10:24:27 -04:00
David Baumgold
d984311b2e
Remove references to template loader JS library
2013-09-06 09:59:56 -04:00
Calen Pennington
8201b1412e
Use XBlock 0.3
2013-09-06 09:45:59 -04:00
jsa
5c39c794c8
update mitxmako lookup / fixes FOR-150
2013-09-06 09:31:57 -04:00
Julian Arni
d0f7206099
Review fixes
2013-09-06 09:25:45 -04:00
David Baumgold
2c2668ca02
Removed template loader JS library
2013-09-06 09:21:55 -04:00
Jim Abramson
1b4f9c662c
Merge pull request #874 from edx/bug/jsa/FOR-150
...
update mitxmako lookup / fixes FOR-150
2013-09-06 05:32:44 -07:00
Valera Rozuvan
441eb3699b
Merge pull request #869 from edx/valera/video_js_console_log_useful_debug_info
...
Adding debugging messages for Video player.
2013-09-06 04:51:23 -07:00
Valera Rozuvan
bd4b4c16b8
Merge pull request #867 from edx/valera/video_single_yt_xhr_jasmine_test
...
Valera/video single yt xhr jasmine test
2013-09-06 04:49:31 -07:00
Valera Rozuvan
73a9c43ebb
Addressing Anton's comments on PR 869.
...
Removed extra check for console.log() existance. Modified error
messages. Formatted entire file to fit in 80 lines or less.
Formatting files so that they fit under 80 lines. Adding debug info for
what type of YouTube video player is being used. Also comment on whether
playbackRates is available for HTML5 mode.
Changed back Anton's original function _checkPlaybackRates(). Now logging for
this function's result is done only on error (in the function that is invoking)
it).
2013-09-06 14:16:47 +03:00
Valera Rozuvan
20c16ec69e
Adding debugging messages for Video player.
...
For now outputting main flow of loading YouTube or non-YouTube videos.
2013-09-06 14:16:46 +03:00
Valera Rozuvan
b2c605a187
Addressing comments by Jean Michel for PR 867.
...
Forgot to include local variables in var statement.
2013-09-06 14:02:28 +03:00
Valera Rozuvan
8ffd16366f
Fix for test.
...
Must clear the state youtubeXhr variable before counting number
of ajax calls.
2013-09-06 11:58:49 +03:00
Valera Rozuvan
545af7e854
Jasmine test to verify that only one check for YT is made.
...
We test for the number of ajax calls made when there are 3
videos on the page.
2013-09-06 11:58:49 +03:00
jmclaus
faf1f54824
Merge pull request #854 from edx/jmclaus/bugfix_tabbing_video_speed_control
...
Speed button know behaves like the volume button when tabbing forward or...
2013-09-06 01:07:52 -07:00
