Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• f10a5c4f83 Oops, forgot new class Don Mitchell 2013-01-18 15:21:21 -05:00
• bd6d153126 Fix failing self-assessment unit tests Diana Huang 2013-01-18 15:18:13 -05:00
• 1565cd5bd3 Test cases for lms/djangoapps/courseware/module_render in test_module_render Deena Wang 2013-01-18 14:44:17 -05:00
• bdc55d3686 Merge pull request #1308 from MITx/feature/rocha/sort-by-announcement-date David Ormsbee 2013-01-18 11:20:18 -08:00
• 33093e2d7a Merge pull request #1313 from MITx/feature/ichuang/fix-bug-in-idashboard David Ormsbee 2013-01-18 11:17:30 -08:00
• 6d73a399b1 fix bug in instructor dashboard groups code ichuang 2013-01-18 14:04:01 -05:00
• f500958439 More fixes for the merge and some display updates. Diana Huang 2013-01-18 13:52:50 -05:00
• b8e3cfcf96 added get_cohort_ids Your Name 2013-01-18 13:50:05 -05:00
• dba39e2431 add group support to lms Your Name 2013-01-18 12:50:25 -05:00
• 381ede20e1 Merge pull request #1312 from MITx/feature/christina/misc chrisndodge 2013-01-18 07:54:11 -08:00
• 700b0f14fd Need path to tiny mce JS file now. cahrens 2013-01-18 10:48:42 -05:00
• 575ff02f8a Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4 Chris Dodge 2013-01-18 10:26:44 -05:00
• b4de7fac26 Merge pull request #1311 from MITx/style/btalbot/cms-tinymce Christina Roberts 2013-01-18 07:25:51 -08:00
• 72fc192f6e studio - adding in LMS synced styles for TinyMCE WYSIWYG preview Brian Talbot 2013-01-18 10:24:29 -05:00
• aeee13ab91 Fix the virtualenv creation for Jenkins. Ashley Penney 2013-01-18 10:01:21 -05:00
• d2f79f10f0 studio - synced LMS common content styles with HTML component display/edit rendering styles Brian Talbot 2013-01-18 09:59:08 -05:00
• 2e791043e8 Merge branch 'master' into diana/open-ended-ui-updates Diana Huang 2013-01-18 09:21:38 -05:00
• 71e358d72b Merge pull request #1305 from MITx/style/btalbot/cms-component-submenus Christina Roberts 2013-01-18 06:12:46 -08:00
• 481580c702 Remove hints from self-assessment and misc display fixes Diana Huang 2013-01-18 08:48:50 -05:00
• 031e79ec24 Merge pull request #1310 from MITx/fix/cdodge/discussion-fixes chrisndodge 2013-01-17 20:59:27 -08:00
• c6276c8394 only cache discussion forum info for 5 minutes before flushing. This is needed for Studio backed courses that can add new discussion items at any point in time. Also we need to also set metadata fields (which are basically the same as what gets passed in the XML) as the forums expect those values as metadata Chris Dodge 2013-01-17 23:58:07 -05:00
• ef69b738c9 Sort courses announcement date Carlos Andrés Rocha 2013-01-17 21:31:05 -05:00
• 70457176f1 studio - stubbed in basic LMS styling to HTML displaygst Brian Talbot 2013-01-17 21:28:14 -05:00
• 9753ff5677 Merge pull request #1307 from MITx/feature/christina/tiny-mce chrisndodge 2013-01-17 18:18:25 -08:00
• a4196ffa00 Relative path seems to work. cahrens 2013-01-17 21:15:38 -05:00
• 8cca193903 Add a comment. cahrens 2013-01-17 21:06:05 -05:00
• a1bb533b60 Workaround for sandbox. cahrens 2013-01-17 21:04:17 -05:00
• 44cfcb88a3 Merge branch 'master' into feature/cdodge/cms-master-merge4 Chris Dodge 2013-01-17 20:30:22 -05:00
• 0e2d8be442 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4 Chris Dodge 2013-01-17 20:29:41 -05:00
• bc268aa791 Merged to lastest master. jmvt 2013-01-17 17:39:12 -05:00
• 7ac36d2f43 Merge pull request #1306 from MITx/fix/vik/remove-mitxmako David Ormsbee 2013-01-17 14:19:23 -08:00
• 18dc59c93a Error message fix Vik Paruchuri 2013-01-17 17:18:10 -05:00
• eaa6701c6f Remove mitxmako dependencies, make rubric and oechild inherit fro object Vik Paruchuri 2013-01-17 17:13:31 -05:00
• 30c87be20f Subsection drag between sections should work now. Don Mitchell 2013-01-17 17:09:31 -05:00
• 5b82a68c18 studio - removing extra line/whitespace in sass Brian Talbot 2013-01-17 17:06:07 -05:00
• 66a3e9621b studio - removed editor type icon and text for all components except for problems Brian Talbot 2013-01-17 17:04:28 -05:00
• af086c2029 Merge pull request #1304 from MITx/mysql-python jarv 2013-01-17 12:56:20 -08:00
• 2d55f871ee While this is a pain for content developer local environment updates it breaks the LMS in EC2 which is vastly more important. We'll jsut have to address helping individual content people with installing MySQL if needed. This is a real dependency in production and I think those belong in here. Ashley Penney 2013-01-17 15:51:26 -05:00
• f64ffd2577 Merge pull request #1303 from MITx/feature/christina/tiny-mce chrisndodge 2013-01-17 12:44:54 -08:00
• 2b23c40345 minor tweaks to dropdown text and addition of dropdown menu (without data links) for intructor visilibility dropdown in main discussion forum; marco 2013-01-17 15:25:35 -05:00
• ac09e18b9e Now traps out of bounds as implying no change. Seems very slow. Don Mitchell 2013-01-17 15:09:23 -05:00
• 18d5792025 Merge pull request #1302 from MITx/bugfix/brian/pearson-reg David Ormsbee 2013-01-17 11:42:00 -08:00
• 08b8a9f674 Better help message for the force-gen option John Jarvis 2013-01-17 14:36:08 -05:00
• 87990b36f4 Rubric sizing tweaks and text improvements. Diana Huang 2013-01-17 14:35:49 -05:00
• 77865f7ab2 Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce cahrens 2013-01-17 14:22:18 -05:00
• 7171e6b7cc Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates Diana Huang 2013-01-17 14:02:00 -05:00
• 18a3d5e734 Merge branch 'master' into feature/diana/rubric-input Diana Huang 2013-01-17 14:00:43 -05:00
• 3646ff53d8 Display updates and fixes. Diana Huang 2013-01-17 14:00:02 -05:00
• fe5d72857f Merge pull request #1300 from MITx/fix/cdodge/no-caching-in-preview chrisndodge 2013-01-17 10:17:16 -08:00
• 5f05ec83f1 Change the div being used to create code mirror to a textarea-- just make sure to escape the content! Update tests accordingly. cahrens 2013-01-17 13:11:47 -05:00
• fe964ec8ba disable caching in draft mode stores. It doesn't behave as we expect and we need more time to investigate Chris Dodge 2013-01-17 13:11:16 -05:00
• 45bb511e15 remove obsolete test (per Vik) Chris Dodge 2013-01-17 12:06:21 -05:00
• 2b4e9f45b9 Updates to the CSS and html formatting for statuses and self-assessment Diana Huang 2013-01-17 11:34:44 -05:00
• 1782c54e68 Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag Don Mitchell 2013-01-17 11:23:45 -05:00
• db4455e6e1 Cache Don Mitchell 2013-01-16 09:59:51 -05:00
• 480aa80db3 Cache Don Mitchell 2013-01-15 14:32:39 -05:00
• 9f33e3c755 Merge pull request #1294 from MITx/content/rocha/faq-update David Ormsbee 2013-01-17 08:15:12 -08:00
• 15249b03d6 Merge pull request #1296 from MITx/hotfix/alex/gst David Ormsbee 2013-01-17 08:14:39 -08:00
• fdd395e0b3 pearson registration - synced up link text for emailing edx Brian Talbot 2013-01-17 10:50:58 -05:00
• ebb2976332 Merge pull request #1298 from MITx/feature/christina/misc Don Mitchell 2013-01-17 07:50:43 -08:00
• 59b328f4b2 pearson registration - removed telephone/fax placeholder attributes since they can't represent both domestic and international formatting easily Brian Talbot 2013-01-17 10:49:57 -05:00
• 9fdb4d0923 Replace front page video Carlos Andrés Rocha 2013-01-16 17:08:54 -05:00
• 1be58c62e3 Update /faq page: change certificate of completion to mastery Carlos Andrés Rocha 2013-01-16 17:06:01 -05:00
• 00f83d03a0 Restore /faq page, and moved new content to /help Carlos Andrés Rocha 2013-01-16 17:03:27 -05:00
• b6fcf3a51e Some refactoring from Brian's submission. cahrens 2013-01-17 10:36:04 -05:00
• 80b2f45ac5 move pearson_import to another branch Brian Wilson 2013-01-17 10:14:55 -05:00
• 280a2f290e Merge branch 'master' into diana/open-ended-ui-updates Diana Huang 2013-01-17 10:09:16 -05:00
• fcf92a371d fix up testing failures post merge Chris Dodge 2013-01-17 09:48:10 -05:00
• df8d088492 Display updates to the xmodule. Diana Huang 2013-01-17 09:44:47 -05:00
• 589e848fd4 Pass along the correct display name to the controller Diana Huang 2013-01-17 09:44:13 -05:00
• 48cbf38a41 resolve merge conflicts Chris Dodge 2013-01-17 09:36:09 -05:00
• 22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 Chris Dodge 2013-01-17 09:15:37 -05:00
• d07a9203d1 in progress cahrens 2013-01-17 09:10:23 -05:00
• 358c56da9e Merge pull request #1297 from MITx/fix/cdodge/filesystem-xml-fixes chrisndodge 2013-01-17 05:55:22 -08:00
• 176be15998 removed unnecssary debug information Alexander Kryklia 2013-01-17 14:25:28 +02:00
• f22af62f2c removed jstat, added javascript_loader Alexander Kryklia 2013-01-17 14:22:13 +02:00
• 1d36e7baf9 now we invoke gst consturctor as callback to javascript_loader, so dependencies are loaded first Alexander Kryklia 2013-01-17 14:21:52 +02:00
• 4a59125bf9 add pearson import confirmation tool Brian Wilson 2013-01-16 17:51:31 -05:00
• e09728a3b2 Removing the unavailable tally John Jarvis 2013-01-16 17:48:46 -05:00
• 52e387e029 Add the force flag John Jarvis 2013-01-16 17:44:19 -05:00
• fea6feb04f Strip whitespace off of registration demographics before validation Brian Wilson 2013-01-16 17:39:33 -05:00
• 44141b6a55 pep8 cleanup John Jarvis 2013-01-16 17:39:26 -05:00
• 491027a814 Allow generation of certificates if they are in the generating state John Jarvis 2013-01-16 17:34:48 -05:00
• a756776836 pearson registration - revised rejection message text on dashboard, synced up email edx link text, revised contact styles/markup to remove giant red button dashboard for rejections Brian Talbot 2013-01-16 17:26:29 -05:00
• db7443ce7c studio html editor - added in visual assets needed for previous UI syncing Brian Talbot 2013-01-16 16:56:22 -05:00
• f34fd5c426 studio html editor - sync'ed up previous style and behavior work to refactored xmodule sass/js Brian Talbot 2013-01-16 16:55:11 -05:00
• fd20496a60 Merge pull request #1280 from MITx/feature/jth/attempts_reset David Ormsbee 2013-01-16 13:48:26 -08:00
• f7f563db9b Use reverse() to lookup student progress page, use index to lookup module_state_key John Hess 2013-01-16 16:44:25 -05:00
• e68e612ee1 Return 404 in begin_exam_registration when course or exam are not valid Brian Wilson 2013-01-16 16:40:28 -05:00
• 9079c66a32 Some interface cleanup stuff for the combined open ended module. Diana Huang 2013-01-16 16:35:58 -05:00
• 2f1363843b Merge pull request #1293 from MITx/feature/christina/misc chrisndodge 2013-01-16 12:49:27 -08:00
• c7f722daec Merge branch 'bugfix/brian/pearson-reg' of github.com:MITx/mitx into bugfix/brian/pearson-reg Brian Wilson 2013-01-16 15:43:30 -05:00
• 1de67be788 clear upload_status if user makes changes to TestCenterUser or TestCenterRegistration (so the change is pending, rather than rejected) Brian Wilson 2013-01-16 15:43:15 -05:00
• bc80779f6f Fix bug related to creation of thumbnails for non-image files. https://edx.lighthouseapp.com/projects/102637-studio/tickets/139-uploads-of-non-images-dont-have-reasonable-icon#ticket-139-2 cahrens 2013-01-16 15:40:14 -05:00
• 88427ea02f Update criteria for peer grading progress bars. Diana Huang 2013-01-16 15:15:55 -05:00
• ad68177e4d Merge pull request #1292 from MITx/bugfix/apenney/jenkins Jay Zoldak 2013-01-16 12:10:51 -08:00
• a9d3736cfb Replace all calls to analytics service to use the get methods (pulls from mongodb). Added error handling. jmvt 2013-01-16 15:09:54 -05:00
• 0193cc5976 Remove this altogether. Ashley Penney 2013-01-16 15:08:55 -05:00
• b16fa04371 pearson registration - resolved box-sizing display issue that caused form fields to not show text/be editable in Firefox/Mozilla Brian Talbot 2013-01-16 15:08:23 -05:00
• e8ba078d4e studio HTML editor - codemirror/tinymce toggle work - wip Brian Talbot 2013-01-16 14:54:28 -05:00