This website requires JavaScript.
84c4b7f139
Test fixes
Vik Paruchuri
2013-07-18 15:08:52 -04:00
480e97a3fd
Cleanup and change attribute names
Vik Paruchuri
2013-07-18 14:55:59 -04:00
59f639d9d2
Change js around
Vik Paruchuri
2013-07-18 14:40:11 -04:00
d17486a9c7
Update default handling
Vik Paruchuri
2013-07-18 14:39:52 -04:00
4d880db1b5
Updated behavior for split_answer_dict, get_score, and check_student_inputs (responsetypes.py)
RobertMarks
2013-07-04 21:30:59 -07:00
46ae2f9c26
Added support for a new problem type: ChoicetextResponse
RobertMarks
2013-06-27 17:14:49 -07:00
0ef6bc9043
Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
Vik Paruchuri
2013-07-18 12:03:48 -04:00
915f815c63
Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe
Vik Paruchuri
2013-07-18 11:55:37 -04:00
900e794c02
Only quiet the particular logger we think is too noisy.
Ned Batchelder
2013-07-18 11:53:21 -04:00
58f147c161
Change delete asset prompt to Warning type for consistency.
Peter Fogg
2013-07-18 08:49:58 -04:00
3d67c506a3
Use TransactionTestCase, to keep other tests from failing, even though it slows them down.
Ned Batchelder
2013-07-18 11:16:01 -04:00
10f062cf18
Records should be sorted by created,id so that timestamp ties will be broken by id.
Ned Batchelder
2013-07-18 10:34:40 -04:00
83cb3d1924
Add batch and sleep arguments so we can control the speed from the command line.
Ned Batchelder
2013-07-18 09:56:07 -04:00
3a49136f03
Quiet some debug output, get transactions right.
Ned Batchelder
2013-07-15 16:57:28 -04:00
07aad29684
The clean_history management command to remove excess courseware_studentmodulehistory records.
Ned Batchelder
2013-07-12 17:58:44 -04:00
8300bb5e67
Merge pull request #425 from edx/fix/cdodge/exporting-video-modules
chrisndodge
2013-07-18 08:04:20 -07:00
99ff3719cc
remove the video from the toy course for now as the import-export-import isn't totally equivalence.
Chris Dodge
2013-07-18 10:35:50 -04:00
ee01798599
Merge pull request #404 from edx/lyla/templates
Lyla Fischer
2013-07-18 07:03:09 -07:00
66287d0d99
fix test to use the new create_item method rather than clone_item, which has been deprecated, and thus breaking the test
Chris Dodge
2013-07-17 18:35:49 -04:00
ddb7c6e519
Merge pull request #431 from antoviaque/updatetemplate-notfound
James Tauber
2013-07-18 05:27:50 -07:00
139b12f25b
Install: Fixes "Don't know how to build task 'cms:update_templates'"
Xavier Antoviaque
2013-07-18 09:14:09 -03:00
c789642ebd
Merge pull request #396 from edx/jbau/fix/stanford-pwdreset-remove-vendor-js
Jason Bau
2013-07-17 14:33:21 -07:00
96a9d74190
Merge pull request #422 from edx/release
Calen Pennington
2013-07-17 13:12:06 -07:00
ab482277be
Merge pull request #420 from edx/fix/cdodge/hotfix-export-crash
Calen Pennington
2013-07-17 12:14:06 -07:00
726a85c70f
Merge pull request #409 from edx/cale/make-jasmine-tests-quieter
Calen Pennington
2013-07-17 10:58:40 -07:00
6dda90f6f8
Merge pull request #419 from edx/dhm/template_acceptance
Don Mitchell
2013-07-17 10:13:58 -07:00
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
Chris Dodge
2013-07-16 10:49:41 -04:00
f0969fca4c
Merge pull request #374 from edx/fix/adam/mrev-check
Adam
2013-07-17 08:26:27 -07:00
dfa435012b
notify students for NotFoundErrors from capa_module, improve error logging
Adam Palay
2013-07-03 18:01:11 -04:00
b42eacaa8f
moved MAX_AUTO_AUTH_USERS to ENV_TOKENS
ihoover
2013-07-17 10:00:24 -04:00
033a36efb9
Merge pull request #371 from edx/fix/frances/lms-pdfviewer-cleanup
frances botsford
2013-07-17 06:53:10 -07:00
5b367e8321
Missing comma on template -> category refactoring
Don Mitchell
2013-07-17 09:22:34 -04:00
ee4bc424ce
remove depracated feature flag GENERATE_RANDOM_USER_CREDENTIALS
ihoover
2013-07-17 09:12:07 -04:00
813c22d138
Adds integration tests for word_cloud module
Alexander Kryklia
2013-05-27 18:09:29 +03:00
3f8246f032
merge conflict
Lyla Fischer
2013-07-16 18:25:01 -04:00
a47daf26e4
removed uneeded defaults from imageresponse
Lyla Fischer
2013-07-16 18:22:48 -04:00
ceacc3b4b5
moved auto_auth view to students.view and fixed flag conflicts
ihoover
2013-07-16 17:01:57 -04:00
d3993653cf
Merge pull request #270 from edx/dhm/non-persisted-studio-templates
Calen Pennington
2013-07-16 14:42:57 -07:00
ecbf148688
add a new django-admin command to dump out a course structure document. This is response to an emergency request from Harvard researchers.
Chris Dodge
2013-06-20 11:46:16 -04:00
a512337881
removed soon-to-be-universally-fixed defaults
Lyla Fischer
2013-07-16 16:18:27 -04:00
be4fbc562e
Refactor tests to no longer use templates
Don Mitchell
2013-07-16 16:00:28 -04:00
e5f44165f8
Made activation flag and ENV_TOKEN
ihoover
2013-07-16 15:29:38 -04:00
f2898f8cbf
Merge pull request #407 from edx/renzo/problem-check-event
Renzo Lucioni
2013-07-16 12:20:30 -07:00
92391a22fc
Don't force field inheritance of default values
Calen Pennington
2013-07-11 08:42:24 -04:00
0a38e490e3
Fix pep8/pylint errors
Calen Pennington
2013-07-10 16:35:39 -04:00
f6b7b2678d
Set about page default content from overview.yml template
Calen Pennington
2013-07-10 16:35:16 -04:00
4b53478859
Require markdown to be explicitly set
Calen Pennington
2013-07-10 16:31:34 -04:00
8b5979641b
Change default rerandomize and showanswer
Calen Pennington
2013-07-10 13:32:00 -04:00
3722685e1a
No longer persist XModule templates
Don Mitchell
2013-06-24 15:44:49 -04:00
8c904f31a9
Move defaults from yaml templates to field definitions.
Don Mitchell
2013-07-16 14:22:42 -04:00
d4f8ab3f09
Merge pull request #414 from edx/jtauber/switch-transifex-project
James Tauber
2013-07-16 11:08:03 -07:00
9eb1cce352
maximum number of random users
ihoover
2013-07-16 14:05:41 -04:00
2540be2442
Update rake docs to reflect change in folder structure
Julian Arni
2013-07-16 13:45:22 -04:00
5f9c395afe
Use source dir for data docs
Julian Arni
2013-07-16 13:37:50 -04:00
3a095acced
changed transifex project to edx-platform
James Tauber
2013-07-16 13:38:34 -04:00
79b1bffdc8
fix breakage from dir renaming
Julian Arni
2013-07-16 13:30:39 -04:00
f3d8738365
static_template_view.models is gone, remove it from docs.
Ned Batchelder
2013-07-10 11:39:54 -04:00
954ddf496d
We don't need to run sphinx on our tests.
Ned Batchelder
2013-07-10 11:39:22 -04:00
bf60b24aa8
Switch to common structure and shared resources
Julian Arni
2013-07-16 13:01:12 -04:00
a0749bd242
Merge pull request #412 from edx/dave/ie10_mathjax_fix
David Ormsbee
2013-07-16 09:50:18 -07:00
66eb47fb0d
Disabled csrf and made auto_login page toggleable with setting
ihoover
2013-07-16 11:54:50 -04:00
894b62ba9b
Merge pull request #406 from edx/gprice/register-button-enabling-tweak
Greg Price
2013-07-16 08:52:42 -07:00
35f66f8469
Update MathJax to the latest stable version (2.2), to fix IE10 bug LMS-194
David Ormsbee
2013-07-16 09:20:35 -04:00
ef8618f7ad
Make DraftModuleStore mongo only
Don Mitchell
2013-06-24 12:52:50 -04:00
3d1188b126
Make release email script wiki-friendly
Calen Pennington
2013-07-15 14:56:13 -04:00
6e2de9dba2
tweak css and fix merge conflicts
Kevin Chugh
2013-07-15 21:12:05 -04:00
fbd0f1bec0
wire up static HTML to allow panel functionality
Kevin Chugh
2013-07-15 20:09:01 -04:00
22302e3a46
Make jasmine tests quieter
Calen Pennington
2013-07-15 16:47:32 -04:00
92ae50d415
Remove unused code and include problem ID of data we send
Renzo Lucioni
2013-07-15 15:18:01 -04:00
978d33badd
Merge pull request #319 from edx/talbs/studio-sassmixins
Brian Talbot
2013-07-15 11:52:35 -07:00
51037650fb
Merge pull request #393 from edx/talbs/studio-nav-fix
Brian Talbot
2013-07-15 11:39:37 -07:00
27b7e35bd3
i18n the PDF prev/next button text
Frances Botsford
2013-07-15 13:54:04 -04:00
c770458e6a
Reinstate problem_check event as Problem Checked event
Renzo Lucioni
2013-07-15 13:31:56 -04:00
7c5943a87c
Tweak behavior of submit buttons on register and login pages
Greg Price
2013-06-21 13:05:48 -04:00
e9d400cbde
Merge remote-tracking branch 'origin/release' into rc/2013-07-16
Calen Pennington
2013-07-15 13:03:47 -04:00
2262ffe4e5
updated imageresponse example to a more universal example (baby animals)
Lyla Fischer
2013-07-15 11:58:37 -04:00
d83d49cac4
drag_and_drop template added
Lyla Fischer
2013-07-15 11:26:03 -04:00
5c0fd18910
Validate date/time settings when typed in directly.
Peter Fogg
2013-07-15 11:00:43 -04:00
388724c485
Studio: updates Sass mixins/extend references based on textbook/Sass cleanup
Brian Talbot
2013-07-12 16:47:58 -04:00
19a7e63e40
Studio: renames nav dropdown pattern and corrects references
Brian Talbot
2013-07-08 07:41:16 -04:00
34e9a21da8
Studio: renames and simplifies .cont-trucated Sass extend
Brian Talbot
2013-07-02 09:56:44 -04:00
91a6e34769
Studio: adds further comment/prefix revisions to Sass extends
Brian Talbot
2013-07-02 01:36:17 -04:00
7ea55757bf
Studio: references newly renamed app-wide Sass extends
Brian Talbot
2013-07-02 01:28:56 -04:00
88d06a16e5
Studio: renames and re-orgs app-wide Sass extends
Brian Talbot
2013-07-02 01:28:27 -04:00
a2ac5c87db
Studio: revises nav display issue by re-scoping poor Updates Sass rules
Brian Talbot
2013-07-12 17:24:04 -04:00
f9f0d9ccf6
Merge pull request #402 from edx/peter-fogg/fix-section-release-tests
Peter Fogg
2013-07-15 07:08:30 -07:00
60d151497f
Fix section release acceptance test failure.
Peter Fogg
2013-07-15 09:21:25 -04:00
7f5aedb215
Merge pull request #380 from edx/db/studio-i18n
David Baumgold
2013-07-13 05:45:50 -07:00
c9943306ef
put block around main_vendor js in main_django.html
Jason Bau
2013-07-12 22:57:13 -07:00
dcc63be4b5
Merge pull request #388 from edx/fix/cdodge/dont-display-github-links-in-mongo-lms
chrisndodge
2013-07-12 18:03:43 -07:00
db7434fa18
add comment as to why we are turning off this feature flag
Chris Dodge
2013-07-12 20:02:23 -04:00
547f230002
Merge pull request #381 from edx/feature/ichuang/export_all_courses
ichuang
2013-07-12 16:59:53 -07:00
8b6a55e2a8
fix pep-8 in export_all_courses
ichuang
2013-07-12 19:58:16 -04:00
8f743424ba
Merge pull request #387 from edx/fix/cdodge/unescape-quote-strings
chrisndodge
2013-07-12 15:32:55 -07:00
e1c02b1b31
Studio: removing preventDefault from course creator request button
Brian Talbot
2013-07-12 16:50:00 -04:00
04ddb63dad
i18n the studio nav help button
David Baumgold
2013-07-12 16:27:54 -04:00
260b5ccef4
i18n the view live button on the studio dashboard
Frances Botsford
2013-07-12 14:32:01 -04:00
a6f349dab9
Studio i18n
David Baumgold
2013-07-12 09:40:51 -04:00
ac4e20b4f3
change serialize_field to check for type. If value is a string, simply return that, otherwise do a json.dumps
Chris Dodge
2013-07-12 15:27:36 -04:00
5a5b3cfe8a
Merge pull request #384 from antoviaque/vagrant-mount
David Baumgold
2013-07-12 12:17:51 -07:00