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

8215 Commits

Author SHA1 Message Date
Andy Armstrong
541d20ef83 Allow creation of components on container page 
This commit implements STUD-1490, allowing creation of components
on the container page. It also enables the delete and duplicate
buttons now that new content can be created that would benefit.

Note that it also creates shared functionality for adding components,
and refactors the unit page to use it too.
 2014-05-21 15:40:31 -04:00
Julia Hansbrough
5752312bbb Merge pull request #2776 from aboudreault/embargo-restrict-additions 
Extended Embargo feature to support site access restriction and ip network
 2014-05-21 15:24:07 -04:00
jmclaus
db239c69fe Tolerance expressed in percentage now computes correctly. [BLD-522] 2014-05-21 17:14:12 +02: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
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
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
David Baumgold
75ff35e208 proxy raw further along 2014-05-20 14:01:55 -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
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
Ned Batchelder
2c4fcb0c5b Slight tweak to get_text 2014-05-20 12:02:17 -04:00
Alan Boudreault
877ec3f963 some minor improvements to embargo 2014-05-20 10:03:06 -04: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
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
Alan Boudreault
db161543d8 Modified EMBARGO_SITE to SITE_EMBARGOED, improved logs 2014-05-19 15:53:45 -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
Christine Lytwynec
36f4e55e2b added check for modal to disappear in _change_lang_promise 2014-05-19 12:45:45 -04: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
Christine Lytwynec
ed672f079e made is_browser_on_page actually check for the right page in AutoAuthPage 2014-05-16 14:06:47 -04:00
lduarte1991
0c1b045f3c Using Edx version of tinymce 2014-05-16 14:02:25 -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
Christine Lytwynec
0533859366 disabled test_lms.py:XBlockAcidNoChildTest.test_acid_block 2014-05-16 11:17:26 -04:00
Jay Zoldak
7f5c810ac8 Skip language changing tests 2014-05-16 09:00:12 -04:00
lduarte1991
e911d57911 Revert "Revert pull request #3466" 
This reverts commit 59e3cae4c9.
 2014-05-15 15:23:28 -04:00
Brian Wilson
aacbc5eddb Merge branch 'release' (after release-2014-05-14). 2014-05-15 14:34:22 -04:00
Carson Gee
de637f329e Merge pull request #3725 from carsongee/cg/transcript_xmlmodulestore_fix 
Fix bug affecting video transcripts in XMLModulesStore courses
 2014-05-15 08:50:36 -04:00
Oleg Marshev
b9cd6cd6ec Add sjson and srt to type map. 2014-05-15 14:02:48 +03:00
Carson Gee
52d8317ab5 Fix bug affecting video transcripts in XMLModulesStore courses 2014-05-14 15:19:15 -04:00
David Baumgold
59e3cae4c9 Revert pull request #3466 2014-05-14 13:55:26 -04:00
John Jarvis
71c447768d returning enrollment mode for both active and inactive users 2014-05-13 17:47:52 -04:00
Andy Armstrong
4adc608f48 Specify that split_test_modules support children. 2014-05-13 12:36:45 -04:00
Brian Wilson
d6a74a644d Merge branch 'master' into release 
Conflicts:
	cms/static/js/views/modals/edit_xblock.js
 2014-05-13 11:10:48 -04:00
Waheed Ahmed
7a96faf9a3 Merge pull request #3585 from dragonfi/master 
Fix #3347: "Run Code" reloads page in Matlab Problem
 2014-05-13 19:06:40 +05:00
Carson Gee
eadf3b59e2 Merge pull request #3464 from mitocw/cg/course_image_fixes 
Additional logic to handle more course_image URL edge cases
 2014-05-13 09:19:07 -04:00
Nick Parlante
c30665fb59 Merge pull request #3677 from edx/nick/fix-feedback-bug 
Fix targeted-feedback bug
 2014-05-12 15:23:44 -07:00
Nick Parlante
f48e470f54 Fix targeted-feedback bug 
The bug is with the case of multiple-questions with targeted
feedback within a single problem.

Refactor the targeted-feedback tests to house
the most common xml in external files.

Move the capa test load_fixture function to __init__.py so it
can be used generally.
 2014-05-12 14:26:05 -07:00
Adam
4ecf41126a Merge pull request #3626 from edx/adam/fix-import-bug 
fix importing bug (STUD-1599)
 2014-05-12 16:54:21 -04:00
dragonfi
8430be3d18 Fix #3347: "Run Code" reloads page in Matlab Problem 
Instead of refreshing only the necessary parts,
"Run Code" reloads the whole page.

This commit fixes this behaviour, by refreshing the
specific elements belonging to the Problem instead.

Also tidies up indentation.
 2014-05-12 22:26:52 +02:00
Adam Palay
a51a0c558e fix importing bug (STUD-1599) 
add target_location_namespace check
 2014-05-12 15:59:41 -04:00
Adam Palay
e5fa0c5dd9 add max-attempts to inheritance.py (LMS-2130) 2014-05-12 15:55:15 -04:00
Ned Batchelder
2f7adda00d Simple fixes 
- Ensure temp files are cleaned up.
- Refactor a function with three return statements.
 2014-05-12 15:52:57 -04:00
Anton Stupak
839887246c Merge pull request #3643 from edx/anton/fix-video-in-ff 
Anton/fix video in ff
 2014-05-12 10:24:47 +03:00
David Ormsbee
77c7ebd704 Merge pull request #2768 from carsongee/cg/ssl-next-url 
Modified ssl certificate authentication to handle next redirection
 2014-05-11 20:12:12 -04:00