Commit Graph

21346 Commits

Author SHA1 Message Date
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
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
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
David Baumgold
1e826996c7 Merge pull request #2391 from edx/yarko/debug-toolbar-v2
fix partial work done for changes in django-debug-toolbar-1.0.1
2014-02-18 12:56:28 -05:00
Ned Batchelder
059681d497 Merge pull request #2623 from edx/ned/latest-transifex
Update translations for 2014-02-18 release prep.
2014-02-18 11:51:26 -05:00
Ned Batchelder
5faca9c46e Update translations for 2014-02-18 release prep. 2014-02-18 13:34:58 -05:00
frances botsford
6b19d0d5f5 Merge pull request #2563 from edx/frances/fix/verified-ui-fixes
Fixes for verification UI discrepancies
2014-02-18 10:23:34 -05:00
Adam
7b3376f944 Merge pull request #2575 from edx/adam/i18n-self-assessment-2
Adam/i18n self assessment 2
2014-02-18 09:07:24 -05:00
Alexander Kryklia
2cea81b005 Merge pull request #2620 from edx/alex/fix_enable_download_track
Enable download_track for existing courses if self.track.
2014-02-18 14:15:40 +02:00
Alexander Kryklia
23a2177da3 Enable download_track for existing courses if self.track. 2014-02-18 12:31:06 +02:00
avinassh
6b5c5190e9 Added myself in AUTHORS 2014-02-17 19:22:43 +05:30
avinassh
0ae8cd1fca fixed the webchat Freenode URL
Currently the URL points to a wrong URL, fixed it by adding 'http' to the URL.
2014-02-17 19:15:37 +05:30
Mark Hoeber
acad35bbe8 Merge pull request #2614 from edx/sylvia/documentation/BLD-815
Sylvia/documentation/bld 815
2014-02-15 14:14:40 -05:00
Sylvia Pearce
324762191b Update Appendix E; add chemical equation to Additional Tools 2014-02-15 14:13:48 -05:00
Julia Hansbrough
64f1cae64b Merge pull request #2419 from edx/talbs/lms-languagemenu
LMS: Adds Language Selection Menu
2014-02-14 18:32:12 -05:00
thedeadparrot
ff0a6fb778 Update cms urls for language preferences 2014-02-14 22:35:14 +00:00