Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,986 Commits 1 Branch 0 Tags
dffd8648b3e464bdb45458f18f87cc217432c653
Commit Graph

27986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Adam
50e05eb6a0 Merge pull request #3785 from mlkwaqas/waqas/lms2646-revert 
Revert "Handle the indexerror exception on create_order"
 2014-05-20 09:39:48 -04:00
Waqas Khalid
95636a9556 Revert "Handle the indexerror exception on create_order" 
It was merged by mistake during the code freeze.
 2014-05-20 18:33:54 +05:00
Waqas Khalid
d87fa2ce97 Merge pull request #3641 from mlkwaqas/waqas/lms2646-list-index-error 
Handle the indexerror exception on create_order
 2014-05-20 17:29:12 +05:00
polesye
67a20d6536 Fix message. 2014-05-20 14:15:01 +03:00
Waqas Khalid
33871e4515 Handle the indexerror exception on create_order 
LMS-2646
 2014-05-20 16:04:58 +05:00
zubair-arbi
807f8e9a9a fix cms subsection tests 
STUD-1624
 2014-05-20 13:42:51 +05:00
louyihua
f3371643ee i18n: Make translation works for video editor tabs 
Now the display_name & help strings in video editor tabs can be extracted and translated.
 2014-05-20 11:20:22 +08:00
Greg Price
299046a86f Add logging of search quality information 
For now, this only includes course id, search terms, and result count.
Information is logged both to the standard logger for near-term analysis
and the event tracker for the longer term. Result count logging requires
commit 02466b1 of cs_comments_service (otherwise it will be null).
 2014-05-19 17:37:26 -04:00
Jason Bau
411dc09af7 Autoactivate inactive users on external_auth login 
Conditional on existing flag BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH
 2014-05-19 13:35:35 -07:00
David Baumgold
61b28f560b remove broken docs link 2014-05-19 16:35:30 -04:00
Sarina Canelake
189f53bc71 Fix grades management commands 2014-05-19 16:11:45 -04:00
Alan Boudreault
db161543d8 Modified EMBARGO_SITE to SITE_EMBARGOED, improved logs 2014-05-19 15:53: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
Alan Boudreault
25948e3694 Fix minor typo in a test 2014-05-19 15:12:02 -04:00
Alan Boudreault
ba6e61b907 Extended Embargo feature to support site access restriction and ip network 2014-05-19 15:12:02 -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
Christine Lytwynec
36f4e55e2b added check for modal to disappear in _change_lang_promise 2014-05-19 12:45:45 -04:00
Calen Pennington
a3b6ef8bae Rename variables to make type clearer 2014-05-19 10:58:38 -04:00