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

15657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vik Paruchuri
2a4976cf8a Cleanup how peer grading handles due date 2013-07-18 15:36:42 -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
d17486a9c7 Update default handling 2013-07-18 14:39:52 -04: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
chrisndodge
8300bb5e67 Merge pull request #425 from edx/fix/cdodge/exporting-video-modules 
Fix/cdodge/exporting video modules
 2013-07-18 08:04:20 -07:00
Chris Dodge
99ff3719cc remove the video from the toy course for now as the import-export-import isn't totally equivalence. 2013-07-18 10:35:50 -04:00
Lyla Fischer
ee01798599 Merge pull request #404 from edx/lyla/templates 
Adding a template for drag-and-drop.
 2013-07-18 07:03:09 -07:00
Chris Dodge
66287d0d99 fix test to use the new create_item method rather than clone_item, which has been deprecated, and thus breaking the test 2013-07-18 09:30:30 -04:00
James Tauber
ddb7c6e519 Merge pull request #431 from antoviaque/updatetemplate-notfound 
Install: Fixes "Don't know how to build task 'cms:update_templates'"
 2013-07-18 05:27:50 -07:00
Xavier Antoviaque
139b12f25b Install: Fixes "Don't know how to build task 'cms:update_templates'" 
Remove the `update_templates command from the installation script, this
command was removed by
3722685e1a
 2013-07-18 09:14:09 -03: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
Calen Pennington
96a9d74190 Merge pull request #422 from edx/release 
Hotfix: 2013-07-17
 2013-07-17 13:12:06 -07:00
Calen Pennington
ab482277be Merge pull request #420 from edx/fix/cdodge/hotfix-export-crash 
[HOTFIX] add a default XML serialization if the 'data' field is empty or None. So...
 2013-07-17 12:14:06 -07:00
Calen Pennington
726a85c70f Merge pull request #409 from edx/cale/make-jasmine-tests-quieter 
Make jasmine tests quieter
 2013-07-17 10:58:40 -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
Chris Dodge
8325e28a10 add a default XML serialization if the 'data' field is empty or None. Some XModules now - like video XModule - do not have XML set in the 'data' field 2013-07-17 12:31:33 -04: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
Lyla Fischer
3f8246f032 merge conflict 2013-07-16 18:25:01 -04:00
Lyla Fischer
a47daf26e4 removed uneeded defaults from imageresponse 2013-07-16 18:22:48 -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
Lyla Fischer
a512337881 removed soon-to-be-universally-fixed defaults 2013-07-16 16:18:27 -04: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
Renzo Lucioni
f2898f8cbf Merge pull request #407 from edx/renzo/problem-check-event 
Reinstate problem_check event as Problem Checked event
 2013-07-16 12:20:30 -07:00
Calen Pennington
92391a22fc Don't force field inheritance of default values 2013-07-16 14:33:59 -04:00
Calen Pennington
0a38e490e3 Fix pep8/pylint errors 2013-07-16 14:33:59 -04:00
Calen Pennington
f6b7b2678d Set about page default content from overview.yml template 2013-07-16 14:33:59 -04:00
Calen Pennington
4b53478859 Require markdown to be explicitly set 2013-07-16 14:33:59 -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
James Tauber
d4f8ab3f09 Merge pull request #414 from edx/jtauber/switch-transifex-project 
changed transifex project to edx-platform
 2013-07-16 11:08:03 -07:00
James Tauber
3a095acced changed transifex project to edx-platform 2013-07-16 13:38:34 -04:00
David Ormsbee
a0749bd242 Merge pull request #412 from edx/dave/ie10_mathjax_fix 
Update MathJax to the latest stable version (2.2), to fix IE10 bug LMS-194
 2013-07-16 09:50:18 -07:00
Greg Price
894b62ba9b Merge pull request #406 from edx/gprice/register-button-enabling-tweak 
Tweak behavior of submit buttons on register and login pages
 2013-07-16 08:52:42 -07:00
David Ormsbee
35f66f8469 Update MathJax to the latest stable version (2.2), to fix IE10 bug LMS-194 2013-07-16 09:20:35 -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
Calen Pennington
22302e3a46 Make jasmine tests quieter 2013-07-15 16:50:46 -04:00
Renzo Lucioni
92ae50d415 Remove unused code and include problem ID of data we send 2013-07-15 15:18:01 -04:00
Brian Talbot
978d33badd Merge pull request #319 from edx/talbs/studio-sassmixins 
Studio Sass Mixin/Extend Re-Org
 2013-07-15 11:52:35 -07:00
Brian Talbot
51037650fb Merge pull request #393 from edx/talbs/studio-nav-fix 
Studio: Revises Course Updates Nav Visual Display Issue
 2013-07-15 11:39:37 -07:00
Frances Botsford
27b7e35bd3 i18n the PDF prev/next button text 2013-07-15 13:54:04 -04:00
Renzo Lucioni
c770458e6a Reinstate problem_check event as Problem Checked event 2013-07-15 13:31:56 -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
Calen Pennington
e9d400cbde Merge remote-tracking branch 'origin/release' into rc/2013-07-16 2013-07-15 13:03:47 -04:00
Lyla Fischer
2262ffe4e5 updated imageresponse example to a more universal example (baby animals) 2013-07-15 12:17:43 -04:00