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

Commit Graph

  • ad9400a0ef Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages Vik Paruchuri 2013-02-20 16:43:04 -05:00
  • 26a2e059c8 Actually display ETA message Vik Paruchuri 2013-02-20 16:36:40 -05:00
  • 111ef30f05 Render to string fix, display ETA message when student submits Vik Paruchuri 2013-02-20 16:30:44 -05:00
  • af2bfa9d4e Saving work in progress on v2 with capa template for annotation problem. Arthur Barrett 2013-02-20 16:30:19 -05:00
  • 67f97c2c56 update Victor's metadata inheritance comment Chris Dodge 2013-02-20 16:26:09 -05:00
  • 4b850f4da9 studio - notifications: made icon/copy area more bulletproof for longer lines of text Brian Talbot 2013-02-20 16:24:50 -05:00
  • 2f29d85efc Finish function to get eta value Vik Paruchuri 2013-02-20 16:22:22 -05:00
  • bd188f92ef put back the inheritable_metadata list into the XModuleDescriptor class. Also extend the metadata_inheritance test case Chris Dodge 2013-02-20 16:20:39 -05:00
  • 59b2f2ccd7 Move controller query service to xmodule side to prepare for ETA message displays Vik Paruchuri 2013-02-20 16:19:17 -05:00
  • d0fca477a8 edx.org - university pages' main banner images are now centered when window resizes Brian Talbot 2013-02-20 16:12:36 -05:00
  • fbce67a883 Merge pull request #1519 from MITx/diana/fix-self-assessment-test VikParuchuri 2013-02-20 13:02:02 -08:00
  • c572ba862a Delete unused method. cahrens 2013-02-20 15:47:07 -05:00
  • d9fb067355 Test point for formatting of JSON entry. cahrens 2013-02-20 15:34:53 -05:00
  • d2e97d2389 Merge pull request #1518 from MITx/press/international Victor Shnayder 2013-02-20 12:07:16 -08:00
  • dd959d1123 Longer warning got merged out. cahrens 2013-02-20 15:01:41 -05:00
  • 1ae06a45bb Add lower case urls for universities. Victor Shnayder 2013-02-20 14:59:28 -05:00
  • 7b60ec380a Merge branch 'master' into feature/cas/manual-policy-merged Brian Talbot 2013-02-20 14:58:50 -05:00
  • e157fd26c8 studio - manual policy editor: policy item spacing and overflow hidden on CodeMirror value fields Brian Talbot 2013-02-20 14:58:19 -05:00
  • ef3492aa40 studio - resolving local merge Brian Talbot 2013-02-20 14:48:21 -05:00
  • c7f5b74225 studio - manual policy editor: converting to new page layout and styling Brian Talbot 2013-02-20 14:46:54 -05:00
  • 1ccf0d48a8 Merge branch 'feature/cas/manual-policy-merged' of github.com:MITx/mitx into feature/cas/manual-policy-merged Jay Zoldak 2013-02-20 14:30:49 -05:00
  • 05f32f4bc9 Update tests for the advanced policy settings feature. Includes adding a method for css_click_at. Jay Zoldak 2013-02-20 14:30:39 -05:00
  • ad770a5ec8 studio - manual policy editor: converting to new page layout - WIP Brian Talbot 2013-02-20 14:24:13 -05:00
  • da223d9e11 remove raise statement which was just needed for debugging Chris Dodge 2013-02-20 14:13:19 -05:00
  • 756959812f add some comments regarding which code can be removed when the 'split mongo module store' work is completed Chris Dodge 2013-02-20 14:11:57 -05:00
  • ea13659249 Merge branch 'master' into diana/click-tracking Diana Huang 2013-02-20 14:02:04 -05:00
  • 453e249f16 studio - manual policy editor: converting to new page layout - WIP Brian Talbot 2013-02-20 13:54:19 -05:00
  • a789d6c363 Merge branch 'master' into diana/fix-self-assessment-test Diana Huang 2013-02-20 13:37:42 -05:00
  • 6e453c2b8b Clean up and fix some peer grading tests. Diana Huang 2013-02-20 13:36:09 -05:00
  • c3d485a609 Fix error message Vik Paruchuri 2013-02-20 13:33:17 -05:00
  • 3db3d7b740 Fix eta message slightly Vik Paruchuri 2013-02-20 13:31:06 -05:00
  • 59e3647692 Add in support for getting and displaying ETA Vik Paruchuri 2013-02-20 13:28:37 -05:00
  • 789db30176 Merge pull request #1520 from MITx/feature/vik/disable-spell-check Diana Huang 2013-02-20 09:45:32 -08:00
  • dbe93502f1 Fix tests Vik Paruchuri 2013-02-20 12:44:12 -05:00
  • 8acbeec3ad Comment out validation, update warning message. cahrens 2013-02-20 12:23:19 -05:00
  • 2302c3244b Merge branch 'feature/vik/disable-spell-check' into feature/vik/check-if-submission-allowed Vik Paruchuri 2013-02-20 12:01:42 -05:00
  • c48998b30a Fix SA tests Vik Paruchuri 2013-02-20 11:57:29 -05:00
  • 7be76fe124 Fix tests Vik Paruchuri 2013-02-20 11:54:57 -05:00
  • 4673c7392b Merge pull request #1458 from MITx/feature/diana/close-oe-problems VikParuchuri 2013-02-20 08:54:50 -08:00
  • 13d4cfa4d4 Merge branch 'master' into diana/click-tracking Diana Huang 2013-02-20 11:40:14 -05:00
  • ee3c658f46 Merge remote-tracking branch 'origin/master' into feature/vik/disable-spell-check Vik Paruchuri 2013-02-20 11:39:39 -05:00
  • 610e210cc8 Merge branch 'feature/victor/annotation-input' into feature/abarrett/annotatable_xmodule Arthur Barrett 2013-02-20 11:32:46 -05:00
  • 33c12647cb Merge branch 'master' into feature/abarrett/annotatable_xmodule Arthur Barrett 2013-02-20 11:31:53 -05:00
  • eefe87494d Merge branch 'feature/diana/close-oe-problems' of github.com:MITx/mitx into feature/diana/close-oe-problems Diana Huang 2013-02-20 11:23:28 -05:00
  • d0bd7466b4 Fix import statement for TimeInfo Diana Huang 2013-02-20 11:22:58 -05:00
  • b3767fc553 Merge branch 'master' into feature/diana/close-oe-problems Diana Huang 2013-02-20 11:20:10 -05:00
  • 2f68cba24d merged from master Arthur Barrett 2013-02-20 11:07:46 -05:00
  • 03a4deb847 Merge pull request #1489 from MITx/feature/vik/settings-to-xmodule Diana Huang 2013-02-20 08:06:20 -08:00
  • e467c057c9 Fix test so we don't have to skip it anymore. Diana Huang 2013-02-19 12:21:33 -05:00
  • cbc0406df2 Merge branch 'feature/cas/manual-policy-merged' of github.com:MITx/mitx into feature/cas/manual-policy-merged cahrens 2013-02-20 10:57:35 -05:00
  • 305f0b2a54 Add number of spaces for formatting of JSON. cahrens 2013-02-20 10:56:49 -05:00
  • 2bde448fbb Change coverage report config to reflect refactoring of terrain files Jay Zoldak 2013-02-20 09:31:50 -05:00
  • 67c2bac68f Pep8fix lettuce test code Jay Zoldak 2013-02-19 16:45:35 -05:00
  • 562fb67671 Remove portal (fake) app, move tests to courseware. Comment out tests that don't run correctly without prerequisites. Jay Zoldak 2013-02-19 15:49:25 -05:00
  • 7495bd0ae4 Move terrain module from lms to common. Jay Zoldak 2013-02-19 12:51:31 -05:00
  • 52caae2fee Merge pull request #1515 from MITx/feature/btalbot/studio-pagechrome Christina Roberts 2013-02-20 06:44:16 -08:00
  • 7dd1515f5d Merge pull request #1517 from MITx/feature/zoldak/refactor-terrain Jay Zoldak 2013-02-20 06:43:09 -08:00
  • 30edc380e1 Change coverage report config to reflect refactoring of terrain files Jay Zoldak 2013-02-20 09:31:50 -05:00
  • f2abc3c3e5 lms - revised classes and styling mechanics for login/register forms and added necessary screen-reader mixin for other visually hidden text in those pages Brian Talbot 2013-02-20 09:15:27 -05:00
  • 2981f532c1 Integrate Brian T's front-page changes, add epfl and delft Victor Shnayder 2013-02-19 22:04:20 -05:00
  • 105cbd3bfc Merge remote-tracking branch 'origin/style/btalbot/homepage-newxunis' into press/international Victor Shnayder 2013-02-19 21:52:06 -05:00
  • 2a6fde9db2 javascript to redirect to the course being accessed John Jarvis 2013-02-19 20:42:38 -05:00
  • fb70525417 dummy change to re-trigger jenkins ichuang 2013-02-19 19:50:36 -05:00
  • fd36c555a6 Renaming login url for modal-less login John Jarvis 2013-02-19 19:36:32 -05:00
  • bfbd7de042 Adding baseFontColor to _variables.scss John Jarvis 2013-02-19 19:36:15 -05:00
  • c234f3625e add full version of pdf.js, and main files for jquery-pdfdoc Brian Wilson 2013-02-19 18:05:36 -05:00
  • 6f922570ff made flex-grid references consistent within different page element Sass files Brian Talbot 2013-02-19 17:36:28 -05:00
  • c1c050a6b6 WIP on an inputtype for heroesX annotation Victor Shnayder 2013-02-19 17:35:40 -05:00
  • d14c8e2585 Merge branch 'drupal-new' of github.com:MITx/mitx into drupal-new Brian Talbot 2013-02-19 17:32:25 -05:00
  • 074f866b58 resolving some light footer display issues Brian Talbot 2013-02-19 17:32:17 -05:00
  • 4596fa417f Changing login and signin view names John Jarvis 2013-02-19 17:31:22 -05:00
  • b2839514f2 Merge branch 'drupal-new' of github.com:MITx/mitx into drupal-new Brian Talbot 2013-02-19 17:22:57 -05:00
  • 266e8951a4 made necessary code revisions per https://github.com/MITx/mitx/pull/1515/files#r3069750 Brian Talbot 2013-02-19 17:18:09 -05:00
  • 6981ba4e3f Get Save and Cancel working. cahrens 2013-02-19 17:08:10 -05:00
  • db6fa9a3aa Pep8fix lettuce test code Jay Zoldak 2013-02-19 16:45:35 -05:00
  • 040f840c9d Remove portal (fake) app, move tests to courseware. Comment out tests that don't run correctly without prerequisites. Jay Zoldak 2013-02-19 15:49:25 -05:00
  • 9096914782 Move terrain module from lms to common. Jay Zoldak 2013-02-19 12:51:31 -05:00
  • 1f247ceb0c edX Homepage - revised layout (HTML/CSS) for new edX universities and created logo assets Brian Talbot 2013-02-19 16:40:21 -05:00
  • 2b01ecc1af Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule Vik Paruchuri 2013-02-19 15:21:47 -05:00
  • 72d069825d Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed Vik Paruchuri 2013-02-19 15:21:09 -05:00
  • d5903c0e60 Make HTML better formatted. cahrens 2013-02-19 15:14:05 -05:00
  • 167d07037d Merged, delete Ace. cahrens 2013-02-19 14:56:37 -05:00
  • 34cc112cfb Saving work in progress on annotations v2 with classification problems. Arthur Barrett 2013-02-19 14:18:56 -05:00
  • 821e2d06e9 Merge pull request #1466 from MITx/feature/ichuang/fix-idashboard-error-message David Ormsbee 2013-02-19 11:08:21 -08:00
  • 45c80abecf Add initial images for ANU, McGill, Rice, Toronto. Victor Shnayder 2013-02-19 14:04:17 -05:00
  • 8c423da6db Updated test to reflect new class name for course titles. Jay Zoldak 2013-02-19 13:50:40 -05:00
  • 301d58d648 Update lettuce test with new button name for add new section. Jay Zoldak 2013-02-19 13:31:11 -05:00
  • f91060d197 Merge branch 'master' into feature/cas/manual-policy cahrens 2013-02-19 13:27:35 -05:00
  • dabcb51746 resolving merge conflicts John Jarvis 2013-02-19 12:43:06 -05:00
  • 585dff521a Merge branch 'master' into feature/btalbot/studio-pagechrome Brian Talbot 2013-02-19 12:27:49 -05:00
  • fca98c19a5 studio - adding in info icon to page intro help and making icon classes consistent in all new references Brian Talbot 2013-02-19 12:13:08 -05:00
  • 94a28f600b Merge pull request #1510 from MITx/bug/btalbot/html-strongspan Christina Roberts 2013-02-19 09:09:47 -08:00
  • 596de8ab2c Hook up "View Live" buttons and get "New Static Tab" working again. cahrens 2013-02-19 11:34:41 -05:00
  • 0db6247d96 Merge pull request #1513 from MITx/feature/vik/improve-oe-ui VikParuchuri 2013-02-19 08:15:42 -08:00
  • 9ee956a397 Skip self assessment test (fails due to need for querydict for getlist to work, but mocking querydict is painful) Vik Paruchuri 2013-02-19 11:05:43 -05:00
  • 956789e510 Merge pull request #1512 from MITx/fix/zoldak/coveragerc Calen Pennington 2013-02-19 07:57:09 -08:00
  • 2e85ba1a27 Omit migrations from code coverage reports. Also omit portal and terrain, which are used for the lettuce testing framework. Jay Zoldak 2013-02-19 10:54:02 -05:00
  • 4d57f1b9ee Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule Vik Paruchuri 2013-02-19 10:43:55 -05:00
  • 44fdc0135a Remove magic 8 ball grading Vik Paruchuri 2013-02-19 10:43:10 -05:00
  • 94613c3ed3 add a null guard Chris Dodge 2013-02-19 10:33:38 -05:00