Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

58450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Chen
412a907a8a allow additional (python) path for scripts in capa problem. 2012-07-16 23:16:39 +08:00
Calen Pennington
fabe1d41d1 Merge pull request #180 from MITx/kimth/lms-coderesponse 
CodeResponse for external/queued grading of student code
 2012-07-16 07:55:54 -07:00
Calen Pennington
4489a04586 Merge pull request #178 from MITx/victor/cms_auth 
Victor/cms auth
 2012-07-16 07:33:45 -07:00
Galen Frechette
1c027c43d2 hooks up links from login modal to signup modal and signup modal to login modal 2012-07-16 10:27:55 -04:00
Bridger Maxwell
eb7ae3540c Added a simple, specific cache for the static_template_pages. 2012-07-16 09:12:50 -04:00
Galen Frechette
15b544c50b makes logo bigger, imporves footer layout with additin of new links 2012-07-15 23:11:16 -04:00
Galen Frechette
d9e293f9c5 imporves typography and typography implimentation 2012-07-14 03:11:06 -04:00
Bridger Maxwell
cd2eacc675 Moved static template views to one folder. Removed the stub view functions from student and used static_template_views instead. 2012-07-13 17:42:23 -04:00
Galen Frechette
3be186c142 improves style of video modals 2012-07-13 14:22:04 -04:00
Galen Frechette
b833f52d9c adds autoplaying to modal videos when opened, stops video playback when modal closes 2012-07-13 13:57:50 -04:00
Galen Frechette
cd345ae3bb converts modals to use jquery leanModal 2012-07-13 13:57:50 -04:00
Galen Frechette
3fca8a9dd0 cleans up rss feed on home page, still wip 2012-07-13 13:57:34 -04:00
kimth
e7c25c9999 Remove reset button being on all the time (for debug) 2012-07-13 13:57:29 -04:00
Galen Frechette
296ae34e34 wip news feed on home page 2012-07-13 13:57:25 -04:00
Galen Frechette
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 2012-07-13 13:57:02 -04:00
Galen Frechette
1ea8bd2666 imporves visual design of course info/profile page 2012-07-13 13:56:44 -04:00
Galen Frechette
8a5e3bf4d2 adds pressrelease page, breaks about content into seperate pages, imporvoves some visual elements of about and jobs pages 2012-07-13 13:56:14 -04:00
kimth
6d3516a754 CodeResponse for queued code checking 2012-07-13 13:45:38 -04:00
Bridger Maxwell
f9de962365 Merge remote-tracking branch 'origin/master' into course_start 2012-07-13 13:40:01 -04:00
Bridger Maxwell
60da23042f Adding a setting to disable the wiki in deployment. 2012-07-13 13:36:38 -04:00
Victor Shnayder
1f1fab4992 add fasttest rake command 
* test_{cms/lms} will run collectstatic first, fasttest_{cms/lms} won't
* also add staticfiles dir to test_root gitignore
 2012-07-13 12:07:42 -04:00
Victor Shnayder
339e9a68f4 Make end-to-end tests work again 
* NOTE: successfully running the tests depends on an updated version of
  django-pipeline, which fixes a unicode bug (efaba4ac63)

Config changes:
* Use separate db for the cms
* Run collectstatic before running tests--needed to get everything in the right place for loading pages
* fix some paths related to this
* Turn off JS compressor for CMS
* add empty test_root/uploads dir

Code changes:
* Add cms tests to check that home page and signup pages load
* Add cms account creation test
* Make github sync tests clean out repo dirs before running.
 2012-07-13 11:51:33 -04:00
Victor Shnayder
4604ca63fe Add some docs on static file handling 2012-07-13 11:51:32 -04:00
Victor Shnayder
ff59c9bfa9 Initial connection of student module with cms. 
* Enable account creation
* Some code cleanups
* Fix access to nonexistent fields in the account creation view
* Formatting fixes
 2012-07-13 11:51:32 -04:00
Victor Shnayder
924a911139 formatting fixes and note about bug 
* don't know what the intended fix is
 2012-07-13 11:51:32 -04:00
