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
Brian Talbot
6084412544
Verification: changed page title, progress to reflect registration completion + I8TN copy changes
2013-09-06 12:12:58 -04:00
Brian Talbot
6a081ffc38
Verification: adds current step text into receipt view's progress nav
2013-09-06 12:12:58 -04:00
Brian Talbot
0c552141f2
LMS: revises right justification space of verified indicator on Student Dashboard
2013-09-06 12:12:58 -04:00
Frances Botsford
47df7e420f
ux adjustments to vcert flow
2013-09-06 12:02:37 -04:00
Diana Huang
6538e9899d
Fix some of the shopping cart tests.
2013-09-06 11:47:35 -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
Frances Botsford
af2424daf1
adjustments to choose and contribution for vcerts
2013-09-06 10:23:46 -04:00
David Ormsbee
90923f3e12
Add min_price var to _contribution.html template
2013-09-06 10:11:29 -04:00
Diana Huang
698872a810
Clean up names and links for receipts/emails.
2013-09-06 10:01:09 -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
David Baumgold
fd8b375f3a
Translated …
2013-09-06 09:17:19 -04:00
David Baumgold
79b3af8749
tabs to spaces
2013-09-06 09:16:26 -04:00
Frances Botsford
4175db0a67
adding basic meta tags - for ie edge and mobile - to main template header
2013-09-06 09:13:03 -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
jmclaus
e1f75666fa
Added test to verify that there is a certain order in the controls -- tabbing on the speed control will malfunction if it is not the case.
2013-09-06 09:22:33 +02:00
jmclaus
8e2c5bca7b
Added focus tracking to play/pause button. This fixes a bug where the tabbing, in certain condition, would get stuck on speed button.
2013-09-06 09:22:33 +02:00
jmclaus
578e02b589
Speed button know behaves like the volume button when tabbing forward or backward.
2013-09-06 09:22:33 +02:00
David Ormsbee
4e011326bc
Replace placeholder 'Course Name' in paid cert templates with the actual course name
2013-09-05 23:39:35 -04:00
jsa
6e7965d26c
update mitxmako lookup / fixes FOR-150
2013-09-05 23:23:52 -04:00
Chris Dodge
0a6565b882
also even when we have a marketing site, we still need a course image for the dashboard
2013-09-05 21:07:22 -04:00
chrisndodge
9aa024b585
Merge pull request #845 from edx/bugfix/ichuang/fix-capa-optioninput-for-inline
...
Fix capa optioninput template to honor inline flag
2013-09-05 15:51:30 -07:00
Christina Roberts
a78c913d5e
Merge pull request #872 from edx/christina/about-page
...
Don't show course about page link when we have the marketing site.
2013-09-05 12:40:51 -07:00
Diana Huang
20d72ea703
Clean up views and start work on edit name modal.
2013-09-05 15:20:48 -04:00
Adam Palay
25ce1fe745
Merge branch 'release'
2013-09-05 14:56:25 -04:00
David Baumgold
d20359aa44
Merge pull request #634 from antoviaque/vagrant-provisioning-resume
...
vagrant: Add flag to ensure install is completed at least once
2013-09-05 11:41:32 -07:00
Brian Talbot
f4bdd73839
Verification: adds in verified/enrollment status into dashboard course listings
2013-09-05 14:29:11 -04:00
Brian Talbot
f686990b02
LMS: adds in additional abstract border-variables with logical scale
2013-09-05 14:29:10 -04:00
