Commit Graph

  • edec1b5558 added styles for tutorial headers and removing extra padding on bottom sequence nav Kyle Fiedler 2012-05-07 15:26:28 -04:00
  • f9adfdbb50 Videos now support annotations w/o verticals Piotr Mitros 2012-05-07 10:42:48 -04:00
  • 4e915d5268 Masquerading works Piotr Mitros 2012-05-04 16:29:44 -04:00
  • 9d6878226f Remove the csrf domain from the default settings because we don't need it (we don't have requests going between multiple servers in the same domain). This will make it so that we can test servers from any url, rather than just a single url Calen Pennington 2012-05-04 14:52:24 -04:00
  • 9ac2c559a9 Make local file uploads work in dev environment Calen Pennington 2012-05-04 10:20:25 -04:00
  • 14c1a18687 Re-raise an integrity error during user creation if it's not caused by something we know to check for Calen Pennington 2012-05-04 14:41:56 -04:00
  • e02081b043 tiny bump in querystring call to CSS to make sure clients see updates David Ormsbee 2012-05-04 10:56:19 -04:00
  • 36b4b7bdb9 Catch user integrity errors, and then try and figure out what caused them (which removes a race condition) Calen Pennington 2012-05-03 15:16:05 -04:00
  • e725f59539 Add a settings file for doing grabs for main_static Calen Pennington 2012-05-03 15:14:02 -04:00
  • aae0820238 Removed python code in templates to be javascript. Bridger Maxwell 2012-04-17 13:54:47 -04:00
  • 7f069ac2ce Made sure that histogram graph doesn't show up for modules without scores. Modified look of histogram graph. Bridger Maxwell 2012-04-17 00:40:29 -04:00
  • 752a625237 Added histogram graph for courseware administrators. Bridger Maxwell 2012-04-17 00:17:12 -04:00
  • 6b10c0760b Merge branch 'master' into anonymous_user Calen Pennington 2012-05-08 13:54:57 -04:00
  • 1e7363458e Anonymize date stamps in problem solutions Calen Pennington 2012-05-08 10:19:01 -04:00
  • 4c0cc81d82 added tests Lyla Fischer 2012-05-07 23:05:31 -04:00
  • ca89ce73ab fixed mysterious problem rendering issue Lyla Fischer 2012-05-07 22:19:03 -04:00
  • eb95ea9e2f Merge branch 'master' into MC Lyla Fischer 2012-05-07 22:01:11 -04:00
  • f187a9e312 Capa no longer requires local filestore Piotr Mitros 2012-05-07 21:24:40 -04:00
  • 13a095fc1e checkboxes Lyla Fischer 2012-05-07 20:36:55 -04:00
  • aab9b15cd4 Refactor for reusability: x_modules take common parameters as an object. capa_problem to take a file object and not filename. Piotr Mitros 2012-05-07 20:59:08 -04:00
  • e1ac5e9f30 Moved extra settings into state. Added fs module for aux content Piotr Mitros 2012-05-07 20:13:30 -04:00
  • a0ecbca080 Make the accordian expand 'Week 1' by default Prem Sichanugrist 2012-05-07 18:28:52 -04:00
  • 48e2116c25 Fix the wrong package name in requirements file Prem Sichanugrist 2012-05-07 18:14:03 -04:00
  • 83edb536bd Merge pull request #22 from MITx/rewrite-javascript Prem Sichanugrist 2012-05-07 15:07:55 -07:00
  • a39c2c194d Rewrite Courseware navigation Prem Sichanugrist 2012-04-26 17:39:57 -04:00
  • 0ab9916017 Rewrite JavaScript on main page Prem Sichanugrist 2012-04-27 17:38:58 -04:00
  • 2c37950472 Add Jasmine to do a JavaScript unit test Prem Sichanugrist 2012-04-27 17:38:45 -04:00
  • 4ecb420fa7 Merge branch 'master' of github.com:MITx/mitx Piotr Mitros 2012-05-07 16:56:04 -04:00
  • 0e9511a4fc Added pyfilesystem to requirements.txt; needed for further hacking; want in common root Piotr Mitros 2012-05-07 16:55:39 -04:00
  • a172838715 Fixed some of the minor css bugs Kyle Fiedler 2012-05-07 16:11:26 -04:00
  • 1bd608e598 Make showanswer and rerandomize propogate downwards in course.xml Calen Pennington 2012-04-30 14:30:32 -04:00
  • 261ff83811 Add a guest_handouts.html for anonymous users Calen Pennington 2012-05-07 15:36:02 -04:00
  • d8ace6c318 added styles for tutorial headers and removing extra padding on bottom sequence nav Kyle Fiedler 2012-05-07 15:26:28 -04:00
  • 83ea75b7d8 Rename simplewiki settings file Calen Pennington 2012-05-07 15:01:43 -04:00
  • 49f402e3e7 Remove debug print statements Calen Pennington 2012-05-07 14:56:27 -04:00
  • 47c832647c Call user_groups even for anonymous users Calen Pennington 2012-05-07 14:56:17 -04:00
  • 6ebb521d62 Merge pull request #32 from MITx/pmitros/video-annotations David Ormsbee 2012-05-07 08:09:32 -07:00
  • ddcf68362a Videos now support annotations w/o verticals Piotr Mitros 2012-05-07 10:42:48 -04:00
  • 3cddaa4619 Merge pull request #19 from MITx/pmitros/histogram pmitros 2012-05-07 06:59:04 -07:00
  • 236b52cb04 Merge pull request #30 from MITx/cp-remove-csrf-domain pmitros 2012-05-07 06:57:47 -07:00
  • f36235c2ee Merge pull request #31 from MITx/pmitros-masquerade David Ormsbee 2012-05-04 13:41:14 -07:00
  • 6b6ef01cf0 Masquerading works Piotr Mitros 2012-05-04 16:29:44 -04:00
  • fefcd8570f Remove the csrf domain from the default settings because we don't need it (we don't have requests going between multiple servers in the same domain). This will make it so that we can test servers from any url, rather than just a single url Calen Pennington 2012-05-04 14:52:24 -04:00
  • 2b7b9ada60 Make local file uploads work in dev environment Calen Pennington 2012-05-04 10:20:25 -04:00
  • 7a9d142a76 Merge pull request #27 from MITx/user_integrity_error pmitros 2012-05-04 11:43:05 -07:00
  • 2a073a236a Re-raise an integrity error during user creation if it's not caused by something we know to check for Calen Pennington 2012-05-04 14:41:56 -04:00
  • c2f5f1d4a2 Merge pull request #28 from MITx/static_grab_settings pmitros 2012-05-04 08:20:46 -07:00
  • 33b0446510 tiny bump in querystring call to CSS to make sure clients see updates David Ormsbee 2012-05-04 10:56:19 -04:00
  • 7c74d798ad Styles for new layout to the amplifier Kyle Fiedler 2012-05-03 16:14:47 -04:00
  • 90b7737b0d Catch user integrity errors, and then try and figure out what caused them (which removes a race condition) Calen Pennington 2012-05-03 15:16:05 -04:00
  • c981620fc2 Add a settings file for doing grabs for main_static Calen Pennington 2012-05-03 15:14:02 -04:00
  • 24b6636a62 Fix issue with calculator zindex Kyle Fiedler 2012-05-02 13:51:37 -04:00
  • 4cc3e30d94 Redesign sequence bottom arrows Kyle Fiedler 2012-05-02 13:46:21 -04:00
  • 2992fb3dab Added edX logo to announecment Reda Lemeden 2012-05-01 19:08:48 -04:00
  • 4c1fee2bfa Merge pull request #26 from MITx/rl-announcement Calen Pennington 2012-05-01 13:40:57 -07:00
  • 8178acaa53 Removed sass/css comments Reda Lemeden 2012-05-01 16:34:41 -04:00
  • 49382769b0 Removed placeholder image Reda Lemeden 2012-05-01 16:28:55 -04:00
  • 2fb6b56ca4 Added the edx announcement to the MITx marketing page + Other content updates Reda Lemeden 2012-05-01 10:13:01 -04:00
  • 1f7a3f83b9 fixed naming convention on response types Lyla Fischer 2012-05-01 04:03:29 -04:00
  • a96adea404 Merge pull request #24 from MITx/ps-fix-accordian pmitros 2012-04-30 13:55:49 -07:00
  • 0871d95f98 Allow anonymous user access to the site. Requires guest_courses.xml and info/guest_updates.html to be set created in the data repository Calen Pennington 2012-04-30 15:18:47 -04:00
  • 58731a1c3a Add a showanswer='always' option Calen Pennington 2012-04-30 14:38:01 -04:00
  • faf0782d60 If rerandomize won't show different values, don't show the reset button Calen Pennington 2012-04-30 14:37:39 -04:00
  • 8ecb979339 Cleaning up imports Calen Pennington 2012-04-30 14:36:16 -04:00
  • e6015eb9e7 Make showanswer and rerandomize propogate downwards in course.xml Calen Pennington 2012-04-30 14:30:32 -04:00
  • 7938aa91d2 Use inline if-else to cleanup HTML Prem Sichanugrist 2012-04-30 12:01:31 -04:00
  • 5a0f31f8d1 Merge pull request #23 from MITx/email_reword Calen Pennington 2012-04-30 08:06:24 -07:00
  • 4bbce591a0 added html tags for show_answer Lyla Fischer 2012-04-28 20:41:49 -04:00
  • 35ab425755 fixed typo Lyla Fischer 2012-04-28 19:09:47 -04:00
  • 703bcf7fb0 wording changes Lyla Fischer 2012-04-28 18:38:15 -04:00
  • 08d789d963 removed error logs from the javascript and added curly braces Lyla Fischer 2012-04-28 07:01:16 -04:00
  • 59493ed090 multiple choice Lyla Fischer 2012-04-09 11:37:12 -04:00
  • 68c1d07f0d changed welcome email Lyla Fischer 2012-04-09 11:19:04 -04:00
  • 83f4e1eda3 Added fix for the bottom sequnce navigation Kyle Fiedler 2012-04-27 16:55:42 -04:00
  • bd56116b33 Fix calculator zindex issue Kyle Fiedler 2012-04-27 16:25:42 -04:00
  • 28a9e51348 Merge branch 'kf-amplifier' Kyle Fiedler 2012-04-27 14:32:38 -04:00
  • 7f6481b9f1 Fixed som issues with the calculator with ios Kyle Fiedler 2012-04-27 14:29:33 -04:00
  • 8f22127d45 Fix bugs with video player list styles Kyle Fiedler 2012-04-27 10:21:10 -04:00
  • 128ba351a6 Added better styles for play button Kyle Fiedler 2012-04-26 17:02:07 -04:00
  • 89fbd4611b Fixed margin padding issue for top of sliders Kyle Fiedler 2012-04-26 16:58:04 -04:00
  • bd8adcce97 Added styles for tabs Kyle Fiedler 2012-04-26 16:52:47 -04:00
  • b7cf6438e4 added generated css Kyle Fiedler 2012-04-26 14:02:56 -04:00
  • 38422b2c50 Shortened first column for controls Kyle Fiedler 2012-04-26 14:01:11 -04:00
  • c858ab0342 Added some slight text modification for amplifier Kyle Fiedler 2012-04-26 10:07:19 -04:00
  • 3464e8bca9 More tweeks to the amp Kyle Fiedler 2012-04-25 21:38:55 -04:00
  • 6362977ace Added some small tweeks to the amplifier Kyle Fiedler 2012-04-25 21:28:11 -04:00
  • 954397be34 More tweeks for the amplifier Kyle Fiedler 2012-04-25 15:23:02 -04:00
  • 32f154d7fb Added new styles for amplifier Kyle Fiedler 2012-04-25 14:19:42 -04:00
  • 74613b1f62 Merge pull request #16 from MITx/kf-tutorials Reda Lemeden 2012-04-26 10:49:47 -07:00
  • 05196249c1 Important :/ Kyle Fiedler 2012-04-26 13:33:27 -04:00
  • eef6fee0dd added styles to fix bullets showing up in sequence nav Kyle Fiedler 2012-04-26 13:31:21 -04:00
  • ad619e4dfc added styles to fix bullets showing up in sequence nav Kyle Fiedler 2012-04-26 13:31:01 -04:00
  • 7771c1d1de Added styles for headers for tutorials Kyle Fiedler 2012-04-26 13:28:48 -04:00
  • 97775532f9 Added better styles for titles and removed some white spaces Kyle Fiedler 2012-04-24 14:06:00 -04:00
  • 40de329405 More styles for tutorial index Kyle Fiedler 2012-04-24 11:08:52 -04:00
  • 070fb5fb74 Added new styles for tutorials Kyle Fiedler 2012-04-12 16:23:16 -04:00
  • caf5c04007 Adding users to generated fixture data Calen Pennington 2012-04-26 12:49:38 -04:00
  • dfc1749604 Adding code to anonymize fixture data Calen Pennington 2012-04-25 15:43:41 -04:00
  • c69e7cfeee Added style for unorderlists in courseware Kyle Fiedler 2012-04-25 15:33:09 -04:00
  • 9a0ff90a56 Adding configuration for the messages module Calen Pennington 2012-04-25 11:19:57 -04:00