ichuang
79650f5538
add infinity symbol to calc preview
2014-02-20 21:06:54 -05:00
David Baumgold
1bf5d7120c
Merge pull request #2662 from edx/db/textbook-id-unicode
...
Call unicode() instead of str() for textbook IDs
2014-02-20 17:18:23 -05:00
Will Daly
92d4726b63
Merge pull request #2639 from edx/will/bok-choy-test-robustness
...
Will/bok choy test robustness
2014-02-20 16:59:30 -05:00
Jay Zoldak
4c21270f2e
Merge branch 'release'
2014-02-20 16:29:06 -05:00
Will Daly
defbd87468
Protect Acid XBlock test from stale element or zero-length locator list
2014-02-20 16:19:43 -05:00
Jay Zoldak
377ece3e1c
Merge pull request #2661 from edx/zoldak/disable-new-test
...
Disable course listing perf test
2014-02-20 16:04:45 -05:00
David Baumgold
33f56e1bba
Call unicode() instead of str() for textbook IDs
...
STUD-1327
2014-02-20 14:58:17 -05:00
Jay Zoldak
3f4571ddd9
Disable course listing perf test
2014-02-20 14:43:11 -05:00
Jim Abramson
0d28e2bfe0
Merge pull request #2607 from edx/jsa/forum-test-delete-comment
...
django_comment_client: add unit test for (sub)comment deletion.
2014-02-20 13:38:21 -05:00
jsa
4c5336e809
django_comment_client: add unit test for (sub)comment deletion.
...
JIRA: FOR-470
2014-02-20 13:35:26 -05:00
Mark Hoeber
a6184c9113
Merge pull request #2641 from edx/markhoeber/documentation/release-notes-2-19-14
...
Markhoeber/documentation/release notes 2 19 14
2014-02-20 13:23:23 -05:00
Carson Gee
eecb7fab8b
Merge pull request #2535 from edx/fix/ichuang/STUDENT_FILEUPLOAD_MAX_SIZE
...
allow STUDENT_FILEUPLOAD_MAX_SIZE to be configured in aws.py
2014-02-20 11:51:40 -05:00
Mark Hoeber
7802514417
Merge pull request #2625 from edx/markhoeber/documentation/stud-1211
...
Grading chapter enhancements
2014-02-20 11:33:42 -05:00
Mark Hoeber
6fbf830837
Grading chapter enhancements
...
STUD-1211
2014-02-20 11:32:05 -05:00
Mark Hoeber
55e92521c1
Merge pull request #2645 from edx/markhoeber/documentation/stud-1316
...
Markhoeber/documentation/stud 1316
2014-02-20 11:20:06 -05:00
zubair-arbi
603f36959d
Merge pull request #2423 from edx/zub/story/std1133-studioedgelogin
...
try to get courses by django groups for non global users
2014-02-20 21:18:05 +05:00
zubiar-arbi
6892bc73b2
get courses by reversing django groups for non global users (studio dashboard)
...
STUD-1133
2014-02-20 20:23:12 +05:00
Don Mitchell
2057f5185c
Merge pull request #2631 from edx/dbarch/xml_ms_filter
...
Have xml modulestore only load course in course_ids if provided
2014-02-20 10:22:39 -05:00
Mark Hoeber
d29e93b7fa
added STUD-235
2014-02-20 10:22:22 -05:00
zubiar-arbi
88690dab1d
resolve conflict on rebase
2014-02-20 20:21:52 +05:00
Adam
d7b63da6d8
Merge pull request #2642 from edx/adam/i18n-self-assessment-3
...
Adam/i18n self assessment 3
2014-02-19 16:47:49 -05:00
Jay Zoldak
9986a664bb
Merge pull request #2650 from edx/zoldak/dbt-onto-release
...
Rollback Django Debug Toolbar from 1.0.1 to 0.9.4
2014-02-19 15:46:35 -05:00
Adam Palay
f1984e7a9f
i18n open_ended_rubric (ORA-314)
...
update strings
2014-02-19 15:41:16 -05:00
David Baumgold
f375368caa
Rollback Django Debug Toolbar from 1.0.1 to 0.9.4
...
Due to issues with require.js and the latest version of the toolbar.
Also included a note in the requirements file explaining the situation, and what
needs to happen before this can be upgrade properly.
Conflicts:
lms/envs/dev.py
2014-02-19 15:39:39 -05:00
Calen Pennington
3d2b1df637
Merge pull request #2628 from cpennington/fix-stud-1316
...
Fix STUD-1316
2014-02-19 15:31:42 -05:00
srpearce
30f5b46083
Merge pull request #2648 from edx/sylvia/documentation/BLD-577
...
Update information about rescoring submissions
2014-02-19 15:27:18 -05:00
Sylvia Pearce
4feeaea50f
Quick edits
2014-02-19 15:26:32 -05:00
Calen Pennington
1eec47a604
Fix STUD-1316
...
This bug affected unpublishing content (and would trigger an error
message in studio). The fix was to uncouple the rendering of the studio_view
of an xblock with the student_view, so that content that wasn't in
draft mode already wouldn't be modified by early rendering of the
studio_view.
[STUD-1316]
2014-02-19 14:58:41 -05:00
Ned Batchelder
3db7394cb3
Very minor tweaks.
2014-02-19 14:53:45 -05:00
Sylvia Pearce
e398d4dcff
Update information about rescoring submissions
2014-02-19 14:47:08 -05:00
Mark Hoeber
afb2066cd5
Release Notes - 2/19-14
...
DOC-53
2014-02-19 14:18:03 -05:00
Alison Hodges
220fae9f7b
Merge pull request #2647 from edx/ahodges-documentation-Sprint16
...
Ahodges documentation sprint16
2014-02-19 14:08:18 -05:00
Mark Hoeber
366f524625
Merge pull request #2644 from edx/sylvia/documentation/BLD-842
...
Sylvia/documentation/bld 842
2014-02-19 13:14:32 -05:00
Mark Hoeber
1ede7f76fe
edits
2014-02-19 13:09:23 -05:00
Mark Hoeber
44eff20f09
Change log update
2014-02-19 12:42:27 -05:00
Mark Hoeber
6c70189f79
Doc changes for Latex HTML and Latex Problems
...
STUD-1316
removed upload button in outline
2014-02-19 12:40:21 -05:00
Alison Hodges
1ae14deb0c
Clarified historical effect of the speed_change_video event type
2014-02-19 12:29:37 -05:00
David Baumgold
0deb47a4b1
Merge pull request #2640 from edx/db/rollback-djdt-again
...
Rollback Django Debug Toolbar from 1.0.1 to 0.9.4
2014-02-19 12:24:56 -05:00
Sylvia Pearce
089443c2b8
Add label information to Appendix E
2014-02-19 12:22:28 -05:00
Don Mitchell
24bc33a882
Have xml modulestore only load course in course_ids if provided
2014-02-19 12:05:38 -05:00
Will Daly
3de830c65c
Merge pull request #2643 from edx/will/disable-more-video
...
Disable another video test that failed intermittently in master
2014-02-19 11:51:54 -05:00
Will Daly
e8bf5bf78a
Disable another video test that failed intermittently in master
2014-02-19 11:50:44 -05:00
David Baumgold
549fbe4815
Rollback Django Debug Toolbar from 1.0.1 to 0.9.4
...
Due to issues with require.js and the latest version of the toolbar.
Also included a note in the requirements file explaining the situation, and what
needs to happen before this can be upgrade properly.
2014-02-19 11:41:12 -05:00
Greg Price
e2d168d2fe
Merge pull request #2624 from edx/gprice/test-edit-forum-comment
...
Add unit test for updating forum comment
2014-02-19 11:09:38 -05:00
Sylvia Pearce
b785909b77
Add new screen shots
2014-02-19 11:00:28 -05:00
Sylvia Pearce
c2888995c5
Add label information to problem types
2014-02-19 10:59:38 -05:00
Ned Batchelder
399e520969
Merge pull request #2608 from edx/ned/date-l10n
...
strftime_localized
2014-02-18 18:04:12 -05:00
Greg Price
c321ce50f6
Add unit test for updating forum comment
2014-02-18 17:37:03 -05:00
Ned Batchelder
de5f30282d
Latest eo language files.
2014-02-18 17:35:57 -05:00
Ned Batchelder
cad2d43939
Refer to the corresponding change in XBlock.
2014-02-18 17:35:56 -05:00
