Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,699 Commits 1 Branch 0 Tags
032b02df24179e43f82bc2fe24e1c151e47ab2f5
Commit Graph

5393 Commits

Author SHA1 Message Date
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
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
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
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
89c48f4a30 Use CodeJail with FSIZE support, and default to 50k 2013-07-18 17:25:05 -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
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
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
RobertMarks
4d880db1b5 Updated behavior for split_answer_dict, get_score, and check_student_inputs (responsetypes.py) 2013-07-18 10:18:53 -07:00
RobertMarks
46ae2f9c26 Added support for a new problem type: ChoicetextResponse 2013-07-18 10:12:56 -07:00
Vik Paruchuri
915f815c63 Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-07-18 11:55:37 -04:00
Ned Batchelder
900e794c02 Only quiet the particular logger we think is too noisy. 2013-07-18 11:53:21 -04:00
Ned Batchelder
3d67c506a3 Use TransactionTestCase, to keep other tests from failing, even though it slows them down. 2013-07-18 11:16:46 -04:00
Ned Batchelder
10f062cf18 Records should be sorted by created,id so that timestamp ties will be broken by id. 2013-07-18 11:16:46 -04:00
Ned Batchelder
83cb3d1924 Add batch and sleep arguments so we can control the speed from the command line. 2013-07-18 11:16:46 -04:00
Ned Batchelder
3a49136f03 Quiet some debug output, get transactions right. 2013-07-18 11:16:46 -04:00
Ned Batchelder
07aad29684 The clean_history management command to remove excess courseware_studentmodulehistory records. 2013-07-18 11:16:46 -04:00
Jason Bau
c789642ebd Merge pull request #396 from edx/jbau/fix/stanford-pwdreset-remove-vendor-js 
put block around main_vendor js in main_django.html
 2013-07-17 14:33:21 -07:00
Don Mitchell
6dda90f6f8 Merge pull request #419 from edx/dhm/template_acceptance 
Missing comma on template -> category refactoring
 2013-07-17 10:13:58 -07:00
Adam
f0969fca4c Merge pull request #374 from edx/fix/adam/mrev-check 
notify students for NotFoundErrors from capa_module, improve tracking
 2013-07-17 08:26:27 -07:00
Adam Palay
dfa435012b notify students for NotFoundErrors from capa_module, improve error logging 2013-07-17 11:03:47 -04:00
frances botsford
033a36efb9 Merge pull request #371 from edx/fix/frances/lms-pdfviewer-cleanup 
Quick LMS pdfviewer  layout cleanup
 2013-07-17 06:53:10 -07:00
Don Mitchell
5b367e8321 Missing comma on template -> category refactoring 
And several pep8 changes
 2013-07-17 09:22:34 -04:00
Calen Pennington
d3993653cf Merge pull request #270 from edx/dhm/non-persisted-studio-templates 
Non-persisted studio templates
 2013-07-16 14:42:57 -07:00
Don Mitchell
be4fbc562e Refactor tests to no longer use templates 
Add boilerplate option to ItemFactory
Minor start date fix to not use microsecs
 2013-07-16 16:00:28 -04:00
Calen Pennington
8b5979641b Change default rerandomize and showanswer 
The defaults used to be rerandomize=always, showanswer=closed. This is
preserved for capa problems being imported from XML. However, for
courses, and for problems created in Studio, the default has been
changed to never/finished, to match the previous defaults used by
Studio.
 2013-07-16 14:33:58 -04:00
Don Mitchell
3722685e1a No longer persist XModule templates 
Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
 2013-07-16 14:33:58 -04:00
Don Mitchell
8c904f31a9 Move defaults from yaml templates to field definitions. 
This standardizes the XModule field default values to be the same as the
values that are presented by studio when a component is added to a
course.
 2013-07-16 14:24:41 -04:00
Don Mitchell
ef8618f7ad Make DraftModuleStore mongo only 
DraftModuleStore was originally designed as a mixin, but never used that
way, and with the upcoming changes to use the versioned module store,
never will be. This changes removes a circular dependency between
mongo.py and draft.py.
 2013-07-16 08:55:26 -04:00
Frances Botsford
27b7e35bd3 i18n the PDF prev/next button text 2013-07-15 13:54:04 -04:00
Greg Price
7c5943a87c Tweak behavior of submit buttons on register and login pages 
The buttons are not re-enabled if the registration/login submission succeeds
(and, therefore, the user is about to be directed to another page). Also, any
error message that is present does not disappear immediately before the page
redirects.
 2013-07-15 13:13:52 -04:00
Jason Bau
c9943306ef put block around main_vendor js in main_django.html 
should be a no-op for edx-east, but allow edx-west to remove
vendor.js with a blank {% block %}
in our password_reset_confirm.html to fix a bug
 2013-07-12 23:22:50 -07:00
chrisndodge
dcc63be4b5 Merge pull request #388 from edx/fix/cdodge/dont-display-github-links-in-mongo-lms 
[STUD-431] Seems like the Edit/QA links in LMS are triggered by a ENABLE_LMS_MIGRAT...
 2013-07-12 18:03:43 -07:00
Chris Dodge
db7434fa18 add comment as to why we are turning off this feature flag 2013-07-12 20:02:23 -04:00
mikigoyal
0a05cdc21b Merge pull request #389 from edx/lms/bug/lms-605 
Fixed a spelling mistake. LMS-605
 2013-07-12 10:05:10 -07:00
Miki Goyal
ae45f5461c Fixed a spelling mistake. LMS-605 2013-07-12 12:19:15 -04:00
Jonah Stanley
72c9a24dd6 Merge pull request #274 from edx/jonahstanley/refactor-global-to-world 
Jonahstanley/refactor global to world
 2013-07-12 09:10:25 -07:00
Chris Dodge
1060cf5cec Seems like the Edit/QA links in LMS are triggered by a ENABLE_LMS_MIGRATION feature flag. So when running as mongo-backed, set that to False 2013-07-12 11:51:57 -04:00
mikigoyal
4eb82224f0 Merge pull request #382 from edx/bug/lms-600 
Fix alt text for the login page: LMS-600
 2013-07-12 07:45:50 -07:00
JonahStanley
484e217de3 Fixed some errors 2013-07-12 10:32:48 -04:00
JonahStanley
1f1bba5507 Scenario Dictionary now holds objects 2013-07-12 10:32:48 -04:00
JonahStanley
131f1a49c4 All lms acceptance tests refactored to use world dictionaries 2013-07-12 10:32:47 -04:00
JonahStanley
35094a968b Beginnings of refactoring the acceptance tests 2013-07-12 10:32:45 -04:00
Miki Goyal
5fd84465e2 Fix alt text for the login page: LMS-600 2013-07-12 10:05:13 -04:00