Calen Pennington
|
1f9c7b2ed4
|
Merge pull request #3809 from cpennington/ok-dead-code
Remove dead code
|
2014-05-21 16:21:17 -04:00 |
|
Calen Pennington
|
32e0387fa0
|
Merge pull request #3811 from cpennington/ok-dont-use-empty
Don't use Empty directly, let the manager handle it
|
2014-05-21 16:14:42 -04:00 |
|
Calen Pennington
|
61e621fc6e
|
Merge pull request #3812 from cpennington/ok-simpler-loc-mapper
Make the arguments to translate_location_to_course_locator more specific
|
2014-05-21 16:12:27 -04:00 |
|
Calen Pennington
|
3b58997b82
|
Merge pull request #3814 from cpennington/ok-conditional-test
Fix ConditionalTest test system
|
2014-05-21 16:10:56 -04:00 |
|
Calen Pennington
|
150b5cd298
|
Merge pull request #3816 from cpennington/ok-psychometrics
Fix PsychometricData query
|
2014-05-21 16:09:46 -04:00 |
|
Calen Pennington
|
d52c58c77b
|
Fix PsychometricData query
|
2014-05-21 14:48:25 -04:00 |
|
Calen Pennington
|
c62b6b0083
|
Fix ConditionalTest test system
|
2014-05-21 14:44:46 -04:00 |
|
Calen Pennington
|
4836252972
|
Make the arguments to translate_location_to_course_locator more specific
|
2014-05-21 14:39:28 -04:00 |
|
Calen Pennington
|
06d680cded
|
Don't use Empty directly, let the manager handle it
|
2014-05-21 14:38:16 -04:00 |
|
Calen Pennington
|
4af2249a9d
|
Remove dead code
|
2014-05-21 14:28:04 -04:00 |
|
Calen Pennington
|
4df73548bf
|
Merge pull request #3788 from cpennington/allow-cross-course-references
Allow cross course references in the LMS
|
2014-05-21 11:06:01 -04:00 |
|
Calen Pennington
|
39e264041e
|
Merge pull request #3778 from cpennington/mixed-modulestore-bad-keys
Handle malformed keys in MixedModuleStore configuration
|
2014-05-21 11:05:50 -04:00 |
|
Don Mitchell
|
50d66be2a1
|
Merge pull request #3792 from edx/dhm/bug_ora_peer_grading
Fix student progress @sarina bug
|
2014-05-20 18:12:22 -04:00 |
|
Don Mitchell
|
c085578383
|
Fix student progress @sarina bug
|
2014-05-20 18:08:33 -04:00 |
|
Don Mitchell
|
3ab925a178
|
Merge pull request #3787 from edx/dhm/bug_mktg_url
marketing url too many slashes
|
2014-05-20 13:56:16 -04:00 |
|
Calen Pennington
|
c092118d56
|
Merge pull request #3781 from cpennington/opaque-keys-more-docs
Add autodocs of modulestores
|
2014-05-20 13:55:25 -04:00 |
|
Don Mitchell
|
115f5b2cd1
|
Merge pull request #3791 from edx/dhm/bug_open_ended_notifications
Dhm/bug open ended notifications
|
2014-05-20 13:39:27 -04:00 |
|
Don Mitchell
|
08aaa97bfb
|
Serialize course_key at last possible code junction
|
2014-05-20 11:58:03 -04:00 |
|
Don Mitchell
|
f7558c40e8
|
Fixes ../courseware/Peer_Grading_Panel/peergrading:L12P5_grading/ reported bug
|
2014-05-20 11:44:51 -04:00 |
|
Calen Pennington
|
76235c1027
|
Allow cross course references in the LMS
|
2014-05-20 11:44:09 -04:00 |
|
Sarina Canelake
|
9dc48c00b4
|
Merge pull request #3779 from edx/sarina/fix-grades-management-commands
Sarina/fix grades management commands
|
2014-05-20 11:35:54 -04:00 |
|
Don Mitchell
|
80552674b3
|
Merge pull request #3786 from edx/dhm/bug_cohort_args
Dhm/bug cohort args
|
2014-05-20 11:23:22 -04:00 |
|
Don Mitchell
|
591fc2b547
|
Fixes Carlos's bug
|
2014-05-20 11:15:10 -04:00 |
|
Don Mitchell
|
e2332d1922
|
Fix old dashboard list cohorts
|
2014-05-20 10:37:03 -04:00 |
|
Calen Pennington
|
ef10833309
|
Handle malformed keys in MixedModuleStore configuration
|
2014-05-20 10:27:59 -04:00 |
|
Calen Pennington
|
f883a36935
|
Merge pull request #3780 from cpennington/missing-semicolon
Fix missing semicolon in annotation html
|
2014-05-20 10:27:30 -04:00 |
|
Sarina Canelake
|
189f53bc71
|
Fix grades management commands
|
2014-05-19 16:11:45 -04:00 |
|
Calen Pennington
|
bd609be043
|
Add autodocs of modulestores
|
2014-05-19 15:48:52 -04:00 |
|
Calen Pennington
|
9ca09db469
|
Fix missing semicolon in annotation html
|
2014-05-19 15:34:29 -04:00 |
|
Mark Hoeber
|
a7139a84b6
|
Add stevedore requirements for RTD builds
|
2014-05-19 14:58:54 -04:00 |
|
Mark Hoeber
|
1e27f177da
|
Adding opaque keys module to system path in doc configuration
To make RTD work.
|
2014-05-19 13:46:07 -04:00 |
|
Don Mitchell
|
5a62c83d05
|
Handle some records not having lower_id
|
2014-05-19 13:31:03 -04:00 |
|
Calen Pennington
|
30f2c9331d
|
Merge pull request #3763 from cpennington/opaque-keys-merge-master
Merge latest master into opaque-keys
|
2014-05-19 13:10:55 -04:00 |
|
Calen Pennington
|
a3b6ef8bae
|
Rename variables to make type clearer
|
2014-05-19 10:58:38 -04:00 |
|
Calen Pennington
|
4df122a92e
|
Update annotations modules to use the course_id from the runtime, rather than extracting it from the page
|
2014-05-19 09:37:53 -04:00 |
|
Calen Pennington
|
2ce6719153
|
Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master
|
2014-05-19 09:29:34 -04:00 |
|
Calen Pennington
|
8f72394e81
|
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
cms/templates/widgets/header.html
|
2014-05-19 09:20:08 -04:00 |
|
Will Daly
|
6c7ca7ae89
|
Merge pull request #3768 from edx/will/ora2-release-2014-05-19
ORA2 release 2014-05-19
|
2014-05-19 08:44:02 -04:00 |
|
Sarina Canelake
|
03496b5da1
|
Merge pull request #3771 from edx/sarina/051914-language-update
Sarina/051914 language update
|
2014-05-19 08:43:37 -04:00 |
|
Sarina Canelake
|
593f591847
|
Update translations (autogenerated message)
|
2014-05-19 08:35:08 -04:00 |
|
Sarina Canelake
|
5fd2eef58d
|
Add Croatian language
|
2014-05-19 08:13:18 -04:00 |
|
Will Daly
|
8b3992bf4b
|
ORA2 release 2014-05-19
|
2014-05-19 08:05:13 -04:00 |
|
Anton Stupak
|
b3fb545b10
|
Merge pull request #3716 from edx/anton/i18n-symbolic-response
SymbolicResponse fix error message.
|
2014-05-19 11:23:07 +03:00 |
|
polesye
|
aedde3397e
|
SymbolicResponse fix error message.
|
2014-05-19 09:00:09 +03:00 |
|
Nimisha Asthagiri
|
b3233f2932
|
Merge pull request #3619 from edx/markhoeber/documentatoin/online-help-system
Online help system
|
2014-05-16 22:02:23 -04:00 |
|
Nimisha Asthagiri
|
73275eeb82
|
Updated tests for online help
|
2014-05-16 21:27:57 -04:00 |
|
Mark Hoeber
|
27ff0db57b
|
Added new context sensitive link and updated text
Sock template changes
|
2014-05-16 20:38:09 -04:00 |
|
Nimisha Asthagiri
|
84d8fcf1b5
|
Acceptance tests for online help.
|
2014-05-16 20:38:09 -04:00 |
|
Mark Hoeber
|
8fcbdaed03
|
Update of all templates
Changed help button to link and removed drop-down items
|
2014-05-16 20:38:09 -04:00 |
|
Nimisha Asthagiri
|
b7440a51e8
|
Dev support for context-sensitive help.
|
2014-05-16 20:37:32 -04:00 |
|