Commit Graph

  • 4097bc1022 settings - revised grading slider UI cosmetics Brian Talbot 2012-11-26 13:33:57 -05:00
  • ef95e1d95f settings - added in controls for sorting discussion categories Brian Talbot 2012-11-26 11:48:56 -05:00
  • 8e68573243 Merge pull request #1041 from MITx/fix/cdodge/video-captions Calen Pennington 2012-11-26 08:29:05 -08:00
  • 706a825332 Merge pull request #1076 from MITx/feature/cale/rake-improvements David Ormsbee 2012-11-26 08:28:37 -08:00
  • 2145ff6d1f Provide more info when django has issues when running from rake, and don't install dependencies of common/lib/libraries before every run of a django command Calen Pennington 2012-11-26 11:25:46 -05:00
  • 6d45445aef assume that users are putting caption information in /static/subs. We'll enforce this on the xlint utility Chris Dodge 2012-11-14 11:14:30 -05:00
  • 2d7f1b73d7 consolidate logic to compute caption path to server-side, we don't need to do this client-side Chris Dodge 2012-11-13 13:27:03 -05:00
  • 71f16d40e1 wire through course asset path information to the video playback module and corresponding .coffee files Chris Dodge 2012-11-13 13:15:30 -05:00
  • 4e3da342d7 Merge pull request #1048 from MITx/feature/cdodge/xlint Calen Pennington 2012-11-26 08:11:34 -08:00
  • fff3782884 cleave xlint entry point in xml_importer.py to be separate from the import method Chris Dodge 2012-11-26 11:05:57 -05:00
  • f2fec99efa fixed header float bug Tom Giannattasio 2012-11-26 10:46:02 -05:00
  • ee618d4223 Merge pull request #1069 from MITx/feature/cas/tom/lms-styles Calen Pennington 2012-11-26 06:57:57 -08:00
  • 86ebba3f0e removed askbot Tom Giannattasio 2012-11-26 09:55:37 -05:00
  • c6a9f722cc Merge pull request #1049 from MITx/feature/jzoldak/cms-unit-testing Calen Pennington 2012-11-26 06:54:50 -08:00
  • 2b6e2b5143 Merge pull request #1056 from MITx/bugfix/ichuang/xml_importer Calen Pennington 2012-11-26 06:54:22 -08:00
  • b250cad6ee Merge pull request #1075 from MITx/fix/cdodge/env-bad-checkin chrisndodge 2012-11-26 06:44:59 -08:00
  • 2524cd614a fix edit conflict Chris Dodge 2012-11-26 09:36:59 -05:00
  • 3b29ab373d check for staff access before creating forum admin Brian Wilson 2012-11-26 01:27:16 -05:00
  • 01b5992372 comment outputs Александр 2012-11-22 18:53:35 +02:00
  • 4b4b2c9927 added documentation, tests, and rounding to closes 0.05 value Александр 2012-11-22 18:44:31 +02:00
  • 77c831eb10 documenation for chem.miller Александр 2012-11-22 18:43:41 +02:00
  • 3e8e576e28 Slight change in caption for lattice select. Valera Rozuvan 2012-11-22 16:52:59 +02:00
  • 37714d45ac Merge branch 'feature/alex/crystallography-update-mitx' of github.com:MITx/mitx into feature/alex/crystallography-update-mitx Valera Rozuvan 2012-11-22 13:56:00 +02:00
  • 19c463b739 Removed radio buttons for selecting the intersection type from crystallography template. Valera Rozuvan 2012-11-22 13:55:50 +02:00
  • 166ff823a7 removed hidden parameter to template, style='hidden' is set by default for input Александр 2012-11-22 12:53:21 +02:00
  • 0ebdbb92ca Merge branch 'feature/btalbot/cms-settings' of git@github.com:MITx/mitx.git into feature/dhm/cms-settings Don Mitchell 2012-11-21 15:29:35 -05:00
  • f0c94a2c7e Beginning test of details tab. Don Mitchell 2012-11-21 15:17:18 -05:00
  • baf8b481c8 settings - added in drag and drop anchors - wip Brian Talbot 2012-11-21 13:58:56 -05:00
  • 111667defd UI delta and tests: Александр 2012-11-21 19:02:40 +02:00
  • 33159824a5 added test for lattices Александр 2012-11-21 18:02:48 +02:00
  • d5dd725537 miller indices calculation Александр 2012-11-21 17:53:51 +02:00
  • aaeffa5316 Updated template for crystallography so that it corresponds to the cnahges made in the JS part. Valera Rozuvan 2012-11-21 16:52:17 +02:00
  • 471ae42d1d Merge pull request #1071 from MITx/bugfix/dave/fix_inline_discuss_css David Ormsbee 2012-11-20 16:04:49 -08:00
  • 0a66ef1acc Redo the part of 010bccc8a5 that address the test failure David Ormsbee 2012-11-20 18:45:17 -05:00
  • 658c92037c Revert "Make tests pass again without askbot" -- that commit removed scss files that were still being partially used by the current discussion forum. David Ormsbee 2012-11-20 18:43:00 -05:00
  • 4b017e711d updated models and vies f for flagging Your Name 2012-11-20 17:00:16 -05:00
  • 57cb8c1e21 Add unit tests Brian Wilson 2012-11-20 15:56:18 -05:00
  • 619ac10069 Merge remote-tracking branch 'origin/master' into feature/brian/dashboard-manage-mods Brian Wilson 2012-11-20 15:46:49 -05:00
  • 62ffc246f7 Merge pull request #1070 from MITx/feature/jarv/cert-status-fix Victor Shnayder 2012-11-20 12:22:45 -08:00
  • 6d28be0439 Adding management command to grade students who were not previously graded John Jarvis 2012-11-20 15:18:25 -05:00
  • b8cfe80145 Saving grade for non-passing students John Jarvis 2012-11-20 15:18:09 -05:00
  • 57b70092e8 update front end to handle flagging Your Name 2012-11-20 13:39:33 -05:00
  • a98cead8ee added basic lms styles Tom Giannattasio 2012-11-20 13:02:08 -05:00
  • f8ee5c2614 Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into feature/dhm/cms-settings Don Mitchell 2012-11-20 11:55:19 -05:00
  • 339949f934 Another checkpoint before pull/merge Don Mitchell 2012-11-20 11:37:14 -05:00
  • 6c3c377619 settings - general class/ID naming convention cleaning Brian Talbot 2012-11-20 11:34:16 -05:00
  • 000042e2dd Merge pull request #1068 from MITx/bugfix/victor/dashboard David Ormsbee 2012-11-20 07:30:35 -08:00
  • f8dc85b6f8 oops. used wrong variable name. Victor Shnayder 2012-11-20 10:28:47 -05:00
  • a69d3cb064 settings - discussion UI revision Brian Talbot 2012-11-20 09:32:13 -05:00
  • 278c731aef settings - made assignment types user-determined fields vs. pre-set types in UI Brian Talbot 2012-11-20 09:26:40 -05:00
  • 5a225cade4 Merge pull request #1067 from MITx/bugfix/victor/dashboard David Ormsbee 2012-11-20 06:25:06 -08:00
  • 5a03b53a2f cert bugfix: handle students who don't have a grade Victor Shnayder 2012-11-20 09:20:03 -05:00
  • f29f605f62 settings - refactored radio/checkbox input formatting Brian Talbot 2012-11-20 08:40:45 -05:00
  • a3db017580 Updated crystallography template to reflect changes made in the JS part. Valera Rozuvan 2012-11-20 14:19:48 +02:00
  • af908104df fixed html tab; started adding upload within widget Tom Giannattasio 2012-11-19 16:00:19 -05:00
  • c233740057 cleaning up of asset widget; html tab is broken Tom Giannattasio 2012-11-19 13:57:15 -05:00
  • 8abf93cc36 search and upload button added to widget Tom Giannattasio 2012-11-16 17:00:53 -05:00
  • 9613f92fad asset widget inserts into tiny Tom Giannattasio 2012-11-16 16:36:40 -05:00
  • f16e7b2ede added asset library widget template Tom Giannattasio 2012-11-16 13:30:56 -05:00
  • d521c850de started adding asset widget Tom Giannattasio 2012-11-16 13:02:27 -05:00
  • ac20da3f30 removed plugins, adjusted visualEditor reference Tom Giannattasio 2012-11-16 11:43:43 -05:00
  • c7dbdc1242 added asset button to visual editor Tom Giannattasio 2012-11-16 11:43:21 -05:00
  • 10a4d4ec25 tiny mce styling Tom Giannattasio 2012-11-15 16:45:54 -05:00
  • b38072207e primary tiny mce integration Tom Giannattasio 2012-11-15 13:45:32 -05:00
  • 9c3c72ad3c discussion editor and preview added; string response glitch fixed Tom Giannattasio 2012-11-09 15:49:06 -05:00
  • daea87ebb9 simple html editor added Tom Giannattasio 2012-11-09 09:58:15 -05:00
  • e446ed8118 removed stupid console log Tom Giannattasio 2012-11-08 14:46:49 -05:00
  • 9c06a4fc07 updated cheatsheet to match simpler syntax Tom Giannattasio 2012-11-08 14:17:51 -05:00
  • f8ee3efc7a simplified syntax to match arjun's for string and numerical response Tom Giannattasio 2012-11-08 14:16:42 -05:00
  • f2eb665626 cheatsheet and advanced settings added Tom Giannattasio 2012-11-08 13:13:54 -05:00
  • 44fb9561e8 added a ton of speed editor goodness Tom Giannattasio 2012-11-07 17:21:20 -05:00
  • 5953be7463 fix testing for forum admin privileges Brian Wilson 2012-11-20 01:38:33 -05:00
  • 7ac7f9ef22 start work on unit test. Brian Wilson 2012-11-19 18:12:57 -05:00
  • 3648630283 Merge pull request #1065 from MITx/content/rocha/gates-foundation-announcement David Ormsbee 2012-11-19 13:51:05 -08:00
  • 3ca4de303b Update caption of photo on Gates Foundation announcement Carlos Andrés Rocha 2012-11-19 16:30:12 -05:00
  • a482a41b6c Merge pull request #1064 from MITx/content/rocha/gates-foundation-announcement David Ormsbee 2012-11-19 13:21:06 -08:00
  • 7fecf1f212 Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into feature/dhm/cms-settings Don Mitchell 2012-11-19 16:20:12 -05:00
  • 4b5e545045 Add photo credit to gates foundation press release Carlos Andrés Rocha 2012-11-19 16:19:11 -05:00
  • 44258c1f09 Merge pull request #1063 from MITx/feature/cale/fix-tests-no-askbot David Ormsbee 2012-11-19 13:06:10 -08:00
  • 010bccc8a5 Make tests pass again without askbot Calen Pennington 2012-11-19 16:02:49 -05:00
  • 241c9bb1ac Checkpoint to rebase Don Mitchell 2012-11-19 16:02:30 -05:00
  • a9233dfd44 Merge branch 'course-info' into feature/dhm/cms-settings Don Mitchell 2012-11-19 16:00:27 -05:00
  • c2ef44443b Merge pull request #1060 from MITx/content/rocha/gates-foundation-announcement David Ormsbee 2012-11-19 12:52:43 -08:00
  • 4e876b056e Merge pull request #1062 from MITx/fix/cdodge/xmodule-script-load-bug Calen Pennington 2012-11-19 12:52:36 -08:00
  • 71db139045 Update Gates Foundation press release thumbnail Carlos Andrés Rocha 2012-11-19 15:50:17 -05:00
  • d370307917 settings - simplified course details fields per Mark's feedback and radio/checkbox UI Brian Talbot 2012-11-19 15:48:57 -05:00
  • ec6b1a12e9 insert the xmodule.coffee dependency into HTMLSnippet().get_javascript(). This allows us a single point to define this dependency. Chris Dodge 2012-11-19 15:46:57 -05:00
  • 35528d9c22 Merge pull request #1061 from MITx/feature/jarv/cert-status-fix Victor Shnayder 2012-11-19 12:44:25 -08:00
  • 9c9dd05666 Missing course_id filter for certificate summary John Jarvis 2012-11-19 15:41:00 -05:00
  • ee7a8494e6 finish basic implementation of forum admin on instructor dash Brian Wilson 2012-11-19 14:59:34 -05:00
  • c7784e30fd settings - radio/checkbox UI - wip Brian Talbot 2012-11-19 14:59:25 -05:00
  • ab87ff6b20 settings - field alignment, radio/checkbox formatting Brian Talbot 2012-11-19 14:55:32 -05:00
  • 82262b4ded Fix bug in news carousel on student dashboard Carlos Andrés Rocha 2012-11-19 14:35:04 -05:00
  • 03c8c54e4a Add photo to the gates foundation announcement Carlos Andrés Rocha 2012-11-19 14:32:57 -05:00
  • a9e2b77d6b Merge pull request #1059 from MITx/feature/tom/dashboard-carousel David Ormsbee 2012-11-19 11:09:49 -08:00
  • 815da69d34 Cleanup a bit javascript of news carousel on student dashboard Carlos Andrés Rocha 2012-11-19 14:08:00 -05:00
  • 1afb982e8d Update Gates Foundation news release feed image Carlos Andrés Rocha 2012-11-19 13:42:16 -05:00
  • 1a2cee360a Update news releases images Carlos Andrés Rocha 2012-11-16 18:31:07 -05:00
  • fd3c5566b8 Move press release images to their own folder Carlos Andrés Rocha 2012-11-14 17:58:08 -05:00
  • 2511c4ddf6 Clean carousel javascript Carlos Andrés Rocha 2012-11-13 18:32:59 -05:00