Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • c8b2863a46 Slightly change email registration template Added some text to guide the student to register with a particular email address. This is the one that was entered into the enrollment/invitation form by the instructor. Modified the template and associated test. David Adams 2013-08-29 15:27:30 -07:00
  • df03b09136 Merge pull request #824 from edx/fix/vik/oe-progress Vik Paruchuri 2013-08-29 14:39:11 -07:00
  • 9b57ef0b54 Pep8 fixes Vik Paruchuri 2013-08-29 17:28:14 -04:00
  • b797118811 review fixes Julian Arni 2013-08-29 17:22:07 -04:00
  • fc52fab231 Go skip verification step if student is already verified. Diana Huang 2013-08-29 16:45:50 -04:00
  • 992b36e771 Verified: adds initial registration choice error styling Brian Talbot 2013-08-29 16:57:54 -04:00
  • db8a810009 Verified: cleans up extraneous reg selection markup and expandable UI Brian Talbot 2013-08-29 16:43:02 -04:00
  • a06226aad6 Address review comments Vik Paruchuri 2013-08-29 16:34:17 -04:00
  • 8c107569e9 Fix cart submission David Ormsbee 2013-08-29 16:30:53 -04:00
  • 70a594597c re-enable link to audit David Ormsbee 2013-08-29 15:32:53 -04:00
  • d2292738d6 Update contribution partial template with new style changes. David Ormsbee 2013-08-29 14:47:03 -04:00
  • fc5a24dfc0 Merge pull request #801 from edx/will/remove-test-network-calls Will Daly 2013-08-29 11:42:19 -07:00
  • a061c7ece7 Rewriting of links for Course Updates and Course Handouts. cahrens 2013-08-29 14:35:16 -04:00
  • 5202bdf85a Merge branch 'ormsbee/verify2' into ormsbee/verifyuser3 David Ormsbee 2013-08-29 14:34:52 -04:00
  • 81a56a35ab Verified: revising template UI, styling, and infrastructure Brian Talbot 2013-08-29 14:07:51 -04:00
  • 638fb79a16 Verification: adding in more Sass variable/mixin/extend scaffolding Brian Talbot 2013-08-29 13:44:28 -04:00
  • 0142fafe7e Merge pull request #555 from edx/feature/kluo/bulk-email-squashed Sarina Canelake 2013-08-29 10:44:09 -07:00
  • c160a189ad Bulk email - final tweaks and cleanup Jason Bau 2013-08-27 10:22:25 -07:00
  • 8f93051d30 Add editable templates for bulk email Brian Wilson 2013-08-08 16:44:36 -04:00
  • d341d6d26d Change optout to use user.id instead of email. Jason Bau 2013-08-22 17:04:38 -07:00
  • 52d9320e62 Hide "Email Settings" from student dash if bulk email not enabled Sarina Canelake 2013-08-23 13:57:24 -04:00
  • e6bde93837 Change bulk email model field names and add migrations Sarina Canelake 2013-08-22 13:50:11 -04:00
  • b3bc4023b0 Refactor html->plaintext conversion (for bulk email) into separate library Sarina Canelake 2013-08-22 11:18:59 -04:00
  • f98d6764b2 Disable bulk email for XML-backed courses Sarina Canelake 2013-08-21 11:30:13 -04:00
  • 65f7b098dd Bulk Email: Add design styling Sarina Canelake 2013-08-16 12:00:14 -04:00
  • 3b32d4216c Add delay to course bulk email task and use SITE_NAME for site url Kevin Luo 2013-07-26 16:21:50 -07:00
  • 3ea2b24b98 Add HTML editor for authoring bulk email message (adopted from CMS) Kevin Luo 2013-07-26 03:57:31 -07:00
  • 907bf6e1b7 Add bulk email feature for instructors, with optout option Kevin Luo 2013-07-25 12:22:30 -07:00
  • 940a337dd3 Properly display student progress Vik Paruchuri 2013-08-29 12:14:30 -04:00
  • bfca803b27 Merge pull request #818 from edx/will/cms-js-fixtures-dir Will Daly 2013-08-29 08:37:15 -07:00
  • a8d7b99743 Move verify-specific JS out of site level David Ormsbee 2013-08-29 10:13:28 -04:00
  • e0ab75fb84 Add support for multiple file uploads Julian Arni 2013-08-19 16:32:57 -04:00
  • 23805ca52f Studio JS fixture files no longer need individual symlinks Will Daly 2013-08-28 10:59:53 -04:00
  • 634d207762 Make it so that auto-filling of selected price works again on confirmation screen before submitting credit card info. David Ormsbee 2013-08-28 22:25:14 -04:00
  • db0af8a863 Enabled honor certificates David Ormsbee 2013-08-28 19:21:18 -04:00
  • b2141ee7c0 Add verified cert marketing link David Ormsbee 2013-08-28 17:48:17 -04:00
  • e7a3847e48 More validation to the free-form price text box and allow for decimal places Diana Huang 2013-08-28 17:43:01 -04:00
  • 3efa803321 Fix bug where we don't re-disable a button if they uncheck that the verification pictures look good. David Ormsbee 2013-08-28 17:27:34 -04:00
  • 6fd86904f1 Fix bug where resetting second picture would remove the first David Ormsbee 2013-08-28 17:21:38 -04:00
  • 6c647d7630 Return the correct data to the backend. Diana Huang 2013-08-28 17:06:52 -04:00
  • 4471079f71 Clean up validation of price selection. Add error messaging. Diana Huang 2013-08-28 16:43:09 -04:00
  • 547d441954 Merge pull request #821 from edx/ned/fix-the-requirements-in-the-sandbox-instructions Ned Batchelder 2013-08-28 13:29:47 -07:00
  • 30cf0b57e6 Fix the requirements in the sandbox instructions Ned Batchelder 2013-08-28 16:04:43 -04:00
  • 7af4accc50 Preserve purchase amount choice and redisplay on final verification page. David Ormsbee 2013-08-28 15:06:58 -04:00
  • 2f3ff4b3eb Verification: revising markup for views Brian Talbot 2013-08-28 12:57:13 -04:00
  • 14708aa30b Merge pull request #816 from edx/hotfix/xml-parsing Adam 2013-08-28 09:52:48 -07:00
  • fbb6dc078f Merge pull request #819 from edx/jkarni/hotfix/gzip-mimetype jkarni 2013-08-28 09:52:36 -07:00
  • 1255ea79c9 forgot to add partial template David Ormsbee 2013-08-28 11:29:08 -04:00
  • 48484ef9e0 move suggested price listing to common include template David Ormsbee 2013-08-28 11:28:44 -04:00
  • 6cb2e0b206 Check extension rather than mimetype Julian Arni 2013-08-28 11:13:20 -04:00
  • 7d79f4fe37 Move mitxmako initialization to a startup module, called by lms.startup and cms.startup for both management commands and when run via wsgi Calen Pennington 2013-08-27 15:52:14 -04:00
  • 869d09220c Merge pull request #771 from edx/valera/fix_empty_captions_panel_no_captions Valera Rozuvan 2013-08-28 07:24:56 -07:00
  • 0a110b672d Using native Jasmine-jQuery method to check for hidden el. Valera Rozuvan 2013-08-28 17:23:42 +03:00
  • e88e04d3a6 A test that our XML-comments fix works. Ned Batchelder 2013-08-27 11:44:41 -04:00
  • 33fa1e2c7f Applying code changes as suggested by Anton. Valera Rozuvan 2013-08-28 17:15:52 +03:00
  • 6738a37ec1 Keep comments in capa XML from causing failures Ned Batchelder 2013-08-27 11:08:22 -04:00
  • 2a4f7f61c5 Remove caption panel when anything bad happens. Valera Rozuvan 2013-08-28 13:28:40 +03:00
  • ba954ff164 Fixing code as per suggestions on PR 771. Valera Rozuvan 2013-08-27 10:19:55 +03:00
  • e788d6ce37 Added Jasmine test for bug fix. Updated comments. Valera Rozuvan 2013-08-22 12:10:03 +03:00
  • 4936b5044b Fix for bug BLD-277 Valera Rozuvan 2013-08-21 14:33:21 +03:00
  • 3194e54400 Merge pull request #805 from edx/ned/fix-allow-comments-in-capa-xml Ned Batchelder 2013-08-28 06:58:51 -07:00
  • aedb570e9e make edit link use static_asset_path in xmodule_modifiers.py ichuang 2013-08-27 20:49:50 -04:00
  • 77abfbf41e Merge pull request #813 from edx/bugfix/ichuang/course-tabs-None chrisndodge 2013-08-27 18:21:27 -07:00
  • 493d8d26e5 add sample tabs to test_import_course ichuang 2013-08-27 20:04:55 -04:00
  • 4a706641f2 add test for tab names importing correctly ichuang 2013-08-27 20:03:35 -04:00
  • d8345b4b39 fix course tabs from being imported with display_name=None due to overwriting policy ichuang 2013-08-27 18:46:50 -04:00
  • 0d67827314 Fix simple links in verification flow. David Ormsbee 2013-08-27 19:35:46 -04:00
  • ee8d28dacc Fix webcam capture for Firefox David Ormsbee 2013-08-27 19:01:27 -04:00
  • 4fbf23b66a Merge pull request #810 from edx/diana/email-receipt Diana Huang 2013-08-27 14:48:06 -07:00
  • 1b5fde9dae Send email on purchase success. Diana Huang 2013-08-26 17:20:28 -04:00
  • 4e7c309d56 Merge pull request #798 from edx/will/js-test-tool-squashed Will Daly 2013-08-27 14:09:13 -07:00
  • 4e7885a2a2 Merge pull request #747 from edx/zoldak/fix-pylint-nose-tools Jay Zoldak 2013-08-27 14:00:43 -07:00
  • c8949b99d1 Disable pylint violation E0611 when importing assert_* methods from nose.tools Jay Zoldak 2013-08-20 08:54:49 -04:00
  • e3810b7576 Merge pull request #799 from edx/fix/ichuang/inheritance-needs-videosequence chrisndodge 2013-08-27 13:07:58 -07:00
  • 42571b9319 Merge pull request #802 from cpennington/run-failed-tests Calen Pennington 2013-08-27 12:53:40 -07:00
  • d7225f026a Only store certain bits of information behind a flag. Diana Huang 2013-08-26 12:25:10 -04:00
  • 4b1fa6b316 Merge pull request #690 from cpennington/one-time-startup Calen Pennington 2013-08-27 12:19:42 -07:00
  • 88b28ae0b6 Merge pull request #808 from edx/will/randomize-cms-mongo-collections Will Daly 2013-08-27 10:58:49 -07:00
  • b5e1d57e28 Merge pull request #442 from edx/felix/formula-hints Felix Sun 2013-08-27 10:26:25 -07:00
  • e50a2414b2 Studio ModuleStoreTestCase subclasses now use randomized Mongo collection names Will Daly 2013-08-27 12:57:14 -04:00
  • 02cb0b487d Merge pull request #795 from edx/will/silence-doc-warnings Will Daly 2013-08-27 09:47:20 -07:00
  • 407b02b358 Centralize startup code, and execute in all contexts Calen Pennington 2013-08-14 16:50:34 -04:00
  • 2c544cb0bd A test that our XML-comments fix works. Ned Batchelder 2013-08-27 11:44:41 -04:00
  • 256c112d02 re-add full user name to verify page David Ormsbee 2013-08-27 11:20:44 -04:00
  • 6447e02f02 Merge branch 'ormsbee/verify2' into ormsbee/verifyuser3 David Ormsbee 2013-08-27 11:08:38 -04:00
  • ca7c002ca9 Keep comments in capa XML from causing failures Ned Batchelder 2013-08-27 11:08:22 -04:00
  • cee44501f5 Merge remote-tracking branch 'origin/release' Julian Arni 2013-08-27 11:05:13 -04:00
  • e6bfb887c4 more cleanup on photos for vcerts Frances Botsford 2013-08-27 11:04:34 -04:00
  • 28db6a2fda cleanup on the photo page for vcerts Frances Botsford 2013-08-27 10:55:09 -04:00
  • 0e4b114278 Merge pull request #633 from edx/fix/vik/oe-state Vik Paruchuri 2013-08-27 07:01:32 -07:00
  • 444f51d6de Fixed some pep/pylint violations. Felix Sun 2013-08-27 09:41:29 -04:00
  • e7626d2d84 Teach rake test tasks how to re-run failed tests Calen Pennington 2013-08-27 08:34:48 -04:00
  • 40393b21f7 Add in a new HTML class that represents the enrollment mode. Diana Huang 2013-08-23 11:41:33 -04:00
  • 134e09b229 Remove old commented out HTML David Ormsbee 2013-08-27 09:41:58 -04:00
  • 6bb9360724 Merge branch 'ormsbee/verify2' into ormsbee/verifyuser3 David Ormsbee 2013-08-27 09:05:18 -04:00
  • 7d9607f0bd Merge pull request #800 from edx/anton/replace_subtitles_with_timed_transcript polesye 2013-08-27 05:42:22 -07:00
  • db6d76d643 Patched textbook TOC request during course import. Will Daly 2013-08-26 16:57:02 -04:00
  • dd9b16c2cf Replace the description in the studio editing module. Anton Stupak 2013-08-27 15:22:41 +03:00
  • 83f8b033ea fix common/lib/xmodule/xmodule/modulestore/mongo/base.py ichuang 2013-08-26 20:23:11 -04:00
  • 4d73961a44 'videosequence' and 'proctor' need to be in inheritable moduletypes in modulestore/mongo/base.py ichuang 2013-08-26 20:17:22 -04:00