Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 48f867bd6b Merge branch 'master' into ormsbee/verifyuser3 David Ormsbee 2013-09-09 10:18:25 -04:00
• b53d55543d Merge pull request #823 from edx/jkarni/feature/multiple-assets-upload jkarni 2013-09-09 06:47:58 -07:00
• 9dac2eff90 actually flatten username suggestion to ascii Jason Bau 2013-09-08 20:26:21 -07:00
• 7fac4f3bb9 formulaequationinput: add capital greek letters and hbar to calc preview ichuang 2013-09-07 22:51:51 -04:00
• 9c6987d010 Merge pull request #873 from edx/fix/cdodge/enable-course-image-setting chrisndodge 2013-09-06 16:58:54 -07:00
• 6a850e27bb Address @brianhw review comments Jason Bau 2013-09-06 01:36:52 -07:00
• 4d656061be Removing handling for ExternalAuthMap.MultipleObjectsReturned Jason Bau 2013-09-03 21:31:22 -07:00
• 948c07c493 Revamped + Enhanced Shibboleth support Jason Bau 2013-08-29 23:56:20 -07:00
• 79a9c8677a Verification: revises presentation of customized certificate receipt ciew Brian Talbot 2013-09-06 17:12:46 -04:00
• 238a2d53e3 Don't allow people into the verification flow if they've already been verified Diana Huang 2013-09-06 17:20:24 -04:00
• 499d272adc Merge pull request #825 from edx/fix/vik/staff-information Vik Paruchuri 2013-09-06 14:14:31 -07:00
• 3184939138 Merge pull request #885 from edx/release Adam 2013-09-06 13:51:03 -07:00
• c5a732206c Merge pull request #883 from edx/hotfix/cdodge/fix-tab-rename Adam 2013-09-06 13:47:48 -07:00
• d84de2f890 Merge pull request #884 from edx/sarina/instrument-bulk-email Sarina Canelake 2013-09-06 13:28:07 -07:00
• 4b9df2e998 Add datadog tracking for bulk email Sarina Canelake 2013-09-06 15:47:55 -04:00
• 10b7c13652 add comment Chris Dodge 2013-09-06 16:05:41 -04:00
• 12bd7309d2 add content assertions Chris Dodge 2013-09-06 16:03:09 -04:00
• 5ece64433d Fix certificates acceptance test after come css changes Jay Zoldak 2013-09-06 15:31:08 -04:00
• 3b627e8c80 Merge pull request #879 from edx/db/remove-template-loader David Baumgold 2013-09-06 12:26:50 -07:00
• 0848360436 Merge pull request #844 from edx/dhm/editable_metadata Don Mitchell 2013-09-06 11:58:36 -07:00
• c7f2f27708 fix bug and add unit test Chris Dodge 2013-09-06 14:09:25 -04:00
• 0cac1c3bee Merge pull request #881 from cpennington/dhm/editable_metadata Calen Pennington 2013-09-06 10:52:03 -07:00
• ec67bf4bec Only show start date on receipt if it's in the future. Diana Huang 2013-09-06 13:48:40 -04:00
• 38de05c76c Include mixins in advanced component class loading and preview modules Calen Pennington 2013-09-06 13:37:03 -04:00
• d3580994c8 Merge pull request #870 from edx/fix/vik/oe-nopath Vik Paruchuri 2013-09-06 10:01:19 -07:00
• 8fe38236d0 Merge branch 'release' after hotfix 5c39c79 Adam Palay 2013-09-06 12:36:53 -04:00
• 12e82221e5 Merge pull request #877 from edx/hotfix/jsa/FOR-150 Adam 2013-09-06 09:33:50 -07:00
• 99b47da2f4 Merge pull request #878 from edx/will/static-page-test-fix Will Daly 2013-09-06 09:22:46 -07:00
• e20f2109d2 Updated static-pages test to add retry logic Will Daly 2013-09-05 08:49:10 -04:00
• 0099ee0970 Clarify repr by naming Don Mitchell 2013-09-05 12:25:52 -04:00
• b81e5504db Fix pylint and typos Don Mitchell 2013-09-05 12:25:15 -04:00
• fc131fa841 Add InheritanceKVS and standardize inherited attr patterns Don Mitchell 2013-09-05 12:22:22 -04:00
• 6084412544 Verification: changed page title, progress to reflect registration completion + I8TN copy changes Brian Talbot 2013-09-06 12:12:04 -04:00
• 6a081ffc38 Verification: adds current step text into receipt view's progress nav Brian Talbot 2013-09-06 12:03:36 -04:00
• 0c552141f2 LMS: revises right justification space of verified indicator on Student Dashboard Brian Talbot 2013-09-06 12:02:54 -04:00
• 47df7e420f ux adjustments to vcert flow Frances Botsford 2013-09-06 12:02:28 -04:00
• 6538e9899d Fix some of the shopping cart tests. Diana Huang 2013-09-06 11:47:20 -04:00
• ed508f8400 Merge pull request #556 from edx/ormsbee/requirments_notice David Ormsbee 2013-09-06 08:35:36 -07:00
• 0fbbaa83d6 Fix some staff-facing messages Vik Paruchuri 2013-09-05 13:16:48 -04:00
• 66655080f6 Log a warning if assumption about path is not correct. Vik Paruchuri 2013-09-06 11:12:10 -04:00
• b92d88fcbc Merge pull request #401 from edx/feature/ichuang/cas-authentication chrisndodge 2013-09-06 07:36:28 -07:00
• bcef1994dd remove load_templates.html template David Baumgold 2013-09-06 10:24:27 -04:00
• af2424daf1 adjustments to choose and contribution for vcerts Frances Botsford 2013-09-06 10:23:46 -04:00
• 90923f3e12 Add min_price var to _contribution.html template David Ormsbee 2013-09-06 10:11:15 -04:00
• 698872a810 Clean up names and links for receipts/emails. Diana Huang 2013-09-06 10:00:56 -04:00
• d984311b2e Remove references to template loader JS library David Baumgold 2013-09-06 09:30:39 -04:00
• 8201b1412e Use XBlock 0.3 Calen Pennington 2013-08-30 07:30:18 -04:00
• 5c39c794c8 update mitxmako lookup / fixes FOR-150 jsa 2013-09-05 23:23:52 -04:00
• d0f7206099 Review fixes Julian Arni 2013-09-06 09:25:45 -04:00
• 2c2668ca02 Removed template loader JS library David Baumgold 2013-09-06 09:21:55 -04:00
• fd8b375f3a Translated … David Baumgold 2013-09-06 09:17:19 -04:00
• 79b3af8749 tabs to spaces David Baumgold 2013-09-06 09:16:26 -04:00
• 4175db0a67 adding basic meta tags - for ie edge and mobile - to main template header Frances Botsford 2013-09-06 09:12:50 -04:00
• 1b4f9c662c Merge pull request #874 from edx/bug/jsa/FOR-150 Jim Abramson 2013-09-06 05:32:44 -07:00
• 441eb3699b Merge pull request #869 from edx/valera/video_js_console_log_useful_debug_info Valera Rozuvan 2013-09-06 04:51:23 -07:00
• bd4b4c16b8 Merge pull request #867 from edx/valera/video_single_yt_xhr_jasmine_test Valera Rozuvan 2013-09-06 04:49:31 -07:00
• 73a9c43ebb Addressing Anton's comments on PR 869. Valera Rozuvan 2013-09-06 11:55:55 +03:00
• 20c16ec69e Adding debugging messages for Video player. Valera Rozuvan 2013-09-05 17:14:06 +03:00
• b2c605a187 Addressing comments by Jean Michel for PR 867. Valera Rozuvan 2013-09-06 14:02:28 +03:00
• 8ffd16366f Fix for test. Valera Rozuvan 2013-09-05 14:29:26 +03:00
• 545af7e854 Jasmine test to verify that only one check for YT is made. Valera Rozuvan 2013-09-05 14:16:44 +03:00
• faf1f54824 Merge pull request #854 from edx/jmclaus/bugfix_tabbing_video_speed_control jmclaus 2013-09-06 01:07:52 -07:00
• 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. jmclaus 2013-09-05 22:39:38 +02:00
• 8e2c5bca7b Added focus tracking to play/pause button. This fixes a bug where the tabbing, in certain condition, would get stuck on speed button. jmclaus 2013-09-04 12:11:23 +02:00
• 578e02b589 Speed button know behaves like the volume button when tabbing forward or backward. jmclaus 2013-09-03 21:01:42 +02:00
• 4e011326bc Replace placeholder 'Course Name' in paid cert templates with the actual course name David Ormsbee 2013-09-05 23:39:35 -04:00
• 6e7965d26c update mitxmako lookup / fixes FOR-150 jsa 2013-09-05 23:23:52 -04:00
• 0a6565b882 also even when we have a marketing site, we still need a course image for the dashboard Chris Dodge 2013-09-05 21:07:22 -04:00
• 9aa024b585 Merge pull request #845 from edx/bugfix/ichuang/fix-capa-optioninput-for-inline chrisndodge 2013-09-05 15:51:30 -07:00
• a78c913d5e Merge pull request #872 from edx/christina/about-page Christina Roberts 2013-09-05 12:40:51 -07:00
• 20d72ea703 Clean up views and start work on edit name modal. Diana Huang 2013-09-05 15:19:15 -04:00
• 25ce1fe745 Merge branch 'release' Adam Palay 2013-09-05 14:56:25 -04:00
• d20359aa44 Merge pull request #634 from antoviaque/vagrant-provisioning-resume David Baumgold 2013-09-05 11:41:32 -07:00
• f4bdd73839 Verification: adds in verified/enrollment status into dashboard course listings Brian Talbot 2013-09-05 14:28:53 -04:00
• f686990b02 LMS: adds in additional abstract border-variables with logical scale Brian Talbot 2013-09-05 14:27:25 -04:00
• f2e55a3d6a Verification: abstracting out specific color-based Sass variables to be *somewhat* friendly to theming Brian Talbot 2013-09-05 12:58:49 -04:00
• 4e67783644 Don't show course about page link when we have the marketing site. cahrens 2013-09-05 14:26:08 -04:00
• 48fed2052f adding in conditional IE hooks in lms main template Frances Botsford 2013-09-05 14:17:29 -04:00
• 9e1813041a Fix nopathtoitem error Vik Paruchuri 2013-09-05 11:52:05 -04:00
• 22480b821a Fix reset button for photo capture David Ormsbee 2013-09-05 14:15:13 -04:00
• 545d5770d5 Merge pull request #871 from edx/fix/cdodge/re-enable-enrollment-start-stop chrisndodge 2013-09-05 11:02:00 -07:00
• 4a12cb60c9 due to the MixedModuleStore pending release, we need to make enrollment start/end dates editable in Studio Chris Dodge 2013-09-05 12:43:24 -04:00
• a8989f2fe6 adjusting go to course button for vcert receipt Frances Botsford 2013-09-05 12:40:37 -04:00
• a6068201e1 Add in a staff warning message about duplicates Vik Paruchuri 2013-08-29 13:11:04 -04:00
• 304a329b08 initial receipt html and styling for vcert Frances Botsford 2013-09-05 12:24:03 -04:00
• 0a5b68263e vagrant: Add flag to ensure install is completed at least once Xavier Antoviaque 2013-08-09 17:58:24 -03:00
• 5d55714cad Fix test. Anton Stupak 2013-09-05 17:02:53 +03:00
• 961bd4c9cb Fix selector. Anton Stupak 2013-09-05 10:49:42 +03:00
• 5658e6bc22 Merge pull request #868 from edx/hotfix/lose_header_bug polesye 2013-09-05 07:26:09 -07:00
• d93215c0b9 Fix test. Anton Stupak 2013-09-05 17:02:53 +03:00
• 9c96fcf4cd edx.org: ensures that the iframe-based register button has a transparent background Brian Talbot 2013-09-05 10:00:29 -04:00
• 4ab204cce7 Only create a new photo verification if one doesn't already exist. Diana Huang 2013-09-05 08:50:54 -04:00
• 70cdc9a705 edx.org: addresses vertical scrollbar on course register button when placed in iframe Brian Talbot 2013-09-05 08:49:02 -04:00
• af6d0eb145 Fix selector. Anton Stupak 2013-09-05 10:49:42 +03:00
• 69f72989c5 consistently use inline=False as default in capa inputtypes ichuang 2013-09-04 23:13:05 -04:00
• 07014e8eb2 Reset modal when closed by clicking outside of it Julian Arni 2013-09-02 22:47:31 -04:00
• 5c8e7337a8 edx.org: revises course register button background for all cases (verified, riught column, and bottom of page) Brian Talbot 2013-09-04 16:06:44 -04:00
• 08168ec67f Merge pull request #859 from edx/jbau/studio-link-in-instructor-panel Jason Bau 2013-09-04 13:03:21 -07:00
• d4e849d2b2 edx.org: adds custom styling for register button in case of verified option/content displayed Brian Talbot 2013-09-04 15:30:05 -04:00
• a1373f4830 Update content of the order confirmation e-mail. Diana Huang 2013-09-04 15:16:51 -04:00