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 |
|
Alison Hodges
|
dba9c4fefb
|
Anton's and Sylvia's edits
|
2014-05-21 10:59:36 -04:00 |
|
zubair-arbi
|
a8bb768970
|
Merge pull request #3767 from edx/zub/story/std1624-cmssubsectiontests
fix cms subsection tests
|
2014-05-21 19:45:00 +05:00 |
|
Adam
|
8813c04567
|
Merge pull request #3794 from edx/frances/fix/studio-edit-section-date-modal2
fix for modal appearing off-screen
|
2014-05-21 10:31:28 -04:00 |
|
John Jarvis
|
d25136893c
|
Merge pull request #3712 from edx/jarv/cert-mode
returning enrollment mode for both active and inactive users
|
2014-05-21 10:07:17 -04:00 |
|
zubair-arbi
|
6d0e2b215c
|
update _xmodule_recurse method
|
2014-05-21 18:31:19 +05:00 |
|
zubiar-arbi
|
08f313f9b4
|
move upload code for assets to AssetsView
STUD-1523
|
2014-05-21 17:15:04 +05:00 |
|
zubair-arbi
|
6bdf984e8d
|
update _xmodule_recurse to ignore some exception
|
2014-05-21 16:36:55 +05:00 |
|
zubair-arbi
|
83db659f94
|
create draft request gets already created version if it exists
STUD-1616
|
2014-05-21 16:36:54 +05: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 |
|
clytwynec
|
b7816aafa2
|
Merge pull request #3775 from edx/clytwynec/bokchoy-language-test-fix
added check for modal to disappear in _change_lang_promise
|
2014-05-20 16:27:52 -04:00 |
|
Christine Lytwynec
|
7fd2305f39
|
added and updated pavelib/quality.py from dglance branch, deprecated rake quality tasks
|
2014-05-20 16:22:28 -04:00 |
|
clytwynec
|
722870eb5f
|
Merge pull request #3762 from edx/clytwynec/bok-choy-auto_auth-page-fix
made is_browser_on_page actually check for the right page in AutoAuthPag...
|
2014-05-20 16:02:29 -04:00 |
|
David Baumgold
|
6e0e13003f
|
Merge pull request #3744 from lduarte1991/lduarte-harvardx
Reconnecting Token Generator for Annotation Tool [Fix]
|
2014-05-20 15:34:34 -04:00 |
|
Jason Bau
|
b23beda8a9
|
Merge pull request #3782 from edx/jbau/shib-activate-on-acct-linking
Autoactivate inactive users on external_auth login
|
2014-05-20 12:30:41 -07:00 |
|
lduarte1991
|
0d8a4797f1
|
extend changes of url/raw issue to video annotions
|
2014-05-20 14:40:40 -04:00 |
|
lduarte1991
|
4f981d9961
|
Merge pull request #1 from edx/db/harvardx
avoid URL rewriting
|
2014-05-20 14:30:04 -04:00 |
|
Ned Batchelder
|
cf6a83f4a4
|
Merge pull request #3730 from louyihua/localization-fix-video
i18n: Make translation works for video editor tabs
|
2014-05-20 14:22:40 -04:00 |
|
Mark Hoeber
|
0160927901
|
Merge pull request #3773 from edx/markhoeber/documentation/doc-401
Release Notes for 5/20/14
|
2014-05-20 14:15:25 -04:00 |
|
Frances Botsford
|
f2d8894118
|
fix for modal appearing off-screen
|
2014-05-20 14:13:51 -04:00 |
|
David Baumgold
|
75ff35e208
|
proxy raw further along
|
2014-05-20 14:01:55 -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 |
|
jmclaus
|
34a7a3a6ef
|
Merge pull request #3631 from edx/jmclaus/bugfix_display_specific_error_message_when_HTML5_video_not_supported
Added new error message that displays when HTML5 video is not supported. [BLD-638]
|
2014-05-20 19:56:02 +02: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 |
|
David Baumgold
|
8080261aa7
|
generate raw URLs that are not rewritten by static_replace
|
2014-05-20 13:27:47 -04:00 |
|
jmclaus
|
678a92b4b2
|
Added new error message that displays when HTML5 video is not supported altogether. Make sure spinner gets hidden when error message is shown. [BLD-638]
|
2014-05-20 19:17:57 +02:00 |
|
Mark Hoeber
|
6436f32d1f
|
Release Notes for 5/20/14
DOC-401
|
2014-05-20 13:17:34 -04:00 |
|
Alison Hodges
|
82a936df2b
|
Added change log entry for PR3728
|
2014-05-20 13:15:30 -04:00 |
|
Anton Stupak
|
61414c7c92
|
Merge pull request #3715 from edx/anton/i18n-string-response
StringResponse i18n.
|
2014-05-20 19:51:50 +03:00 |
|
Anton Stupak
|
d8f1ebefb7
|
Merge pull request #3734 from edx/anton/i18n-custom-response
CustomResponse: fix log message.
|
2014-05-20 19:51:40 +03:00 |
|
Greg Price
|
ae50c9c808
|
Merge pull request #3728 from edx/gprice/forum-search-logging
Add logging of search quality information
|
2014-05-20 12:44:05 -04:00 |
|
David Baumgold
|
49e539da77
|
Merge pull request #3644 from edx/db/remove-broken-docs-link
remove broken docs link
|
2014-05-20 12:42:31 -04:00 |
|
Yihua LOU
|
dba66c2a85
|
Merge pull request #5 from edx/ned/tweak-pr-3730
Slight tweak to get_text
|
2014-05-21 00:33:35 +08:00 |
|
Ned Batchelder
|
2c4fcb0c5b
|
Slight tweak to get_text
|
2014-05-20 12:02:17 -04:00 |
|
Alison Hodges
|
53d0a4edce
|
Merge pull request #3777 from edx/ahodges/documentation/AN1031
Clarifications, added info on doc, format
|
2014-05-20 12:02:04 -04:00 |
|
Alison Hodges
|
6a8063aea7
|
Added sections on documenting and debugging, clarifications
|
2014-05-20 12:01:29 -04:00 |
|
Don Mitchell
|
08aaa97bfb
|
Serialize course_key at last possible code junction
|
2014-05-20 11:58:03 -04:00 |
|
Alison Hodges
|
6789a047fc
|
Youtube OR html5 made consistent
|
2014-05-20 11:56:49 -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 |
|
Alison Hodges
|
b39fbf26de
|
Added five more events with descriptions frm Blades
|
2014-05-20 11:27:07 -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 |
|
Alan Boudreault
|
877ec3f963
|
some minor improvements to embargo
|
2014-05-20 10:03:06 -04:00 |
|