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

23271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alison Hodges
4e38b10af9 Merge pull request #3818 from edx/ahodges/documentation/DOC368 
Ahodges/documentation/doc368
 2014-05-22 10:23:06 -04:00
Alison Hodges
5ce9b418b6 Reorganized, updated, & streamlined sections in Running Your Course 2014-05-22 10:22:35 -04:00
zubair-arbi
72d9a91f1d Merge pull request #3766 from edx/zub/bugfix/std1616-editdraft 
create draft request gets already created version if it exists
 2014-05-22 18:18:56 +05:00
Waheed Ahmed
a7184c03cf Merge pull request #3774 from edx/waheed/lms2719-fix-register-on-edge 
Fixed register button on edge homepage.
 2014-05-22 12:49:33 +05:00
Waheed Ahmed
b6a90e0bfa Fixed register button on edge homepage. 
LMS-2719
 2014-05-22 12:09:23 +05:00
clytwynec
18ee082cc3 Merge pull request #3708 from edx/clytwynec/rake2paver-quality 
Switch quality tasks to paver
 2014-05-21 17:10:03 -04:00
srpearce
fb300029b9 Merge pull request #3765 from edx/sylvia/docs/TIM-243 
Sylvia/docs/tim 243
 2014-05-21 16:17:20 -04:00
Christina Roberts
eb362fba67 Merge pull request #3579 from edx/andya/container-add-buttons 
Allow creation of components on container page
 2014-05-21 16:15:14 -04:00
Sylvia Pearce
d8d7c2fd2f Deprecate old ORA; add links to new ORA permanent docs 2014-05-21 16:13:11 -04:00
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
Adam
2124571c0f Merge pull request #3803 from edx/release 
Release
 2014-05-21 12:52:18 -04:00
Han Su Kim
c8ce4a54d6 Merge pull request #3621 from edx/han/cert-report 
Added totals for different student tracks
 2014-05-21 12:08:00 -04:00
jmclaus
cc7987e515 Merge pull request #3489 from edx/jmclaus/bugfix_numerical_response_tolerance 
Tolerance expressed in percentage now computes correctly. [BLD-522]
 2014-05-21 17:47:45 +02:00
jmclaus
db239c69fe Tolerance expressed in percentage now computes correctly. [BLD-522] 2014-05-21 17:14:12 +02: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
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
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
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
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
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