Commit Graph

  • 08ddd03b5d Merge pull request #184 from MITx/template_caching bridger 2012-07-17 09:49:21 -07:00
  • 615f11e27b Merge remote-tracking branch 'origin/master' into template_caching Bridger Maxwell 2012-07-17 12:47:53 -04:00
  • 02a30ef05a Merge pull request #188 from MITx/dormsbee/portal_display_tweaks Calen Pennington 2012-07-17 08:42:42 -07:00
  • 938f0d1995 Changed check_course from a decorator to a regular function that throws exceptions. Much easier to understand now. Bridger Maxwell 2012-07-17 11:12:42 -04:00
  • 934b37c195 Remove json import from capa_problem -- needed for debug kimth 2012-07-17 11:12:23 -04:00
  • b4a8417e70 Use Course.number, remove final exam and content length from the course sidebar (do we have that data yet?) David Ormsbee 2012-07-17 11:03:49 -04:00
  • 803b0c4fd0 Callback uses userid rather than username kimth 2012-07-17 10:59:27 -04:00
  • 28fc3ec18a Add overview.html, a simple one page place where course staff can control a course about page. David Ormsbee 2012-07-17 10:54:21 -04:00
  • 8ebaf8a761 Merge remote-tracking branch 'origin/master' into course_start Bridger Maxwell 2012-07-17 10:52:39 -04:00
  • 269468ba6e CorrectMap.is_queued and .is_right_queuekey defaults to False if answer_id not found kimth 2012-07-17 10:47:10 -04:00
  • 0958485b46 update_score: edit existing CorrectMap rather than starting with empty CorrectMap kimth 2012-07-17 10:31:21 -04:00
  • c85cf38a3f Merge pull request #187 from MITx/dormsbee/portal_display_tweaks Calen Pennington 2012-07-17 06:26:03 -07:00
  • f6cc97a9ce Minor formatting change in OSX docs for CMS import Calen Pennington 2012-07-17 09:22:09 -04:00
  • 17c3d068cf Add basic documentation of importing data into the CMS for development Calen Pennington 2012-07-17 09:20:38 -04:00
  • c0e8dc1b69 Remove duplicate entries of courses. David Ormsbee 2012-07-17 08:25:17 -04:00
  • 373db8704d Add number property to CourseDescriptor and switch templates to use it. David Ormsbee 2012-07-17 08:21:10 -04:00
  • 27ec1b4dcf Change course listing to show course numbers + title David Ormsbee 2012-07-16 16:56:25 -04:00
  • e8516c5a3e Shorten course about link David Ormsbee 2012-07-16 14:31:13 -04:00
  • d20eb07722 Allow UTF-8 chars in about sections. David Ormsbee 2012-07-16 11:25:58 -04:00
  • d38903ac35 Merge remote-tracking branch 'origin/master' into template_caching Bridger Maxwell 2012-07-16 23:33:40 -04:00
  • 767469381b renames some scss files for better orginization, sets fixed widths on main containers to avoid akward scaling issues untill media queries can be added for more responsive scaling Galen Frechette 2012-07-16 22:23:43 -04:00
  • 600aff59a6 imporves course object header typography Galen Frechette 2012-07-16 19:29:02 -04:00
  • 36408a8d5a Removing lms/static/sass/application.css again. Bridger Maxwell 2012-07-16 17:33:51 -04:00
  • 96361c3fd5 adds icons to course about page, user nav and dashboard, adds styles to activation pages Galen Frechette 2012-07-16 17:29:14 -04:00
  • e7fa42261d Ignoring +lms/static/sass/application.css Bridger Maxwell 2012-07-16 17:11:27 -04:00
  • ffb341f6b3 Merge pull request #186 from MITx/ccp0101/capa_pythonpath ichuang 2012-07-16 14:06:28 -07:00
  • d690a0de24 Removing compiles application.css file. Bridger Maxwell 2012-07-16 17:03:31 -04:00
  • 8365c2fdad Merge branch 'master' into ccp0101/capa_pythonpath Arjun Singh 2012-07-16 16:54:51 -04:00
  • 0682401841 Allows for additional paths when executing code in a loncapa problem. Adds a default path of data/course/code. Arjun Singh 2012-07-16 16:53:38 -04:00
  • 093ac9d101 CorrectMap in LMS keeps track of problems as being queued kimth 2012-07-16 16:19:35 -04:00
  • bde93aea99 Merge remote-tracking branch 'origin/master' into template_caching Bridger Maxwell 2012-07-16 16:19:26 -04:00
  • 70e2f7c0d5 Merged with master. Moved a bunch of static template files to their own urls (without /t/template). Bridger Maxwell 2012-07-16 15:32:22 -04:00
  • c343734297 Merge pull request #183 from MITx/victor/cms_more_auth Victor Shnayder 2012-07-16 11:12:58 -07:00
  • f8ce11a6b5 Add fixes to notes in #182 Victor Shnayder 2012-07-16 14:08:03 -04:00
  • f887827917 Merge pull request #182 from MITx/victor/cms_more_auth Calen Pennington 2012-07-16 10:45:06 -07:00
  • 960c8619e5 Added a cache_if_anonymous decorator. Bridger Maxwell 2012-07-16 13:40:17 -04:00
  • 2d3bab4188 styles activation message Galen Frechette 2012-07-16 13:34:12 -04:00
  • 97a2422662 simplify rakefile a bit in response to comments on #178 Victor Shnayder 2012-07-16 13:24:52 -04:00
  • caf163eb41 fix description of mitxmako Victor Shnayder 2012-07-16 12:26:33 -04:00
  • 49576f9ddb address comments in pull #178 Victor Shnayder 2012-07-16 12:25:25 -04:00
  • 5609ca6e2b remove empty marketing template Victor Shnayder 2012-07-16 12:24:49 -04:00
  • d10f49d74b add reg_complete template Victor Shnayder 2012-07-16 12:10:54 -04:00
  • ddf84d807d add login and logout links to cms header Victor Shnayder 2012-07-16 12:02:08 -04:00
  • acd57fb7c5 Save author info in commit messages. Victor Shnayder 2012-07-16 11:34:24 -04:00
  • 942ea2c7ba fix typo Victor Shnayder 2012-07-16 11:33:36 -04:00
  • 5a766c085d Fix signup form link Victor Shnayder 2012-07-16 11:33:10 -04:00
  • 264a5b5557 fix repo paths (to data/) Victor Shnayder 2012-07-16 11:32:52 -04:00
  • 3f356bfb1b Add basic framework for checking permissions Victor Shnayder 2012-07-16 10:05:24 -04:00
  • c176a7fe92 Add account creation and login to CMS Victor Shnayder 2012-07-15 14:01:01 -04:00
  • 5033ec656c changes home page header design to accomodate new tagline, adds copy to about page and 1 blog post Galen Frechette 2012-07-16 12:58:58 -04:00
  • ed624d0b72 Cleaned up check_course decorator a bit. Bridger Maxwell 2012-07-16 12:54:24 -04:00
  • 4f4e751321 Merge Bridger Maxwell 2012-07-16 12:42:49 -04:00
  • f889c9a099 Actually exclude things outside of the mitx repo, rather than only including those things Calen Pennington 2012-07-16 12:36:52 -04:00
  • 04469a4e8e Strip out STATICFILES_DIRS that aren't in the mitx repo when running unit tests Calen Pennington 2012-07-16 12:04:50 -04:00
  • 0c41576e1e Some changes from code review. Bridger Maxwell 2012-07-16 12:00:20 -04:00
  • 8ef8162963 Fix courseware problem display Calen Pennington 2012-07-16 11:41:51 -04:00
  • ab2995fc85 Remove compiled css files Calen Pennington 2012-07-16 11:41:18 -04:00
  • 838a8624c9 Add docstring to 'score_update' path kimth 2012-07-16 11:28:26 -04:00
  • 264e324c50 Changed format of start date parsing to ISO 8601 Bridger Maxwell 2012-07-16 11:27:13 -04:00
  • 412a907a8a allow additional (python) path for scripts in capa problem. Mike Chen 2012-07-16 23:16:39 +08:00
  • fabe1d41d1 Merge pull request #180 from MITx/kimth/lms-coderesponse Calen Pennington 2012-07-16 07:55:54 -07:00
  • 4489a04586 Merge pull request #178 from MITx/victor/cms_auth Calen Pennington 2012-07-16 07:33:45 -07:00
  • 1c027c43d2 hooks up links from login modal to signup modal and signup modal to login modal Galen Frechette 2012-07-16 10:27:55 -04:00
  • eb7ae3540c Added a simple, specific cache for the static_template_pages. Bridger Maxwell 2012-07-16 09:12:50 -04:00
  • 15b544c50b makes logo bigger, imporves footer layout with additin of new links Galen Frechette 2012-07-15 23:11:16 -04:00
  • d9e293f9c5 imporves typography and typography implimentation Galen Frechette 2012-07-14 03:11:06 -04:00
  • cd2eacc675 Moved static template views to one folder. Removed the stub view functions from student and used static_template_views instead. Bridger Maxwell 2012-07-13 17:42:23 -04:00
  • 3be186c142 improves style of video modals Galen Frechette 2012-07-13 14:22:04 -04:00
  • b833f52d9c adds autoplaying to modal videos when opened, stops video playback when modal closes Galen Frechette 2012-07-13 13:39:40 -04:00
  • cd345ae3bb converts modals to use jquery leanModal Galen Frechette 2012-07-12 22:32:09 -04:00
  • 3fca8a9dd0 cleans up rss feed on home page, still wip Galen Frechette 2012-07-12 18:17:32 -04:00
  • e7c25c9999 Remove reset button being on all the time (for debug) kimth 2012-07-13 13:57:29 -04:00
  • 296ae34e34 wip news feed on home page Galen Frechette 2012-07-12 17:49:39 -04:00
  • 35c5de8128 cleans up home page header design, adds social sharing to header, adds tos, privacy policy, honor code, help and copyright pages, add liks to those pages in footer, finished contact page Galen Frechette 2012-07-12 14:48:34 -04:00
  • 1ea8bd2666 imporves visual design of course info/profile page Galen Frechette 2012-07-11 17:35:30 -04:00
  • 8a5e3bf4d2 adds pressrelease page, breaks about content into seperate pages, imporvoves some visual elements of about and jobs pages Galen Frechette 2012-07-11 14:09:13 -04:00
  • 6d3516a754 CodeResponse for queued code checking kimth 2012-07-13 13:45:38 -04:00
  • f9de962365 Merge remote-tracking branch 'origin/master' into course_start Bridger Maxwell 2012-07-13 13:40:01 -04:00
  • 60da23042f Adding a setting to disable the wiki in deployment. Bridger Maxwell 2012-07-13 13:36:38 -04:00
  • 1f1fab4992 add fasttest rake command Victor Shnayder 2012-07-13 12:07:42 -04:00
  • 339e9a68f4 Make end-to-end tests work again Victor Shnayder 2012-07-13 11:23:09 -04:00
  • 4604ca63fe Add some docs on static file handling Victor Shnayder 2012-07-13 10:39:29 -04:00
  • ff59c9bfa9 Initial connection of student module with cms. Victor Shnayder 2012-07-11 16:45:33 -04:00
  • 924a911139 formatting fixes and note about bug Victor Shnayder 2012-07-11 16:38:53 -04:00
  • 6e98255cd5 remove reference to course from signup email subject Victor Shnayder 2012-07-11 16:38:22 -04:00
  • 39a1502e1a Move student app from lms to common Victor Shnayder 2012-07-12 13:20:57 -04:00
  • ecc50314f7 Added a decorator that prevents access to course pages until the course has started. Bridger Maxwell 2012-07-13 10:31:36 -04:00
  • 214d03c1fa Merge pull request #177 from MITx/feature/lms-static-files David Ormsbee 2012-07-12 14:51:03 -07:00
  • d1f8f4bef0 Forgot to add this file in the last commit. Bridger Maxwell 2012-07-12 17:10:12 -04:00
  • d5a5fcec4d Fixed the errors that were breaking tests from unused simplewiki files and a half-migrated certificates module. Bridger Maxwell 2012-07-12 16:43:48 -04:00
  • 8d7c4ad8de Added a start date to courses. Created a decorator to retrieve the course and check that it is open. Bridger Maxwell 2012-07-12 16:27:20 -04:00
  • fefda5db62 Only munge /static/ urls in module html to point to course static files if they don't exist in the global static locations Calen Pennington 2012-07-12 16:09:34 -04:00
  • c3ba8817e9 Correctly add course_dirs to static files Calen Pennington 2012-07-12 16:06:05 -04:00
  • 305cd30da9 The path user by url is based on the output css file, which ends up in static/sass, so only use ../, rather than ../../, to reference images Calen Pennington 2012-07-12 16:03:12 -04:00
  • d1d57e81cf Don't crash the system if you can't parse an xml file while loading a definition for a module descriptor Calen Pennington 2012-07-12 14:04:09 -04:00
  • 51d9ad1513 Merge pull request #175 from MITx/jarv/update-activation Calen Pennington 2012-07-12 10:43:27 -07:00
  • 1a3549903c updating activation mail, adding Gemfile.lock to gitignore John Jarvis 2012-07-12 13:41:51 -04:00
  • b48d08b2c5 Minor changes from pull request 170 Calen Pennington 2012-07-12 11:40:02 -04:00
  • 28007b280c Merge pull request #168 from MITx/multicourse_wiki bridger 2012-07-12 07:35:17 -07:00
  • bc21cdfaa5 Merge pull request #167 from MITx/utf8_migration_merge bridger 2012-07-12 07:34:45 -07:00