jsa
7d32a90ae2
add ability to delete comments on responses in discussions.
2014-02-20 13:14:11 -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
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
Adam Palay
f1984e7a9f
i18n open_ended_rubric (ORA-314)
...
update strings
2014-02-19 15:41:16 -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
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
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
Ned Batchelder
3aff96c2e4
Add strftime to the i18n runtime service.
2014-02-18 17:35:56 -05:00
Ned Batchelder
be17006022
Use strftime_localized for dates.
2014-02-18 17:35:56 -05:00
Ned Batchelder
64db0e78b5
Fix i18n errors found along the way.
2014-02-18 17:35:56 -05:00
Ned Batchelder
66e598b75d
Add strftime_localized function, not called yet.
2014-02-18 17:35:56 -05:00
Ned Batchelder
229f3522fa
Move date_utils to common/djangoapps/util
2014-02-18 17:35:56 -05:00
Ned Batchelder
7fd9d44210
Remove unused import.
2014-02-18 17:35:56 -05:00
Julia Hansbrough
c246f7da11
Merge pull request #2633 from edx/flowerhack/disable-flakey-language-test
...
Disable flakey language change acceptance tests
2014-02-18 17:34:22 -05:00
David Baumgold
c367dcaae7
Merge pull request #2634 from edx/db/unbreak-debug-toolbar
...
Forgot to update debug toolbar panels in two places
2014-02-18 17:01:55 -05:00
Julia Hansbrough
8fbeeeeb02
Disable flakey language change acceptance tests
2014-02-18 21:16:43 +00:00
David Baumgold
4aca515a28
Forgot to update debug toolbar panels in two places
2014-02-18 16:13:07 -05:00
Will Daly
9e5121f3d9
Merge pull request #2629 from edx/will/disable-flaky-video-tests
...
Disable flaky video test
2014-02-18 15:06:05 -05:00
Will Daly
4ce2834b17
Disable flaky video test
2014-02-18 15:05:01 -05:00
Will Daly
331fbcd585
Merge pull request #2612 from edx/will/fix-xqueue-stub-test
...
Fixed intermittent failure in XQueue stub unit test
2014-02-18 14:59:06 -05:00
Dave St.Germain
b408650424
Merge pull request #2627 from edx/dcs/fix-devstack-toolbar
...
Fixes devstack settings to work with new version of debug toolbar
2014-02-18 14:55:18 -05:00
Dave St.Germain
3d08bfd208
Fixes devstack settings to work with new version of debug toolbar
2014-02-18 14:50:36 -05:00
David Baumgold
ab938c094b
Merge pull request #2619 from avinassh/patch-1
...
fixed the webchat Freenode URL
2014-02-18 13:18:09 -05:00
