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
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
640a71bb21 Merge branch 'dormsbee/multicourse' into multicourse_wiki 2012-07-09 15:54:50 -04:00
Bridger Maxwell
4aacace056 Fixed exception type when about or info section missing. 2012-07-09 15:54:36 -04:00
Bridger Maxwell
08f5fe7fc9 Fixed wiki urls for new course ids. 2012-07-09 15:53:50 -04:00
Matthew Mongeau
51c65e214a Get initial courseware page displaying. 2012-07-09 15:01:10 -04:00
Bridger Maxwell
631cc8e874 Merge branch 'dormsbee/multicourse' into multicourse_wiki 2012-07-09 14:28:43 -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
Kyle Fiedler
19bd613f6d Readd the wip class 2012-07-09 10:25:52 -04:00
Kyle Fiedler
dbcad03ddd Added some fixes for some small things adn reset the js 2012-07-09 10:22:55 -04:00
Kyle Fiedler
c8da987436 Added new icons for all of the content 2012-07-09 10:04:20 -04:00
Kyle Fiedler
0cb4781e43 Rearranged the filter and sort bar and made it consistant 2012-07-09 10:04:20 -04:00
Kyle Fiedler
cb2a6f9d02 Played with the layout a bit and some other small changes 2012-07-09 10:04:20 -04:00
Kyle Fiedler
7aad8f04bb Added better styles for draggable 2012-07-09 10:04:20 -04:00
Kyle Fiedler
4b43e3474f More tweeks for visual style for the filter bar and settings 2012-07-09 10:04:20 -04:00
Kyle Fiedler
f1623ec605 Added more tweeks to the calendar and unit pages 2012-07-09 10:04:20 -04:00
Kyle Fiedler
94fccb0017 Added fixes for the sidebar, made better base style for inputs and brightened colors a bit 2012-07-09 10:04:19 -04:00
Kyle Fiedler
985a5323f4 Added some hovers fo the caledar 2012-07-09 10:04:19 -04:00
ichuang
5ee2980708 Merge branch 'kf-inline-inputs' of github.com:MITx/mitx into ichuang/stable_edx4edx_merge 2012-07-08 22:26:58 -04:00
ichuang
3a664753b4 minor changes - test this branch with more courses (8.01x, 6.00x) 2012-07-08 22:05:21 -04:00
ichuang
aedcd9a4c4 change "type" to "category" in xml_module.py 2012-07-08 22:04:54 -04:00
ichuang
0daf7b0497 merging of stable-edx4edx into master - bugfixes and debugging 2012-07-08 19:03:29 -04:00
ichuang
4356ec5c45 default course to settings.COURSE_DEFAULT 2012-07-08 17:00:08 -04:00
ichuang
9b90068e03 Merge branch 'stable-edx4edx' of github.com:MITx/mitx 
Conflicts:
	common/lib/xmodule/seq_module.py
	common/lib/xmodule/xmodule/capa_module.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/multicourse/multicourse_settings.py
 2012-07-08 16:52:36 -04:00
Matthew Mongeau
be3539f1b2 Use CourseDescriptor instead of HiddenDescriptor. 2012-07-08 14:46:05 -04:00
Matthew Mongeau
213d64c159 Append courses 2012-07-06 18:43:30 -04:00
Matthew Mongeau
83fdeea2bc Hookup the CourseDescriptor stuff by fixing a fewt push -f dorm issues. 2012-07-06 18:23:22 -04:00
Bridger Maxwell
291ec2cfc6 Allowing dots in wiki namespaces. 2012-07-06 17:49:26 -04:00
Bridger Maxwell
4d349fbd9d Fixed wiki error page again. 2012-07-06 17:42:01 -04:00
Matthew Mongeau
5109253378 Revert "workarounds for get_about_section" 
This reverts commit 05e1bcf4f1.
 2012-07-06 17:23:56 -04:00
Matthew Mongeau
05e1bcf4f1 workarounds for get_about_section 2012-07-06 17:13:53 -04:00
Bridger Maxwell
c0bba714a7 Added a migration to unique article slugs. 2012-07-06 16:17:15 -04:00
Bridger Maxwell
5489819fc7 Started writing slug uniquifying data migration. Doesn't work yet. 2012-07-06 16:10:12 -04:00
Prem Sichanugrist
9801ce5d3b Add documentation for running JavaScript test 2012-07-06 14:19:32 -04:00
Bridger Maxwell
6d7b477982 Fixed wiki revision feed. 2012-07-06 12:55:05 -04:00
Prem Sichanugrist
58fc2000c7 Use static.url for static assets 2012-07-06 12:13:32 -04:00
Prem Sichanugrist
9dc5cddeb7 Move vendored js files into js/vendor/ 2012-07-06 12:07:21 -04:00
Prem Sichanugrist
07aae06d30 Remove unnecessary fat arrow 2012-07-06 11:52:10 -04:00
Prem Sichanugrist
b8fd728e06 Pass in element in CMS.start() instead 2012-07-06 11:33:37 -04:00