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

24154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben McMorran
f670ff74e4 Uses ModuleStoreEnum in is_xblock_visible_to_students 2014-06-30 15:34:39 -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
ded1a752a8 Merge pull request #4210 from bdero/bdero/fix-sysadmin-dashboard-gitlog-timezone 
Make sysadmin dashboard gitlog date timezone-aware
 2014-06-30 14:33:01 -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
Ben McMorran
09908bde4c Merge pull request #4229 from edx/studio/uses-mixed-modulestore-xblock-visibility 
Adds is_xblock_visible_to_students
 2014-06-30 12:00:52 -04:00
Will Daly
46469209b4 Merge pull request #4252 from edx/will/ora2-release-2014-06-30T13.39 
ORA2 release-2014-06-30T13.39
 2014-06-30 10:42:08 -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
Will Daly
f40834fa2f ORA2 release-2014-06-30T13.39; update EASE to bump the NLTK version to 2.0.4 2014-06-30 09:41:55 -04: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
Alison Hodges
fae12ac0b2 Merge pull request #4243 from edx/ahodges/documentation/DOC657 
Updated for PR 4106, BLD-1134
 2014-06-27 16:45:56 -04:00
Alison Hodges
b4d2927409 Updated for PR 4106, BLD-1134 2014-06-27 16:45:24 -04:00
Alison Hodges
5d27d77ef1 Merge pull request #4242 from edx/ahodges/documentation/DOC367 
PR 2571, log stop_video event
 2014-06-27 16:34:47 -04:00
Alison Hodges
444973911b PR 2571, log stop_video event 2014-06-27 16:34:21 -04:00
Ben McMorran
397bdb4348 Adds is_xblock_visible_to_students 2014-06-27 14:52:14 -04:00
Adam
7b4e806e4a Merge pull request #4233 from edx/alex/geoip-none-ip-fix 
Do not look for country if no new ip.
 2014-06-27 14:41:10 -04:00
Nimisha Asthagiri
eecff6e0aa ModulestoreEnum class. 2014-06-27 14:37:35 -04:00
Alison Hodges
2dc50ab4e9 Merge pull request #4235 from edx/ahodges/documentation/DOC639 
Corrected event name in description
 2014-06-27 14:34:01 -04:00
Alison Hodges
f9a84dcaf5 Corrected event name in description 2014-06-27 14:33:39 -04:00
Nimisha Asthagiri
8de4bcaf28 Fix modulestore merge conflict with heartbeat. 2014-06-27 13:57:33 -04:00
Brandon DeRosier
36873ffc92 Datetime localized on gitlog page of sysadmin dashboard 2014-06-27 12:27:50 -04:00
Brandon DeRosier
6869d594b7 Added Brandon DeRosier to authors 2014-06-27 12:27:49 -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
b5d1ec089a Merge pull request #3915 from edx/studio/uses-mixed-modulestore 
Enable mixed modulestore
 2014-06-26 18:52:58 -04:00
Nimisha Asthagiri
a9213509c3 Enable Mixed Modulestore STUD-1540 
Refactor get_parent_locations STUD-1663
 2014-06-26 18:00:11 -04:00
Christina Roberts
580de5528a Merge pull request #4073 from edx/christina/advanced-settings-hack 
Display names, help text, and "deprecated" for Advanced Settings.
 2014-06-26 17:55:35 -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
3c83808108 Merge pull request #4223 from edx/benmcmorran/increase-notification-timeout 
Increases wait_for_notification timeout to 60 seconds
 2014-06-26 16:03:58 -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
clytwynec
1ce460be67 Merge pull request #4219 from edx/clytwynec/diff-cover-update 
updating diff-cover to 0.5.0
 2014-06-26 13:41:26 -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
238b4a5df1 tests for PR 3769 
Two out of three fail without PR 3769 but all pass with PR 3769.
 2014-06-26 10:37:58 -04:00
James Tauber
99cfea153c dummy theme templates for testing 2014-06-26 10:37:58 -04:00
Christine Lytwynec
3bd404c92f updating diff-cover to 0.5.0 2014-06-26 09:55:46 -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
Will Daly
4c5c00da88 Merge pull request #4187 from edx/will/update-ease-for-optimization 
Update EASE to include an optimization
 2014-06-25 16:29:12 -04:00
Alison Hodges
9af8147e52 Merge pull request #4194 from edx/ahodges/documentation/relnotes20140624 
edited and reviewed release notes
 2014-06-25 13:53:16 -04:00
Alison Hodges
52b2039747 edited and reviewed release notes 2014-06-25 13:52:29 -04:00