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

737 Commits

Author SHA1 Message Date
Rocky Duan
b2da6eef9f provide user_id for xmodules 2012-07-25 18:15:52 -04:00
Rocky Duan
4b8c3b9b12 watch/unwatch threads; display current vote 2012-07-25 18:15:52 -04:00
Rocky Duan
0ee1b0c5d0 removed unnecessary args 2012-07-25 18:15:52 -04:00
Rocky Duan
5e5dda2dfb refactored out thread rendering; vote 2012-07-25 18:15:51 -04:00
Rocky Duan
28113d8b43 moved django_comment_client into edx 2012-07-25 18:15:51 -04:00
Rocky Duan
d49338c948 integrated search; refactored some frontend code 2012-07-25 18:15:51 -04:00
Rocky Duan
3267aa1737 forum view for discussions 2012-07-25 18:14:58 -04:00
Rocky Duan
846a488ef2 create new post 2012-07-25 18:11:00 -04:00
Rocky Duan
d393481b21 some basic functionalities of discussion 2012-07-25 18:11:00 -04:00
Rocky Duan
fb408a99b5 add discussion app & url conf 2012-07-25 18:09:34 -04:00
Rocky Duan
9abc888340 display simple threaded comment 2012-07-25 18:09:34 -04:00
Kyle Fiedler
bb3dfc5c08 fix courseware css file so it imports the right files in the right order 2012-07-25 15:54:18 -04:00
Kyle Fiedler
18dc689d4d Added fix for where the course.css is being brought in 2012-07-25 14:57:44 -04:00
Kyle Fiedler
00596d2f20 Added courseware css back into the main template 2012-07-25 14:57:44 -04:00
John Jarvis
dab92102d1 reading WIKI_ENABLED from env.json 2012-07-25 14:15:49 -04:00
Calen Pennington
dde48f122e Merge pull request #247 from MITx/feature/cms-problem-preview 
Problem previewing in the CMS
 2012-07-25 07:10:45 -07:00
Calen Pennington
29cf09763f Fixing up cms tests to only use data in common/test/data 2012-07-25 10:09:25 -04:00
John Jarvis
18b05fe78f enabled_features changed mitx_features 2012-07-24 21:50:45 -04:00
Calen Pennington
bdf964a305 Modularize video css 2012-07-24 16:14:05 -04:00
Calen Pennington
6029c28695 Modularize sequence css 2012-07-24 16:14:04 -04:00
Calen Pennington
8a0270ea2b Allow for modular css from XModules, and split capa module css out as a test 2012-07-24 16:14:04 -04:00
Calen Pennington
0a79130b11 Make problem previews work by saving problem state in the current request session 2012-07-24 16:14:04 -04:00
Calen Pennington
408726e678 Standardize how JS XModules are instantiated 2012-07-24 16:14:04 -04:00
Calen Pennington
50f27bcfb7 Eagerly load all modules when reading the course from xml, so that users who are already on a problem page can check their answers 2012-07-24 16:14:04 -04:00
Calen Pennington
0fcaa01484 Allow anonymous users to check problems, but don't save any instance state for them 2012-07-24 16:14:04 -04:00
Calen Pennington
8481937f59 Move Logger and *withPrefix javascript into a common location 2012-07-24 16:14:03 -04:00
Calen Pennington
87ce82570d Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware 2012-07-24 16:14:03 -04:00
Calen Pennington
1924609b10 Move schematic.js into capa_module js includes 2012-07-24 16:14:02 -04:00
Calen Pennington
6ea5f6a493 Move imageinput.js to capa_module js includes 2012-07-24 16:14:02 -04:00
Calen Pennington
7e4d3c8b35 Modularize sequence coffeescript in prepration for CMS preview 2012-07-24 16:14:02 -04:00
Victor Shnayder
a8c70d3531 add todo 2012-07-24 16:14:02 -04:00
Victor Shnayder
ba733fa5d1 add options to dev_mongo env 2012-07-24 16:14:01 -04:00
Victor Shnayder
49e8d08c1e Add get_courses() to mongo modulestore 
* Note: This doesn't run yet
* add config file for lms on mongo
* Some comment additions and cleanups
 2012-07-24 16:14:01 -04:00
Calen Pennington
61446b0544 Make javascript for video previews work correctly 2012-07-24 16:14:01 -04:00
Calen Pennington
cb6c7640c8 Get the video module pointing to the correct static files directory, without relying on get_html replacement 2012-07-24 16:14:01 -04:00
Calen Pennington
19a3c14ab9 Split out code to replace /static urls in get_html into a separate module so that it can be used in CMS previews 2012-07-24 16:14:01 -04:00
Calen Pennington
5f86fcfbff Standardize how Problem and Video modules are loaded in the LMS and CMS preview pane 2012-07-24 16:14:00 -04:00
Calen Pennington
987fe17358 Load js fragments in order, so that Subview is loaded before the classes that use it 2012-07-24 16:14:00 -04:00
Calen Pennington
5026d6e9fb Give all XModuleDescriptors a module_class, and make it inheritance of js_module_names work 2012-07-24 16:14:00 -04:00
Calen Pennington
3cdceab16c Uniquify js fragments pulled from XModules, and load both XModuleDescriptor and XModule js into the cms 2012-07-24 16:13:59 -04:00
Calen Pennington
3fa636e060 Move module javascript into common/lib/xmodule. Still TODO: run jasmine tests in that directory 2012-07-24 16:13:59 -04:00
Calen Pennington
6bcc78f767 Make lms jasmine tests mostly pass 2012-07-24 16:13:59 -04:00
John Jarvis
703293f785 adding enabled features to aws.py 2012-07-24 15:56:42 -04:00
Calen Pennington
a81015a91b Move I4xSystem into xmodule so that the definition is available to the CMS 2012-07-24 15:05:07 -04:00
Calen Pennington
98910a2d49 Address review comments 2012-07-24 14:46:46 -04:00
Calen Pennington
66f79251dc Add feature flag for disabling course start dates 2012-07-24 13:22:50 -04:00
Calen Pennington
d8f8d8c656 Merge branch 'release/1.0' 
Conflicts:
	common/djangoapps/student/views.py
	lms/djangoapps/courseware/courses.py
 2012-07-24 08:52:50 -04:00
David Ormsbee
1d5e42f175 Remove very large, no longer used images 2012-07-24 00:05:13 -04:00
David Ormsbee
d688b7d249 Merge branch 'release/1.0' into dormsbee/hack_fix_pwd_reset 2012-07-23 23:43:48 -04:00
David Ormsbee
729070763f Convert @mitx.mit.edu emails to @edx.org emails 2012-07-23 23:43:34 -04:00