Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• f4addddf42 Merge pull request #1484 from MITx/feature/vik/improve-oe-ui Diana Huang 2013-02-19 07:27:29 -08:00
• 6d2ada5084 xmodule scss - resolved some general span styling that would override basic em or strong type styling Brian Talbot 2013-02-19 09:59:36 -05:00
• 1a2e794126 add test of inheritance on xmodule insert Chris Dodge 2013-02-19 09:51:07 -05:00
• e4312d67f0 work in progress on supporting science puzzles Victor Shnayder 2013-02-19 09:43:19 -05:00
• a62a575a33 Merge pull request #1506 from MITx/feature/btalbot/studio-softlanding Christina Roberts 2013-02-19 06:34:32 -08:00
• c37238d592 Initial landing pages for ANU, McGill, Rice, Toronto Victor Shnayder 2013-02-19 08:22:09 -05:00
• 6940cb334a small refactor Alexander Kryklia 2013-02-19 13:33:55 +02:00
• e2470842f7 get_module get descr insted of loc Alexander Kryklia 2013-02-19 13:31:28 +02:00
• 841cfd28cc fix typo Alexander Kryklia 2013-02-19 13:06:14 +02:00
• a4ee057d05 Add showanswer="finished" option and tests Victor Shnayder 2013-02-18 21:43:57 -05:00
• 72d9c1d7d2 Saving work-in-progress of guided classification exercise. Arthur Barrett 2013-02-18 19:02:54 -05:00
• bd73cc16ee compute (and cache) a generation of metadata inheritance tree for the course. We can then add that metadata to a newly instantiated xmodule Chris Dodge 2013-02-18 18:49:45 -05:00
• 8587044ea4 fix capa save button msgs, add simple capa survey mode ichuang 2013-02-18 10:48:45 -05:00
• 72f6578395 fix typo Alexander Kryklia 2013-02-18 11:46:07 +02:00
• 0a80f835c0 Revert "fix typo" Alexander Kryklia 2013-02-18 11:45:21 +02:00
• 24d2c11c3e fix typo Alexander Kryklia 2013-02-18 11:45:03 +02:00
• cfa13922f5 Change url for login from login to signin. Don Mitchell 2013-02-15 17:30:24 -05:00
• 66c91b704a init work. Export the 'draft' store under a distinct folder in the export. TBD: do the import from that directory as well. Chris Dodge 2013-02-15 17:16:05 -05:00
• 9eb02a8a26 studio - resolving base.js spacing/conflicts Brian Talbot 2013-02-15 16:57:42 -05:00
• 3e23b9e1f2 Merge pull request #1480 from MITx/diana/staff-grading-flagging Diana Huang 2013-02-15 13:08:16 -08:00
• 2bc3000156 Fix tests Calen Pennington 2013-02-15 15:44:11 -05:00
• b896cef86d Add in click tracking for feedback elements Diana Huang 2013-02-15 15:17:53 -05:00
• 5acf9cb3d2 Reformat to 4 spaces. cahrens 2013-02-15 14:46:41 -05:00
• 2486ebc22a Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding cahrens 2013-02-15 14:45:20 -05:00
• 87784d1cff Make sure the submissions history only shows up with problems. David Ormsbee 2013-02-15 14:36:10 -05:00
• 3c6caa611c resolving local merge Brian Talbot 2013-02-15 14:24:42 -05:00
• 86d9f0b65c resolving local merge Brian Talbot 2013-02-15 14:15:51 -05:00
• 37e4cd81b1 Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding cahrens 2013-02-15 14:15:03 -05:00
• 93949ab342 resolving local merge problem Brian Talbot 2013-02-15 14:12:46 -05:00
• a5e2b5c53a resolving merge conflict and missing Sass mixin Brian Talbot 2013-02-15 14:10:52 -05:00
• 34a4b35e66 Fix lettuce acceptance tests to reflect the new soft landing page changes. Jay Zoldak 2013-02-15 14:07:46 -05:00
• 9fb80ec3df Removed console.log. Arthur Barrett 2013-02-15 13:50:57 -05:00
• 24f519e32f Moved the return link above the inline discussion and updated the header styling so the hide annotations button is right-aligned with the help icon. Arthur Barrett 2013-02-15 13:46:38 -05:00
• b49325009a Merge branch 'master' into feature/btalbot/studio-softlanding cahrens 2013-02-15 13:14:46 -05:00
• dceb8fee5e Merge pull request #1494 from MITx/feature/marco/addcomponent Christina Roberts 2013-02-15 10:13:24 -08:00
• 7b11843086 Merge branch 'master' into diana/click-tracking Diana Huang 2013-02-15 12:53:21 -05:00
• c4586edb2e Change hardcoded template names to the newer hardcoded template names :-( Don Mitchell 2013-02-15 12:03:04 -05:00
• 059b9f66e3 poll and conditional finished Alexander Kryklia 2013-02-15 18:48:39 +02:00
• cb127d473d studio - page headers: revised where new course form fields are placed in dashboard Brian Talbot 2013-02-15 11:40:06 -05:00
• c5d041a7a3 resolved local merge Brian Talbot 2013-02-15 11:29:56 -05:00
• 995ec8db62 resolved local merge Brian Talbot 2013-02-15 11:28:54 -05:00
• 86865a6823 Merge pull request #1507 from MITx/bugfix/valera/video_alpha Carlos Andrés Rocha 2013-02-15 08:22:25 -08:00
• c7679ea624 Removed debugging comments. Valera Rozuvan 2013-02-15 18:12:53 +02:00
• a0f46dae49 Fixed bug that prevented Firefox from playing HTML5 video content. Valera Rozuvan 2013-02-15 18:10:14 +02:00
• 20553b00d3 resolving merge conflict with master Brian Talbot 2013-02-15 09:32:38 -05:00
• 6c95460761 studio - resolving merge from master Brian Talbot 2013-02-15 09:15:06 -05:00
• 8f17e6ae9e First pass at implementing problem history. David Ormsbee 2013-02-15 01:30:14 -05:00
• 38632c52c3 Beginnings of Selenium test. cahrens 2013-02-14 17:36:37 -05:00
• 0d3b566dd8 finish piping URL through to pdf.js Brian Wilson 2013-02-14 15:47:53 -05:00
• bfcc0559a7 Merge pull request #1503 from MITx/fix/cdodge/export-policy-json Don Mitchell 2013-02-14 12:47:37 -08:00
• cc7a97082a Merge pull request #1468 from MITx/feature/ichuang/fix-module-staff-access-v2 Victor Shnayder 2013-02-14 12:08:56 -08:00
• cb37bf7326 Merge pull request #1504 from MITx/feature/victor/foldit-api Victor Shnayder 2013-02-14 12:05:04 -08:00
• 723012b2bb Better logging, and make view csrf exempt... Victor Shnayder 2013-02-14 14:50:18 -05:00
• ea068d4aa8 add exporting of policy.json Chris Dodge 2013-02-14 14:19:38 -05:00
• 2388770c25 Merge pull request #1502 from MITx/feature/victor/foldit-api Victor Shnayder 2013-02-14 10:36:12 -08:00
• 1108137dc3 Address Cale's comment--make property a simple class var Victor Shnayder 2013-02-14 13:24:21 -05:00
• d7f9bdda66 Move foldit app into the lms. No need for it in the cms, and it was breaking tests there.. Victor Shnayder 2013-02-14 13:23:58 -05:00
• 9feb810006 studio - final prep of introduction areas (with fix for current page content margins) Brian Talbot 2013-02-14 13:16:10 -05:00
• bd98b2726a resolving local merge conflict Brian Talbot 2013-02-14 13:00:51 -05:00
• c81f958788 studio - final prep of introduction areas (with fix for current page content margins) Brian Talbot 2013-02-14 13:00:14 -05:00
• 9b09d043bd studio - adding introduction areas to all templates and infrastructure for its contnet Brian Talbot 2013-02-14 12:49:58 -05:00
• 4f8757600a merge Victor Shnayder 2013-02-14 12:49:14 -05:00
• 5e44846596 Foldit integration. - ops view for the desktop app to talk to - xmodule that talks to the foldit model and displays the student's state - grading tweak to make grade updates from an external service work: - Add an always_recalculate_grades property to XModuleDescriptor. Victor Shnayder 2013-02-05 11:09:21 -05:00
• fffbb55944 Make hidden_module not cause 500 errors by adding a get_html() Victor Shnayder 2013-02-14 09:09:11 -05:00
• 21dab27ed6 fix logger name in module_render Victor Shnayder 2013-02-05 11:09:30 -05:00
• 2848df8282 Style changes to comments: increase font size, width. Improved scrolling between spans and discussions. Arthur Barrett 2013-02-14 12:43:11 -05:00
• 859cfff870 updated modal copy and alt text Mark L. Chang 2013-02-14 12:42:17 -05:00
• f9664284c5 Merge pull request #1501 from MITx/feature/ned/fix-firefox-gradient-buttons Ned Batchelder 2013-02-14 08:41:41 -08:00
• 1f61f6ce08 Merge pull request #1409 from MITx/feature/valera/video_alpha Carlos Andrés Rocha 2013-02-14 08:08:57 -08:00
• 47c117bf03 studio - page headers: resolved new course update creation JS issue caused by new markup Brian Talbot 2013-02-14 10:52:25 -05:00
• d614c80cc2 Firefox doesn't draw the buttons right with -90deg, but will draw it right if no direction is specified. Ned Batchelder 2013-02-14 10:39:16 -05:00
• 1a1be106ae studio - page headers: added in view live links to course dashboard Brian Talbot 2013-02-14 10:14:10 -05:00
• 2024f9eeca studio - page headers: added view course button to course outline Brian Talbot 2013-02-14 09:48:19 -05:00
• 6ade6983ae studio - page headers: added in logic to style page actions' height based on title having a subtitle or not Brian Talbot 2013-02-14 09:38:32 -05:00
• ff0b85ed0d studio - manual policy editor: revised CodeMirror string color for JSON fields specifically Brian Talbot 2013-02-14 09:24:16 -05:00
• 5134c99d97 Merge pull request #1500 from MITx/700x-sandbox Victor Shnayder 2013-02-14 06:20:02 -08:00
• e352226df5 Merge remote-tracking branch 'origin/master' into 700x-sandbox Victor Shnayder 2013-02-14 09:19:25 -05:00
• f80181be9a Merge pull request #1499 from MITx/feature/ichuang/codeinput-rows-fix Victor Shnayder 2013-02-14 06:16:29 -08:00
• 41dc655cce resolving local merge conflict Brian Talbot 2013-02-14 09:03:46 -05:00
• 54cc51bccf studio - soft landing: changed strong elem colors to be more subtle since we're not using new nomenclature Brian Talbot 2013-02-14 09:02:51 -05:00
• 557beea31f studio - hiding mast area for subsections Brian Talbot 2013-02-14 09:00:57 -05:00
• 237e6ff6a8 merge Vasyl Nakvasiuk 2013-02-14 11:33:04 +02:00
• 93000af79d fix problem with mutable default value in VideoAlphaModule._get_source Vasyl Nakvasiuk 2013-02-14 11:30:21 +02:00
• d55b818bb2 Updated YouTube JS API file to the new one. Valera Rozuvan 2013-02-14 11:25:36 +02:00
• 92dc8859a3 YouTube HTML5 mode is used by default. Fix typo in video alpha template. Valera Rozuvan 2013-02-13 16:47:06 +02:00
• 1254e11836 Fixes and additions. Addressing comments by Carlos for pull request 1409. Valera Rozuvan 2013-02-13 14:09:35 +02:00
• b69b88a718 some small fix Vasyl Nakvasiuk 2013-02-13 13:35:34 +02:00
• b229abd396 add xml exmaple for videoalpja module in docstring Vasyl Nakvasiuk 2013-02-13 13:35:10 +02:00
• 8cf8dcd10b rm videoalpha_list method Vasyl Nakvasiuk 2013-02-13 13:28:09 +02:00
• 0b73f0a59d remove unnecessary code Vasyl Nakvasiuk 2013-02-13 13:11:59 +02:00
• de94855ba0 use one general dictionary self.sources for videoalpha_module Vasyl Nakvasiuk 2013-02-13 11:48:06 +02:00
• 7d851b9f5d Fixed bug when switching speeds in YouTube HTML5 player. Valera Rozuvan 2013-02-04 16:27:13 +02:00
• e59994a4b8 Finalized HTML5 YouTube player inbrowser speed changes. Valera Rozuvan 2013-02-04 10:33:26 +02:00
• b2bffb010e Work on adding native spped change for YouTube HTML5. Not complete. Valera Rozuvan 2013-02-01 18:02:41 +02:00
• eff8ad6762 Fixed bug with HTML5 start end options. Now can specify an interval of video which must be played. Valera Rozuvan 2013-02-01 16:47:34 +02:00
• b5bd7a697f Added start and end time support. Valera Rozuvan 2013-02-01 16:18:03 +02:00
• 5129be978f Fixed bugs. Removed unnecessary things from HTML5. Minor improvements. Subtitles now work in HTML5 if specified. Valera Rozuvan 2013-02-01 13:58:46 +02:00
• e737522bb7 Fixed bug with jumpy timeline when switching speeds. Enabled show_captions option. Added JS support for subtitles in HTML5 mode. Valera Rozuvan 2013-02-01 11:24:53 +02:00
• a2d9df9d34 add "sub" to <video> tag in xml lessons Vasyl Nakvasiuk 2013-02-01 10:55:20 +02:00
• d72036a6dc add support sub attribute for <video> tag Vasyl Nakvasiuk 2013-01-31 19:04:55 +02:00