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

8613 Commits

Author SHA1 Message Date
Tim Babych
a153092cb5 Add FEATURE['ENABLE_GROUP_CONFIGURATIONS'] and os.environ['FEATURE_GROUP_CONFIGURATIONS']. 2014-07-03 15:30:18 +03:00
polesye
d38b51cb4a BLD-1117: Add read-only list of Group Configurations. 2014-07-02 18:26:27 +03:00
Jay Zoldak
3515212196 Merge pull request #4266 from edx/revert-4050-linkedin-email 
Revert "Make LinkedIn auth provider request email by default."
 2014-07-01 14:36:50 -04:00
jsa
59e2a6ddde update NewPostViewSpec to correctly initialize NewPostView 2014-07-01 13:43:54 -04:00
Adam
653d6f21dd Merge pull request #4171 from edx/adam/fix-lms-2773 
Prevents students from accidentally changing their enrollment on login (...
 2014-07-01 10:38:50 -04:00
David Baumgold
ca7d895350 Revert "Make LinkedIn auth provider request email by default." 2014-07-01 10:05:01 -04:00
Adam Palay
536b9dbe31 in some cases we do want that redirect url 2014-06-30 17:05:48 -04:00
Adam Palay
92f53236cf fix 400s from change_enrollment causing 404s (LMS-6625) 2014-06-30 16:22:14 -04:00
Jim Abramson
5d37ea83f7 Merge pull request #4216 from edx/jsa/new-post-redesign 
consolidate new post form variants into single client-side template/view
 2014-06-30 14:39:46 -04:00
David Baumgold
b817e02602 Merge pull request #4050 from mtyaka/linkedin-email 
Make LinkedIn auth provider request email by default.
 2014-06-30 14:31:53 -04:00
Waheed Ahmed
cb3355b9e7 Merge pull request #4215 from edx/waheed/lms2892-ie-security-warning-fixed 
Fixed IE security warning on course page.
 2014-06-30 18:49:54 +05:00
Nimisha Asthagiri
91f102c778 Merge pull request #4232 from edx/nimisha/modulestore-enum-constants 
ModulestoreEnum class.
 2014-06-30 08:58:03 -04:00
Waheed Ahmed
68a0f4e45c Fixed IE security warning on course page. 
LMS-2892
 2014-06-30 13:56:08 +05:00
jsa
994ccd1110 consolidate new post form variants into single client-side template/view 2014-06-29 20:45:22 -04:00
Nimisha Asthagiri
d6049239e7 Merge pull request #4217 from louyihua/master 
Fix saving error of video editor with non-english translations
 2014-06-28 00:42:17 -04:00
Nimisha Asthagiri
4c717ee35d Merge pull request #4236 from edx/nimisha/fix_ms_merge_conflict_heartbeat 
Fix modulestore merge conflict with heartbeat.
 2014-06-27 22:26:30 -04:00
Nimisha Asthagiri
8dca8053f6 Fix branch settings. 2014-06-27 21:47:53 -04:00
Adam
13f41aea07 Merge pull request #4239 from edx/release 
Release
 2014-06-27 17:04:30 -04:00
Nimisha Asthagiri
eecff6e0aa ModulestoreEnum class. 2014-06-27 14:37:35 -04:00
Nimisha Asthagiri
8de4bcaf28 Fix modulestore merge conflict with heartbeat. 2014-06-27 13:57:33 -04:00
Oleg Marshev
39f2aabdd3 Do not look for country if no new ip. 2014-06-27 18:45:19 +03:00
Oleg Marshev
6b50517bd4 Merge pull request #4206 from edx/oleg/lti-xmlns-test 
Add test that xml body was parsed successfully.
 2014-06-27 11:28:27 +03:00
louyihua
7555c6ec0c Fix saving error of video editor in non-english translation 
Currently the code in ```tabs-aggregator.coffee``` uses the display name of a tab as the key to index the current tab. When a non-english translation is applied, the javascript code will get localized names instead of the original english names, which causes the following ```getValue``` function fails as it cannot reference the correct tab.
Use the 'data' attribute to store the original tab name.
 2014-06-27 14:08:44 +08:00
Nimisha Asthagiri
a9213509c3 Enable Mixed Modulestore STUD-1540 
Refactor get_parent_locations STUD-1663
 2014-06-26 18:00:11 -04:00
cahrens
a4b172d9d8 Display names, help text, and "deprecated" for Advanced Settings. 
STUD-302, STUD-303
 2014-06-26 16:54:22 -04:00
Ben McMorran
400731c80f Uses present in bokchoy test 2014-06-26 14:01:29 -04:00
Ben McMorran
ff0bab8e55 Increases wait_for_notification timeout to 60 seconds 2014-06-26 13:47:34 -04:00
James Tauber
bc40dce817 Merge pull request #4201 from edx/jtauber/test-PR3769 
Test PR 3769 (Improves the way LMS serves /favicon.ico)
 2014-06-26 11:18:56 -04:00
Waqas Khalid
7671005f4d Merge pull request #3770 from mlkwaqas/waqas/for578-post-selection-broken-span 
Update the discussion area broken span tags
 2014-06-26 20:03:52 +05:00
James Tauber
99cfea153c dummy theme templates for testing 2014-06-26 10:37:58 -04:00
Alexander Kryklia
35aacfb6f2 Merge pull request #4105 from edx/alex/remove_unused_code_when_downloading_from_youtube 
Remove unused code when download from youtube.
 2014-06-26 14:44:45 +03:00
Oleg Marshev
56bf0ffce0 Add test that xml body was parsed successfully. 2014-06-26 14:24:48 +03:00
Waqas Khalid
3b9afe7eeb Update the discussion area broken span tags 
FOR-578
 2014-06-26 12:55:12 +05:00
David Baumgold
0c0859f17b Merge pull request #4026 from edx/db/requests-2 
Upgrade `requests` module
 2014-06-25 19:34:05 -04:00
Christine Lytwynec
96e5139d66 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/tests/test_video.py
 2014-06-25 13:51:31 -04:00
Anton Stupak
04d27a83f9 Merge pull request #2571 from Szczork/szczork/log-video-ended 
log stop_video event
 2014-06-25 17:57:15 +03:00
Alexander Kryklia
1f5c95ba9a Remove unused code when download from youtube. 2014-06-25 16:12:16 +03:00
Alexander Kryklia
c9afa056ad Move video descriptor instantiation in tests to single place. 2014-06-25 14:41:15 +03:00
Oleg Marshev
715fde27c4 Redirect Chinese students to a Chinese CDN for video. 2014-06-24 18:39:52 +03:00
Adam Palay
6b1a7dc259 Prevents students from accidentally changing their enrollment on login (LMS-2773) 
skip tests if not run in lms
 2014-06-23 16:49:04 -04:00
Dave St.Germain
d9bb5365dd Merge pull request #3982 from edx/dcs/move-i18ntools 
Moved i18n tools to i18n-tools repo
 2014-06-23 16:35:50 -04:00
Piotr Mitros
4eb234e79f Merge pull request #4174 from edx/pmitros/chromeless-xblocks 
XBlocks can disable navigation chrome.

This allows for full-screen XBlocks (such as code IDEs), as well as allowing us to somewhat hackishly build top-level XBlocks. This is the first step on the path to non-hackish top-level XBlocks.
 2014-06-23 11:56:05 -04:00
Adam
2b1712afe1 Merge pull request #4170 from lduarte1991/lduarte-harvardx-pr6 
Annotation Tools: Removed background-color from image annotations
 2014-06-23 10:24:53 -04:00
Dave St.Germain
834c2c472f Moved test_generate from i18n-tools 2014-06-23 10:06:28 -04:00
lduarte1991
cd9c6c5f3e Annotations Tools: Commented OSDA code and added clarification to catch changes 2014-06-21 16:25:53 -04:00
Andy Armstrong
20675857dc Merge pull request #3999 from edx/christina/updating-split-test 
Ability to change the associated group configuration for a split test
 2014-06-20 14:15:41 -04:00
Andy Armstrong
4b4736cc77 Disable periodically failing Bok Choy test 2014-06-20 14:15:18 -04:00
muhammad-ammar
46541eb8a5 Merge pull request #4112 from edx/ammar/youtube-video-quality-tests 
Youtube Video Quality Button Tests
 2014-06-20 22:42:58 +05:00
Don Mitchell
7e2bdeb367 Merge pull request #4155 from edx/dhm/stud-1654 
Ensure all split methods consuming Keys check that key is fully specified
 2014-06-20 13:33:15 -04:00
cahrens
a395c2fa4b Complete Studio support for handling group configuration changes 
STUD-1658
 2014-06-20 11:41:23 -04:00