Commit Graph

  • 56d5e54150 Hook up about and jobs pages. Use named route for root. Matthew Mongeau 2012-06-27 13:52:49 -04:00
  • 59d0c408f0 collect static resources is now handled by the gunicorn upstart script John Jarvis 2012-06-27 13:12:55 -04:00
  • 4715c69c36 redesigns course item on home page and find courses page, refactors its implimentation and makes vrious other design improvements Galen Frechette 2012-06-26 23:25:57 -04:00
  • c5630e6d9f MITx -> edX in activation email ichuang 2012-06-26 23:09:52 -04:00
  • c0581f8c86 fix subject in activation email - now uses course_title ichuang 2012-06-26 23:07:24 -04:00
  • 200e188c09 add MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] config for edx4edx activation - issue is that content machine isn't whitelisted for email - this also provides secondary filtering for user registration ichuang 2012-06-26 23:00:25 -04:00
  • fee4ecf742 Merge pull request #149 from MITx/stable-edx4edx-aws pmitros 2012-06-26 16:52:46 -07:00
  • 7b86caafad adding edx4edx_aws for edx4edx aws instance John Jarvis 2012-06-26 19:34:53 -04:00
  • a3b38f2f3f Merge branch 'stable-edx4edx' of github.com:MITx/mitx into stable-edx4edx ichuang 2012-06-26 23:08:24 +00:00
  • bda75b4fbd add admin model for student (need to be able to see activation keys in db) ichuang 2012-06-26 23:07:45 +00:00
  • 5d9c600de8 3.091x static link ichuang 2012-06-26 19:04:51 -04:00
  • a1b53c3cd6 add 3.091x to multicourse ichuang 2012-06-26 18:40:07 -04:00
  • a681eed8a4 Fix additional urls. Matthew Mongeau 2012-06-26 17:46:37 -04:00
  • b8d50e51ee Course navigation work Matthew Mongeau 2012-06-26 17:23:16 -04:00
  • 4db0a70166 Fix code convention Prem Sichanugrist 2012-06-26 16:35:23 -04:00
  • 4580ef89d4 Queue up MathML conversion to be after render Prem Sichanugrist 2012-06-26 16:34:06 -04:00
  • 7475e415a4 Fix test failure after progress introduction Prem Sichanugrist 2012-06-26 16:25:50 -04:00
  • 6c95bfc175 Fix hover on textbook buttons Kyle Fiedler 2012-06-26 15:18:17 -04:00
  • fc81cf75c1 fixed padding issue on seq nav Kyle Fiedler 2012-06-26 14:56:17 -04:00
  • 65c8396eab Merge pull request #140 from MITx/kf-html-edit Calen Pennington 2012-06-26 11:51:19 -07:00
  • 6fdf44fe8d Make import work via mako again, to unblock others while I work on making the LMS work using XModuleDescriptors Calen Pennington 2012-06-26 14:35:21 -04:00
  • 084c4875be Merge pull request #144 from MITx/kf-seq-nav David Ormsbee 2012-06-26 11:34:54 -07:00
  • 2ec12f59c7 Merge pull request #145 from MITx/kf-sidebar-buttons David Ormsbee 2012-06-26 11:34:36 -07:00
  • 10c1270b8a Added fix for the sidebar buttons in the courseware Kyle Fiedler 2012-06-26 14:31:04 -04:00
  • 9983160995 Parse more module types as sequence modules Calen Pennington 2012-06-26 14:29:30 -04:00
  • 66ca31947a Remove semantically meaningless sections from course.xml by moving their attributes onto the contained element. If there is more than one contained element, turn the section into a sequence. Also handles includes Calen Pennington 2012-06-26 14:10:15 -04:00
  • aee2cf4ed5 Added new styles for the sequence nav including completeness Kyle Fiedler 2012-06-26 14:09:57 -04:00
  • f0cf323488 Handle chapters as sequence modules Calen Pennington 2012-06-26 12:14:41 -04:00
  • daf3eed4ee Handle unnamed modules during import Calen Pennington 2012-06-26 12:14:18 -04:00
  • e9a00ffc5a Parse XModuleDescriptors on import using from_xml Calen Pennington 2012-06-26 11:55:20 -04:00
  • 3f9554f20b Merge pull request #141 from MITx/ps-player-slider Prem Sichanugrist 2012-06-26 07:32:06 -07:00
  • 9aeaaa72a9 configuration running on content server: lms/envs/dev_edx4edx ichuang 2012-06-26 14:07:14 +00:00
  • caa14922bb edx4edx configuration running on content server. Notes: - django debug commented out in lms/envs/dev.py (temporarily - need cleanup) - email backend set - index page modified for edx4edx ichuang 2012-06-26 14:04:56 +00:00
  • a988452d4d Merge pull request #132 from MITx/kf-problems ichuang 2012-06-25 19:14:12 -07:00
  • a63a93873f various ui tweeks Galen Frechette 2012-06-25 17:47:36 -04:00
  • d9d6f9b749 Introduce rake cms:import task to import data Prem Sichanugrist 2012-06-25 16:38:06 -04:00
  • 5b4c501a71 Merge remote-tracking branch 'origin/kf-html-edit' into cpennington/cms-xml-processing Calen Pennington 2012-06-25 16:06:37 -04:00
  • 5644ed25b6 Merge branch 'prototype' into dormsbee/multicourse Galen Frechette 2012-06-25 16:03:27 -04:00
  • 915810d457 cleans up alignment of login and signup modals Galen Frechette 2012-06-25 14:18:01 -04:00
  • 1d7b30159b adds signup modal Galen Frechette 2012-06-25 13:53:10 -04:00
  • 05f4e4fb38 Scroll the caption upon video seeking Prem Sichanugrist 2012-06-25 12:22:37 -04:00
  • 863568ec99 Added red wip class and added tag for it Kyle Fiedler 2012-06-25 11:52:43 -04:00
  • 656fa38944 Added wip class Kyle Fiedler 2012-06-25 11:44:06 -04:00
  • 3081258836 Refactored the css and fixed some smaller bugs Kyle Fiedler 2012-06-25 11:21:15 -04:00
  • 5908d844b8 Added styles to be more consistant across pages Kyle Fiedler 2012-06-22 16:21:51 -04:00
  • b59b80871a add edit link to module pages with filenames (html & problem) uses new 'github_url' dict key in multicourse_settings this replaces the previous "quickedit" functionality ichuang 2012-06-24 14:12:20 -04:00
  • 9cea3f971f improved error handling - catch errors around lcp.get_html() ichuang 2012-06-24 12:40:56 -04:00
  • 84e59a54e6 improved symmath error handling for matrix shape mismatch ichuang 2012-06-23 17:05:09 -04:00
  • 7814805c1a improve capa error handling a bit - for better user experience - if no answer given, then symbolicresponse + customrepsonse now give an error message, instead of doing nothing - in capa_module if lcp.grade_answers fails, in DEBUG mode display alert with useful error message ichuang 2012-06-23 16:23:27 -04:00
  • 62f1717972 add more loncapa check functions (choose, rad2deg, deg2rad) ichuang 2012-06-23 16:20:05 -04:00
  • bccdeb2a90 fix quickedit.html for latest css ichuang 2012-06-23 16:19:41 -04:00
  • bb5278c63b Merge branch 'kf-problems' of github.com:MITx/mitx into stable-edx4edx ichuang 2012-06-22 18:28:27 -04:00
  • f041fc4a0b Merge pull request #135 from MITx/cpennington/cms-editing David Ormsbee 2012-06-22 10:06:51 -07:00
  • ced9136973 Merge remote-tracking branch 'origin/master' into cpennington/cms-xml-processing Calen Pennington 2012-06-22 11:40:19 -04:00
  • 968ff7325c Merge pull request #131 from MITx/victor/xml-testing Calen Pennington 2012-06-22 08:38:01 -07:00
  • 9e8f20104c added styles for ol in html units Kyle Fiedler 2012-06-22 11:17:31 -04:00
  • 83b3d51fd2 Wire up the cancel button in the unit editor Calen Pennington 2012-06-22 10:58:09 -04:00
  • 72eef72d8b Html Module can now be editing, saved, and re-opened Calen Pennington 2012-06-22 10:50:46 -04:00
  • f9bb8a701a Added new readme info and started to rework some of the css Kyle Fiedler 2012-06-22 09:42:16 -04:00
  • 5bef1e14b2 Split problem metadata out from problem editing contents when rendering Calen Pennington 2012-06-22 09:21:09 -04:00
  • 17a4d7fd09 Call js module name dynamically, rather than statically calling the HTML module Calen Pennington 2012-06-22 08:59:53 -04:00
  • 37539fdd4b revised 8.01x entry in dev_ike ichuang 2012-06-21 23:35:48 -04:00
  • 6566c45e6f use pipeline ichuang 2012-06-21 21:40:41 -04:00
  • 3cd02f6edc Merge branch 'kf-problems' of github.com:MITx/mitx into stable-edx4edx ichuang 2012-06-21 21:31:36 -04:00
  • 31226f58b8 updated dogfood to match latest xmodule mods in master ichuang 2012-06-21 21:28:21 -04:00
  • cd8051fb14 cleans up signed in users navigation Galen Frechette 2012-06-21 17:51:37 -04:00
  • 657fcd9984 Added new styles for html editing and removed a bunch of unused templates Kyle Fiedler 2012-06-21 17:36:21 -04:00
  • 93b8ad3e4d Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx ichuang 2012-06-21 16:46:56 -04:00
  • 82023f6bd3 Added styles for more basic html elements and reworked design of textinput Kyle Fiedler 2012-06-21 15:41:22 -04:00
  • 184d0ab038 added styles for lists and paragraphs in problems Kyle Fiedler 2012-06-20 15:53:29 -04:00
  • 69290c18c3 Live editing of html modules implemented, but no saving to the backend Calen Pennington 2012-06-21 15:33:52 -04:00
  • f87433e346 folders and a bit of initial test data for xml validation Victor Shnayder 2012-06-21 15:27:19 -04:00
  • 0f52b31ac1 Make the LMS check_course command work again. Victor Shnayder 2012-06-21 15:23:47 -04:00
  • 9bcdcec6ae adds about and jobs pages, cleans up header and login modal Galen Frechette 2012-06-21 14:46:45 -04:00
  • 9d0c52dfc4 Remove course title to clean up header. Matthew Mongeau 2012-06-21 14:01:43 -04:00
  • da204cf5d8 Started update of check_course script. It runs again now. Victor Shnayder 2012-06-21 11:48:19 -04:00
  • 98d513ac80 bugfix and added comments Victor Shnayder 2012-06-21 11:45:49 -04:00
  • bf8e70f94e check whether requestcontext exists before access Victor Shnayder 2012-06-21 11:28:02 -04:00
  • 325c58bda3 remove out of date README Victor Shnayder 2012-06-21 11:26:27 -04:00
  • 7bd0296b9c Direct form to /courses not /info Matthew Mongeau 2012-06-21 11:12:59 -04:00
  • f8ae7dc0cf Merge branch 'prototype' into dormsbee/multicourse Matthew Mongeau 2012-06-21 11:06:04 -04:00
  • 9202c1e2cc Redirect to /courses instead of /info Matthew Mongeau 2012-06-21 11:02:50 -04:00
  • 4239a0b308 add courses to front page David Ormsbee 2012-06-21 10:44:47 -04:00
  • 014109ab1a add corresponding view to new courseware url route :-P David Ormsbee 2012-06-21 10:20:51 -04:00
  • d82b32b3e2 add url route to new courseware David Ormsbee 2012-06-21 10:19:47 -04:00
  • a32aeac013 Add info page support with multiple courses David Ormsbee 2012-06-20 23:02:21 -04:00
  • 7e82f3243f Add scanning of data directory for courses. David Ormsbee 2012-06-20 21:14:58 -04:00
  • 8a1e275c8d bugfix: lcp score can apparently be 0/0 Victor Shnayder 2012-06-20 17:20:34 -04:00
  • 3961a5d8ca Progress tracking cleanup. Victor Shnayder 2012-06-20 16:01:56 -04:00
  • 17f8d04c28 Initial UI for sequence progress. Victor Shnayder 2012-06-20 15:55:21 -04:00
  • c4b9d339a8 Add scaffolding comments for progress tracking in video modules. Victor Shnayder 2012-06-20 15:53:59 -04:00
  • c35eb20e08 Fix other references to jquery after update to latest version Calen Pennington 2012-06-20 15:06:49 -04:00
  • 2723f0519d Fix render of lms index with no chapter or section. Victor Shnayder 2012-06-20 11:31:21 -04:00
  • b8c248fd75 minor edits to address Calen's comments. Victor Shnayder 2012-06-20 10:31:37 -04:00
  • 4590f9763f Add note about optional revision in location Calen Pennington 2012-06-20 08:33:46 -04:00
  • b5368f2a4f Initial progress display. Victor Shnayder 2012-06-19 18:16:14 -04:00
  • 6dc481516c Add Progress class and tests Victor Shnayder 2012-06-19 18:15:34 -04:00
  • 4a6722778e remove obsolete comment Victor Shnayder 2012-06-19 16:37:33 -04:00
  • 40871e0eed Fix accordion rendering bug Victor Shnayder 2012-06-19 16:19:45 -04:00
  • 3e2031cd43 Update jQuery and jQuery-UI to latest version Prem Sichanugrist 2012-06-19 14:27:34 -04:00