Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,964 Commits 1 Branch 0 Tags
3dd923d9b9f4164caec0f652e86eaaeb96bdcf16
Commit Graph

2964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
3dd923d9b9 typo fix (it was just really bugging me) 2012-07-10 17:50:42 -04:00
Matthew Mongeau
347483203a Unscope URLCONF from mitx 2012-07-10 17:37:42 -04:00
Calen Pennington
1ac6e0a083 Add extra_filters_jinja needed for compressed_css filter 2012-07-10 16:22:05 -04:00
Bridger Maxwell
a9eab86aee Merge branch 'dormsbee/multicourse' of github.com:MITx/mitx into dormsbee/multicourse 2012-07-10 15:47:39 -04:00
Calen Pennington
a74024687e Make rake clobber remote test_root/*_repo directories that are used and should be cleaned up by tests 2012-07-10 15:03:35 -04:00
Calen Pennington
824f049289 Make packaging task not verbose 2012-07-10 15:00:47 -04:00
Calen Pennington
6dd141247d Fixing github_sync to work with multiple course data directories 2012-07-10 14:58:27 -04:00
Bridger Maxwell
aff904a69d Merge 2012-07-10 14:40:31 -04:00
David Ormsbee
8589a1d9a9 reorder requirements to make it a little easier to see django-related reqs 2012-07-10 14:36:18 -04:00
David Ormsbee
caad217ec2 add other django-* dependencies from my pip freeze results 2012-07-10 14:34:05 -04:00
David Ormsbee
15b0801ecb add django-keyedcache dependency 2012-07-10 14:31:35 -04:00
David Ormsbee
23f0bee8a9 django-followit 2012-07-10 14:29:58 -04:00
David Ormsbee
9ec0ecdc6e fix dependency for django-kombu 2012-07-10 14:26:55 -04:00
David Ormsbee
fd7eec72e6 add djkombu dependency 2012-07-10 14:23:55 -04:00
David Ormsbee
7867277611 add django-countries dependency 2012-07-10 14:18:52 -04:00
David Ormsbee
efba36eb20 add South dependency for migrations 2012-07-10 14:17:47 -04:00
David Ormsbee
56d873097c add pyparsing to requirements for capa lib 2012-07-10 14:12:32 -04:00
David Ormsbee
2f90b27707 Only load DATA_DIR subdirs if DATA_DIR exists (so not during tests) 2012-07-10 13:56:51 -04:00
Calen Pennington
fdd9663699 Merge remote-tracking branch 'origin/master' into dormsbee/multicourse 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	lms/djangoapps/courseware/views.py
	lms/templates/index.html
	lms/templates/info.html
	lms/templates/main.html
	lms/templates/navigation.html
	requirements.txt
 2012-07-10 13:39:19 -04:00
Calen Pennington
74593d18af Fix url in CapaModule error message 2012-07-10 13:15:40 -04:00
Calen Pennington
da360b1d56 Allow for a user to enroll in multiple courses 2012-07-10 13:11:57 -04:00
Calen Pennington
c4ebfe1bd4 Actually add the schematic.js file used in the main.html template 2012-07-10 12:58:25 -04:00
Calen Pennington
5406b9bb40 Make /static/ urls work in the courseware 2012-07-10 12:54:47 -04:00
Calen Pennington
dbfcd78c88 Get custom_tag templates using system.filestore so that they work in multicourse 2012-07-10 10:46:18 -04:00
Calen Pennington
239c5ef172 Require login for enrollment 2012-07-10 10:19:15 -04:00
Calen Pennington
fe2f0347b0 Fix typo 2012-07-10 10:15:57 -04:00
Calen Pennington
ad08df7abd Add logging when info and about sections are missing 2012-07-10 09:32:18 -04:00
Calen Pennington
3011f3f336 Expect the proper error type when about or info sections aren't found 2012-07-10 09:30:14 -04:00
Calen Pennington
332ccb0bef Use course 'display_name' from metadata, and fall back to course id name if display_name is not set 2012-07-10 09:27:05 -04:00
Calen Pennington
115a572fd0 Set defaults for org and course, and log error messages when they are used 2012-07-10 09:23:40 -04:00
Calen Pennington
6965e00639 Merge pull request #152 from MITx/ps-cms-backbone 
Rewrite CMS JavaScript to use Backbone
 2012-07-10 06:09:39 -07:00
Calen Pennington
6d246f0685 Merge remote-tracking branch 'origin/master' into ps-cms-backbone 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/coffee/unit.coffee
	cms/templates/index.html
	cms/templates/widgets/sequence-edit.html
 2012-07-10 08:55:45 -04:00
Calen Pennington
ed0053ef7c Merge pull request #157 from MITx/cpennington/cms-github 
Enable interaction with github
 2012-07-10 05:51:31 -07:00
Calen Pennington
cfd6890d68 Merge remote-tracking branch 'origin/master' into cpennington/cms-github 
Conflicts:
	common/lib/xmodule/xmodule/xml_module.py
 2012-07-10 08:50:54 -04:00
kimth
024789dabf Made data identifiers consistent with master branch of 'content-mit-6002x' 2012-07-09 19:01:25 -04:00
Matthew Mongeau
cfa389e357 Change url to use args instead of kwargs. 2012-07-09 18:33:51 -04:00
Matthew Mongeau
ff74bc79d4 Undo forced CourseDescriptor 2012-07-09 18:21:06 -04:00
Matthew Mongeau
1fcc02579d Pass a course to get_section 2012-07-09 17:49:49 -04:00
Bridger Maxwell
4aacace056 Fixed exception type when about or info section missing. 2012-07-09 15:54:36 -04:00
Matthew Mongeau
51c65e214a Get initial courseware page displaying. 2012-07-09 15:01:10 -04:00
Matthew Mongeau
fe5fa7334b Get textbook page rendering. 2012-07-09 14:23:45 -04:00
Matthew Mongeau
43e6bbb29f Added info page content 2012-07-09 14:16:17 -04:00
Matthew Mongeau
c47cdc7f87 Fix some path problems. 2012-07-09 14:06:44 -04:00
Matthew Mongeau
3053caec7e Get course about page working. 2012-07-09 13:48:18 -04:00
kylefiedler
72a3c0f708 Merge pull request #161 from MITx/kf-cms-style 
Kf cms style
 2012-07-09 09:03:17 -07:00
Kyle Fiedler
6f40b46415 Fixed overflow and fixed hover on new module 2012-07-09 12:02:38 -04:00
Matthew Mongeau
949efb62e9 Got courses page working... mostly. 2012-07-09 11:27:45 -04:00
Kyle Fiedler
8a4d860a1e put normalize in vendor folder 2012-07-09 11:26:46 -04:00
Kyle Fiedler
389fd7111a Get rid of comments 2012-07-09 11:08:07 -04:00
Kyle Fiedler
93f8f7685a Added more wip and fixed issue with after 2012-07-09 10:37:37 -04:00