Usman Khalid
95a112a3dd
instructor_task: Distribute extra items among subtasks of last query.
...
When creating an instructor task total_num_items may change between the
time it and the number of subtasks is calculated and the time the
subtasks are actually queued (all of this cannot happen in one transaction).
In such a case the extra items are distributed among the subtasks of the
last query.
LMS-2090
2014-02-04 23:30:02 +05:00
Dave St.Germain
0f8919a6ba
Merge pull request #2441 from edx/dcs/info-remove-title
...
Removed extraneous title block that was replacing the breadcrumbs
2014-02-03 14:28:56 -08:00
Julia Hansbrough
5f325a4b89
Merge pull request #2447 from edx/flowerhack/fix/update-language-settings
...
Removed LANGUAGE from devstack settings
2014-02-03 14:22:25 -08:00
Giulio Gratta
a76e5bd6e2
Merge pull request #2442 from edx/giulio/fix-disabled-about-page-button
...
fixing layout/style of disabled register button
2014-02-03 13:45:44 -08:00
Julia Hansbrough
cd95469b18
Removed LANGUAGE from devstack settings
2014-02-03 21:44:04 +00:00
Mark Hoeber
eb36fc90a4
Merge pull request #2445 from edx/sylvia/documentation/STUD-1145
...
Add documentation for "multiple choice and numerical input" problems
2014-02-03 13:43:46 -08:00
Feanil Patel
5e5c59cab2
Merge remote-tracking branch 'origin/release'
...
Conflicts:
common/lib/xmodule/xmodule/modulestore/xml.py
Took the changes that were on the release branch.
2014-02-03 16:39:40 -05:00
Feanil Patel
e0dd42cc95
Merge pull request #2435 from edx/hotfix/2014-02-03
...
Allow new response pagination parameters to pass through thread model.
2014-02-03 13:35:55 -08:00
Sylvia Pearce
b2f7e5bd00
Add documentation for "multiple choice and numerical input" problems
2014-02-03 16:35:23 -05:00
Giulio Gratta
1e1826af18
fixing layout/style of disabled register button
2014-02-03 13:17:15 -08:00
Giulio Gratta
5a722b9048
Merge pull request #2436 from edx/giulio/add-og-info-about-pages
...
Add OG title and description to course about pages
2014-02-03 13:02:21 -08:00
Diana Huang
0ee9a72465
Merge pull request #2432 from edx/diana/error-module-i18n
...
Clean up strings in the ErrorModule
2014-02-03 12:57:14 -08:00
Giulio Gratta
879a849eea
Add OG title and description to course about pages
2014-02-03 12:36:43 -08:00
Dave St.Germain
ac8eeac798
Removed extraneous title block that was replacing the breadcrumbs
2014-02-03 15:22:25 -05:00
David Baumgold
27b2ff7e99
Merge pull request #2401 from edx/db/component-label-display-name
...
Pass component display name to Mako template
2014-02-03 12:04:00 -08:00
Calen Pennington
a3146cd7aa
Merge pull request #2388 from cpennington/initial-languages
...
Add initial languages, ready for dark-launch
2014-02-03 11:52:32 -08:00
Will Daly
26455fe35b
Added sphinx_rtd_theme to requirements
2014-02-03 14:29:28 -05:00
Will Daly
2600032842
Pinned version of sure library
2014-02-03 14:29:20 -05:00
Calen Pennington
d7d1d4bef2
Update translations (autogenerated message)
2014-02-03 14:27:49 -05:00
Calen Pennington
b06cf9cfbb
Make i18n tests work with a clean checkout
2014-02-03 14:27:48 -05:00
Will Daly
9fd0fbc783
Merge pull request #2430 from edx/will/fix-bok-choy-register-test
...
Fix find courses page title in bok choy test suite
2014-02-03 11:07:19 -08:00
David Baumgold
46248c7006
add lettuce test for displaying category if display_name is empty
2014-02-03 13:45:07 -05:00
jsa
95b87f0683
Allow new response pagination parameters to pass through thread model.
...
JIRA: FOR-374
2014-02-03 13:41:48 -05:00
Calen Pennington
f5ffc94d16
Prep for initial language release
2014-02-03 13:35:56 -05:00
Calen Pennington
788ed13b76
Rename djangojs.po to djangojs-partial.po in transifex, to prevent header creep
2014-02-03 13:35:56 -05:00
Calen Pennington
4e879a4c81
Add first pass at i18n automation tasks
2014-02-03 13:35:56 -05:00
Jay Zoldak
7e075eece1
Merge pull request #2433 from edx/zoldak/fix-tests-unicode
...
Mark strings that were causing test failures as unicode
2014-02-03 10:23:00 -08:00
Adam
f48a456b8c
Merge pull request #2429 from edx/adam/fix/login-i18n
...
i18n input field on login page (LMS-2159)
2014-02-03 10:01:22 -08:00
Jay Zoldak
5ab0c9adb5
Mark strings that were causing test failures as unicode
2014-02-03 12:52:45 -05:00
Dave St.Germain
9c7f84a5f9
Merge pull request #2404 from edx/sarina/fix-unicode-in-subsection
...
Fix unicode error in subsection
2014-02-03 09:20:19 -08:00
David Baumgold
7cab3869c4
Fall back on category is display_name is empty or unset
2014-02-03 12:10:55 -05:00
Dave St.Germain
cb7882e0c8
Added test for template tag and breadcrumb function.
2014-02-03 12:01:28 -05:00
Sarina Canelake
7718608741
Fix unicode error in subsection
2014-02-03 12:01:28 -05:00
Diana Huang
40deaa509e
Clean up strings in the ErrorModule
2014-02-03 11:56:10 -05:00
Greg Price
4e1c595472
Merge pull request #2377 from edx/gprice/forum-thread-pagination
...
Add pagination of responses to forum threads
2014-02-03 08:55:20 -08:00
Will Daly
8b3538150b
Fix find courses page title in bok choy test suite
2014-02-03 11:42:23 -05:00
marcotuts
c43d36b704
visual styling adjustments to component header
2014-02-03 11:40:57 -05:00
David Baumgold
a78dad77ff
Pass component display name to Mako template
...
STUD-1241
2014-02-03 11:40:47 -05:00
Calen Pennington
d00314c8bc
Handle mixed case language codes coming from the browser or in dark-lang configuration
2014-02-03 11:32:49 -05:00
Calen Pennington
994dde910b
Add failing test for different capitalizations of language codes coming from the browser
2014-02-03 11:32:49 -05:00
Will Daly
830ad942ff
Merge pull request #2424 from edx/will/fix-rake-test-cleanup
...
Fix cleanup .pyc file command in rake test
2014-02-03 08:31:32 -08:00
Adam Palay
ca7faaa715
i18n input field on login page (LMS-2159)
2014-02-03 11:21:19 -05:00
Will Daly
eae4adeb9b
Merge pull request #2361 from edx/will/bok-choy-upgrade-and-lms-tests
...
Bok-choy upgrade, LMS tests, cleanup
2014-02-03 08:11:03 -08:00
Greg Price
5e48aece64
Merge pull request #2392 from edx/gprice/fix-unread-tooltip
...
Fix unread comment count tooltip rendering
2014-02-03 08:05:54 -08:00
Will Daly
2a57e2331a
Fix cleanup .pyc file command in rake test
2014-02-03 08:00:01 -05:00
Will Daly
cac57a5110
Merge pull request #2420 from edx/will/fix-sure-install-failure
...
Pinned version of sure library
2014-02-02 15:50:03 -08:00
Will Daly
89c029d281
Pinned version of sure library
2014-02-02 18:17:45 -05:00
Will Daly
e70ff435fa
Merge pull request #2411 from edx/will/fix-docs-build
...
Added sphinx_rtd_theme to requirements
2014-02-02 15:03:01 -08:00
Will Daly
577c77f080
Added sphinx_rtd_theme to requirements
2014-02-01 14:34:24 -05:00
Mark Hoeber
01c9db10b8
Merge pull request #2409 from edx/markhoeber/documentation/fix-data-config
...
Markhoeber/documentation/fix data config
2014-02-01 07:00:11 -08:00
