zubiar-arbi
08f313f9b4
move upload code for assets to AssetsView
...
STUD-1523
2014-05-21 17:15:04 +05: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
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
David Baumgold
75ff35e208
proxy raw further along
2014-05-20 14:01:55 -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
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
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
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
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
Christine Lytwynec
36f4e55e2b
added check for modal to disappear in _change_lang_promise
2014-05-19 12:45:45 -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
Christine Lytwynec
ed672f079e
made is_browser_on_page actually check for the right page in AutoAuthPage
2014-05-16 14:06:47 -04:00
