Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,221 Commits 1 Branch 0 Tags
34a7a3a6ef8d74c178db388b4cb7a3a4aecd3f02
Commit Graph

23221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Waqas Khalid
33871e4515 Handle the indexerror exception on create_order 
LMS-2646
 2014-05-20 16:04:58 +05: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
David Baumgold
61b28f560b remove broken docs link 2014-05-19 16:35:30 -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
934b8dbcf9 Add translators. 2014-05-19 09:00:54 +03:00
polesye
aedde3397e SymbolicResponse fix error message. 2014-05-19 09:00:09 +03:00
polesye
237fca067f CustomResponse: fix log message. 2014-05-19 08:58:31 +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
Carson Gee
3b25801881 Merge pull request #3615 from jazkarta/devstack-local-filestorage 
Use local storage instead of S3 for uploads in devstack.
 2014-05-16 17:10:05 -04:00
Chris Rossi
db8b33d04d Use path already created by ansible. 2014-05-16 16:37:39 -04:00
Chris Rossi
42e8e3068e Use local storage instead of S3 for uploads in devstack. 2014-05-16 16:37:39 -04:00
David Baumgold
2549551e3c Merge pull request #3752 from edx/db/doc-cognitive-load 
Added rst version of cognitive load page
 2014-05-16 13:59:39 -04:00
David Baumgold
8afe315ce4 link to code considerations page from contributor doc 2014-05-16 13:59:21 -04:00
clytwynec
6396373bd5 Merge pull request #3758 from edx/clytwynec/disable-XBlockAcidNoChildTest 
disabled test_lms.py:XBlockAcidNoChildTest.test_acid_block
 2014-05-16 12:01:05 -04:00
srpearce
64909df1de Merge pull request #3740 from edx/sylvia/docs/BLD-1032 
Update Video component to reflect new UI
 2014-05-16 11:52:47 -04:00
Sylvia Pearce
14f3bcfe66 Update Video docs to reflect new UI 2014-05-16 11:52:19 -04:00
Christine Lytwynec
0533859366 disabled test_lms.py:XBlockAcidNoChildTest.test_acid_block 2014-05-16 11:17:26 -04:00
zubair-arbi
4ec689ed5e Merge pull request #3640 from edx/zub/bugfix/std1595-importcoursepermission 
remove redundent code on course import
 2014-05-16 19:05:46 +05:00
Jay Zoldak
576df83974 Merge pull request #3756 from edx/zoldak/disable-flaky-test 
Skip language changing tests
 2014-05-16 09:36:52 -04:00
David Baumgold
867ea2b637 renamed cognitive_load.rst to code-considerations.rst 2014-05-16 09:28:50 -04:00
David Baumgold
adf6df224e address review comments from @nedbat 2014-05-16 09:28:05 -04:00
Jay Zoldak
7f5c810ac8 Skip language changing tests 2014-05-16 09:00:12 -04:00
zubair-arbi
74aa3a5ba0 create course gorups properly on course import 
STUD-1595
 2014-05-16 14:58:11 +05:00
David Adams
fb9b38b7e3 Merge pull request #3584 from edx/dcadams/metrics_tab_download_csv 
Metrics tab - fix click handlers and add download buttons
 2014-05-15 13:47:52 -07:00
David Baumgold
138bd78e93 add So You Want to Deploy a New Service 2014-05-15 16:44:53 -04:00
David Baumgold
52bc2aa070 Added rst version of cognitive load page 2014-05-15 16:35:05 -04:00
David Adams
9bc7a518ee Fixes issue with metrics tab click handlers 
Click handlers were not getting attached to DOM elements in some cases on slow running machines.
  Added logic to attach handlers when elements are ready.

Added 2 buttons on metrics tab:
  Download Subsection Data for downloading to csv.
  Download Problem Data for downloading to csv.
 2014-05-15 11:45:59 -07:00
Brian Wilson
aacbc5eddb Merge branch 'release' (after release-2014-05-14). 2014-05-15 14:34:22 -04:00
Jay Zoldak
a584015bca Merge pull request #3742 from edx/zoldak/disable-failing-cms-test 
Disable failing cms acceptance tests
 2014-05-15 14:27:37 -04:00