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

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Don Mitchell
913c601ac1 Move default set_many impl to xblock 2013-07-19 15:08:24 -04:00
Adam
032b02df24 Merge pull request #445 from edx/adam/fix/wiki 
set django-wiki to its most recent version
 2013-07-19 12:02:39 -07:00
Don Mitchell
549ef5d494 Ensure kvs up-to-date if code accessing it. 2013-07-19 14:55:49 -04:00
Adam Palay
7165acc499 set django-wiki to its most recent version 2013-07-19 14:40:41 -04:00
Vik Paruchuri
3509aea2b1 Redo js 2013-07-19 14:21:01 -04:00
Chris Dodge
22802a4d29 change from_xml class method on video class to make sure we honor the fact that the xml string could actually be a pointer to another file on disk which actually contains the attributes 2013-07-19 13:54:22 -04:00
Vik Paruchuri
77eb35a75f Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui 2013-07-19 13:35:37 -04:00
Joe Blaylock
044a69d63d Merge pull request #52 from edx/nate/simple-chat 
Simple port of Class2Go's chat feature
 2013-07-19 10:10:32 -07:00
Don Mitchell
62afa23a0d Make tests not msec time sensitive 2013-07-19 13:10:14 -04:00
Don Mitchell
df7b917b40 Implement next generation modulestore 
A new modulestore backed by mongo that changes the data format to
facilitate easy versioning, sharing content between courses, and fast
lookup of course structure and Scope.settings data.

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
 2013-07-19 13:10:14 -04:00
Don Mitchell
4a127e51c9 Merge pull request #441 from edx/dhm/course_update_bugs 
POST requests were claiming request.method == 'PUT'
 2013-07-19 08:56:01 -07:00
Vik Paruchuri
a2522c492c Merge pull request #160 from edx/fix/vik/studio-oe 
Fix/vik/studio oe
 2013-07-19 08:44:16 -07:00
Calen Pennington
2a3dd7323f CMS i18n changes from Tsinghua 2013-07-19 11:40:47 -04:00
Ned Batchelder
66ca7d750e Merge pull request #411 from edx/ned/studentmodulehistory-cleaner-command 
Ned/studentmodulehistory cleaner command
 2013-07-19 08:33:37 -07:00
Don Mitchell
541c98a3af POST requests were claiming request.method == 'PUT' 
So, changed handlers to look for either value.
 2013-07-19 11:14:01 -04:00
Don Mitchell
63c3bb0812 Reproduce POST showing up as PUT error 2013-07-19 11:12:23 -04:00
Adam Palay
a04539af5d change models to filter by course 2013-07-19 11:03:25 -04:00
Don Mitchell
e3602941ee Merge pull request #440 from edx/dhm/adaptive_template 
Bug report: remove <?xml version..> tag
 2013-07-19 07:57:29 -07:00
Alexander Kryklia
0e58f3ac57 Merge pull request #439 from edx/alex/fix_code_jail_imports_and_draganddrop_yaml 
Fixes code_jail imports and draganddrop yaml
 2013-07-19 07:50:26 -07:00
chrisndodge
37dc27cec4 Merge pull request #438 from edx/fix/cdodge/missing-space-on-landing-page 
I18N work seems to have lost a very prominent space in the landing page
 2013-07-19 07:43:10 -07:00
chrisndodge
d78af5cf51 Merge pull request #294 from edx/feature/cdodge/add-dump-course-structure 
add a new django-admin command to dump out a course structure document. ...
 2013-07-19 07:04:41 -07:00
Don Mitchell
eee1d6f593 Bug report: remove <?xml version..> tag 
https://edx-wiki.atlassian.net/browse/STUD-428
 2013-07-19 09:15:29 -04:00
Kevin Chugh
63b2b47106 update to render home page 2013-07-19 07:33:50 -04:00
Alexander Kryklia
67f6d6c4d1 Fixes code_jail imports and draganddrop yaml 2013-07-19 12:05:17 +03:00
Chris Dodge
95302b02a8 I18N work seems to have a very prominent space in the landing page 2013-07-18 21:12:49 -04:00
Joe Blaylock
50c906732f Chat rebase, test update 
Rebase on today's master and update to unit test to include settings
where needed.
 2013-07-18 15:00:54 -07:00
