Ben McMorran
397bdb4348
Adds is_xblock_visible_to_students
2014-06-27 14:52:14 -04:00
louyihua
5aaae2ebc4
Change 'Course Name' to 'Course Run' in settings.html
...
The code behind uses course run to fill this field, so maybe the filed's name should be changed as well?
2014-06-28 02:50:09 +08: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
Alison Hodges
ae5c897ef6
Completed edits for Sylvia's review. Added data czar to glossary
2014-06-27 14:29:46 -04:00
Nimisha Asthagiri
8de4bcaf28
Fix modulestore merge conflict with heartbeat.
2014-06-27 13:57:33 -04:00
Christine Lytwynec
d6ebf59dbe
add lms_base and cms_base values to bokchoy envs
2014-06-27 13:52:00 -04:00
Adam Palay
b584c1a848
skip failing test
2014-06-27 13:24:23 -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
Alison Hodges
d2deecc429
some of Sylvia's edits
2014-06-26 16:50:32 -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
Alison Hodges
762a41bfc6
Additional flowchart
2014-06-26 14:07:52 -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
Alison Hodges
da6932364b
Review draft, one more flowchart to come
2014-06-26 13:17: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
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
Christine Lytwynec
96e5139d66
Merge branch 'release'
...
Conflicts:
common/lib/xmodule/xmodule/tests/test_video.py
2014-06-25 13:51:31 -04:00
clytwynec
03cec2e081
Merge pull request #4167 from edx/clytwynec/rake2paver-acceptance
...
Clytwynec/rake2paver acceptance
2014-06-25 13:33:10 -04:00
clytwynec
08caf81dce
Update testing.md
2014-06-25 11:46:33 -04:00
Will Daly
ff996f2c0c
Update EASE to include an optimization
2014-06-25 11:02:46 -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
Christine Lytwynec
af9ae6753b
Deprecating acceptance_tests from rake to paver
2014-06-25 10:30:19 -04:00
Alexander Kryklia
1f5c95ba9a
Remove unused code when download from youtube.
2014-06-25 16:12:16 +03:00
Alexander Kryklia
0801128477
Merge pull request #4086 from edx/alex/refactor_video_test_2
...
Move video descriptor instantiation in tests to single place.
2014-06-25 15:52:30 +03:00
Alexander Kryklia
c9afa056ad
Move video descriptor instantiation in tests to single place.
2014-06-25 14:41:15 +03:00
Alison Hodges
5f862e1c2a
Initial draft moving key creation out of wiki
2014-06-24 17:24:10 -04:00
James Tauber
54399533b7
Merge pull request #3769 from shindere/favicon-fixup
...
Improves the way LMS serves /favicon.ico
2014-06-24 16:30:11 -04:00
clytwynec
0c202cb17c
Merge pull request #4196 from edx/oleg/video-caching
...
Redirect Chinese students to a Chinese CDN for video.
2014-06-24 15:07:46 -04:00