Victor Shnayder
6e98255cd5 remove reference to course from signup email subject 2012-07-13 11:51:32 -04:00
Victor Shnayder
39a1502e1a Move student app from lms to common 2012-07-13 11:51:32 -04:00
Bridger Maxwell
ecc50314f7 Added a decorator that prevents access to course pages until the course has started. 2012-07-13 10:31:36 -04:00
David Ormsbee
214d03c1fa Merge pull request #177 from MITx/feature/lms-static-files 
Allow module html to link to global static files as well as course static files
 2012-07-12 14:51:03 -07:00
Bridger Maxwell
d1f8f4bef0 Forgot to add this file in the last commit. 2012-07-12 17:10:12 -04:00
Bridger Maxwell
d5a5fcec4d Fixed the errors that were breaking tests from unused simplewiki files and a half-migrated certificates module. 2012-07-12 16:43:48 -04:00
Bridger Maxwell
8d7c4ad8de Added a start date to courses. Created a decorator to retrieve the course and check that it is open. 2012-07-12 16:27:20 -04:00
Calen Pennington
fefda5db62 Only munge /static/ urls in module html to point to course static files if they don't exist in the global static locations 2012-07-12 16:09:34 -04:00
Calen Pennington
c3ba8817e9 Correctly add course_dirs to static files 2012-07-12 16:06:05 -04:00
Calen Pennington
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 2012-07-12 16:03:12 -04:00
Calen Pennington
d1d57e81cf Don't crash the system if you can't parse an xml file while loading a definition for a module descriptor 2012-07-12 14:04:09 -04:00
Calen Pennington
51d9ad1513 Merge pull request #175 from MITx/jarv/update-activation 
updating activation mail, adding Gemfile.lock to gitignore
 2012-07-12 10:43:27 -07:00
John Jarvis
1a3549903c updating activation mail, adding Gemfile.lock to gitignore 2012-07-12 13:41:51 -04:00
Calen Pennington
b48d08b2c5 Minor changes from pull request 170 2012-07-12 11:40:02 -04:00
bridger
28007b280c Merge pull request #168 from MITx/multicourse_wiki 
Multicourse wiki
 2012-07-12 07:35:17 -07:00
bridger
bc21cdfaa5 Merge pull request #167 from MITx/utf8_migration_merge 
Utf8 migration merge
 2012-07-12 07:34:45 -07:00
Bridger Maxwell
2c2e296034 Forgot to actually add migration file... 2012-07-12 10:32:53 -04:00
Bridger Maxwell
64888f1c1b Re-added the migration to expand the meta field. 2012-07-12 10:29:15 -04:00
ichuang
1b118024a1 Merge pull request #174 from MITx/cpennington/cms-backcompat 
CMS import backwards compatibility

 - edx4edx and 8.01x course repo errors fixed and verified
 - moving forward, it would be nice if the LMS+CMS xml import failed more gracefully when encountering errors in the xml files, when in debug or authoring mode.  For example, an inadvertent xml error in one problem (eg created by a mistake in an import tool used in the CMS) should not bring down the whole LMS. Ditto if one problem gets deleted from the mongodb or filesystem.
 2012-07-12 04:24:09 -07:00
Calen Pennington
b29649c49b Allow for more flexible candidates for replacement filepaths 2012-07-11 23:02:33 -04:00
Calen Pennington
379c6d164d Allow importing of courses that still have mako templating in them 2012-07-11 23:02:33 -04:00
Calen Pennington
b3ab9c23f7 Allow importing of courses that don't have the expected path/filename structure for problems and html 2012-07-11 23:02:33 -04:00
ichuang
926fdd010e Merge pull request #173 from MITx/cpennington/pull-155-cleanup 
This cleans up remaining issues w/ https://github.com/MITx/mitx/pull/155
 2012-07-11 19:34:56 -07:00
Calen Pennington
c468d47aa2 Minor change in comment about module type/category 2012-07-11 22:19:34 -04:00
Calen Pennington
dfad0decc3 Disambiguating name in XMLModuleStore definition 2012-07-11 22:19:34 -04:00