Nate Hardison
293bd30a59 Use chat settings when deciding whether to render 
Only render the chat widget if both the site has enabled it in the
`MITX_FEATURES` and if the course has enabled it. In addition, fail
gracefully with a log warning if the `JABBER_DOMAIN` is not set, and
do not try to render the widget. However, do go ahead and render the
rest of the courseware.
 2013-07-18 15:00:54 -07:00
Nate Hardison
3aec9fdb77 Add setting to enable/disable chat site-wide 
To protect against chat blowing things up, we include a way to
enable and disable it on an entire site-wide basis.
 2013-07-18 15:00:54 -07:00
Nate Hardison
f4ae0e0cae Test generation of chat settings 
Ensure that the chat connection settings are generated properly for
the template context.
 2013-07-18 15:00:54 -07:00
Nate Hardison
c53a550f3b Remove additional jQuery include 
jQuery already available across the whole site at the top level, so
no need to include it again specifically for the chat widget.
 2013-07-18 15:00:54 -07:00
Nate Hardison
a0ab47658a Move Candy.js files to new vendor/ directory 2013-07-18 15:00:54 -07:00
Nate Hardison
bf8e5e6ba1 Simple port of Class2Go's chat feature 
Embed a chat widget (much like the calculator widget) into the
courseware. To use, you must point it at an ejabberd box,
configured as `JABBER_DOMAIN` in the settings.
 2013-07-18 15:00:53 -07:00
Ned Batchelder
24564223cc Merge pull request #435 from edx/ned/allow-tempfiles-in-sandbox 
Use CodeJail with FSIZE support, and default to 50k
 2013-07-18 14:26:44 -07:00
Ned Batchelder
89c48f4a30 Use CodeJail with FSIZE support, and default to 50k 2013-07-18 17:25:05 -04:00
Vik Paruchuri
a478fa9ff7 Change error class 2013-07-18 16:56:38 -04:00
Don Mitchell
921e78b8ae Merge pull request #421 from edx/dhm/template_acceptance 
Fix due/start date setting in edit_subsection
 2013-07-18 13:49:55 -07:00
Don Mitchell
0aa9c6c1ae json field value conversion test 2013-07-18 16:48:29 -04:00
Don Mitchell
badf86f71b Have save_item parse json formatted field values by type 
including allowing javascript to serialize date/time natively.
 2013-07-18 16:48:29 -04:00
Don Mitchell
025a95885a Generate TypeError if from or to_json fail. 2013-07-18 16:47:15 -04:00
Sarina Canelake
7615a0638b Merge pull request #310 from robertjmarks/master 
Adds in changes for stat2.3x question type
 2013-07-18 13:44:00 -07:00
Sarina Canelake
e84a41b4b5 Merge pull request #416 from edx/sarina/xblock-bulk-save-interface 
Add XBlock bulk saves to LMS/CMS
 2013-07-18 13:39:44 -07:00
Diana Huang
3f9431e8cf Provide implicit saves for XBlocks and XModules. 
Update existing tests and provide new ones to test new paradigm.
 2013-07-18 16:37:34 -04:00
Vik Paruchuri
2a4976cf8a Cleanup how peer grading handles due date 2013-07-18 15:36:42 -04:00
Sarina Canelake
f0c9aa3916 Provide set_many methods for Lms and Mongo KeyValueStores 
Refactor new set_many and update XBlock version number.
 2013-07-18 15:30:13 -04:00
Vik Paruchuri
0b991f9bbd Fix reset and score tests 2013-07-18 15:19:13 -04:00
Vik Paruchuri
84c4b7f139 Test fixes 2013-07-18 15:08:52 -04:00
Vik Paruchuri
480e97a3fd Cleanup and change attribute names 2013-07-18 14:55:59 -04:00
Vik Paruchuri
59f639d9d2 Change js around 2013-07-18 14:40:11 -04:00
Vik Paruchuri
d17486a9c7 Update default handling 2013-07-18 14:39:52 -04:00
RobertMarks
4d880db1b5 Updated behavior for split_answer_dict, get_score, and check_student_inputs (responsetypes.py) 2013-07-18 10:18:53 -07:00