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

6968 Commits

Author SHA1 Message Date
Alison Hodges
5acc13269a Merge pull request #7133 from edx/ahodges/hackathon 
Alison's Hackathon9 changes
 2015-03-02 09:38:30 -05:00
Alison Hodges
4666caa63d Fixes DOC-1472, DOC-1713, DOC-1613, DOC-1714, DOC-1715 2015-02-27 16:22:01 -05:00
John Eskew
80b5f38239 Upon import, only raise when none of multiple parents are found for a 
block.
 2015-02-27 18:01:09 +05:00
Ned Batchelder
dd436ed8f9 Fix sentences jammed together. 2015-02-25 12:22:32 -05:00
Martyn James
8acdf532fc Merge pull request #7066 from edx/dcikatic/SOL-259 
SOL-259 Change HTML content listed type in index from HTML Content to Te...
 2015-02-24 16:06:48 -05:00
John Eskew
4e7ed93b3e Rollback eager definition loading. 
Pass 'lazy' parameter down properly into low-level definition caching.
Adjust mongo call numbers in tests and add missing bulk_op wrapper.
Avoids the loading of all definitions in a large course when only
specific, filtered definitions are needed to be loaded for an endpoint.
 2015-02-23 10:33:43 -05:00
Dino Cikatic
a643397275 SOL-259 Change HTML content listed type in index from HTML Content to Text 2015-02-23 13:30:14 +01:00
Sarina Canelake
6900bd27fe Merge pull request #7013 from stvstnfrd/pylint/low 
Fix Pylint violations (easy)
 2015-02-20 16:36:52 -05:00
Jesse Zoldak
cc71f63b5d Skip intermittently failing test test_course_publish_signal_firing PLAT-449 2015-02-20 13:15:15 -05:00
Anton Stupak
694d6761b7 Merge pull request #7031 from edx/anton/video-fix-flaky-js-tests 
[TNL-439]: Fix flaky jasmine tests.
 2015-02-20 19:08:46 +02:00
polesye
f9738b9259 TNL-439: Fix flaky jasmine tests. 2015-02-20 18:20:51 +02:00
Mark Sadecki
bf7f7e1425 Merge pull request #6968 from edx/cptvitamin/TNL-891-alt-on-spinner 
adds and alt attribute to the loading/spinner graphic
 2015-02-20 09:42:31 -05:00
muzaffaryousaf
a31e38416d Adds content group "Delete" and "Usage" functionality to group configurations page on cms. 
TNL-1185
 2015-02-20 14:56:22 +05:00
stv
237f2c329f Add TODO comment about future test improvements 2015-02-19 19:56:52 -08:00
stv
e7b5ada5d1 Remove useless test 
Per @sarina:
> `build_problem` is called in `_make_problem`, which other tests call
> in this class. A failure here will arise in other tests. This test is
> unnecessary.
 2015-02-19 19:56:52 -08:00
stv
d21fdaac27 Fix Pylint: E0101(return-in-init) 2015-02-19 19:56:52 -08:00
stv
3ffa967af8 Fix Pylint: W0105(pointless-string-statement) 2015-02-19 19:56:52 -08:00
stv
c0a7bf94f4 Fix Pylint: W1503(redundant-unittest-assert) 2015-02-19 19:56:52 -08:00
stv
c6ef359785 Fix Pylint: E1102(not-callable) 2015-02-19 19:56:52 -08:00
stv
e17504d7b8 Fix Pylint: E0012(bad-option-value) 2015-02-19 19:56:51 -08:00
stv
ee2404c0d2 Fix Pylint: E0110(abstract-class-instantiated) 2015-02-19 19:56:51 -08:00
stv
2e1400f842 Fix Pylint: W0613(unused-argument) 2015-02-19 19:56:51 -08:00
stv
416f7090b1 Fix Pylint: C0112(empty-docstring) 2015-02-19 19:56:51 -08:00
stv
75aaf0d4a7 Fix Pylint: C0326(bad-whitespace) 2015-02-19 19:56:51 -08:00
Waheed Ahmed
8f5dd63e9f Fixed save matlab problem response message. 
TNL-1459
 2015-02-19 15:17:28 +05:00
Mark Sadecki
8b79d94064 adds and alt attribute to the loading/spinner graphic 2015-02-18 14:05:11 -05:00
Waheed Ahmed
0086893ddd Fixed option was not remain selected after submitting. 
TNL-1419
 2015-02-18 18:50:32 +05:00
Sarina Canelake
73c309935b Merge pull request #6679 from open-craft/problem-tooltips 
Support for inline explanatory popups in problem XML
 2015-02-18 08:37:03 -05:00
Shrhawk
24a63dadf9 Merge pull request #6694 from edx/shr/bug/TNL-1202-HD-button-not-working-properly 
Hd button on for default high resolutions
 2015-02-18 14:11:27 +05:00
Syed Hassan Raza
44468f840e Hd button on for default high resolutions 
TNL-1202
 2015-02-18 12:49:27 +05:00
David Baumgold
e5c650d394 Merge pull request #7006 from stvstnfrd/dead 
Remove dead code paths
 2015-02-17 16:44:17 -05:00
Clinton Blackburn
2854bb9524 Added Course Structure API 2015-02-17 13:23:34 -05:00
Waqas Khalid
d6efd1285c Merge pull request #6996 from edx/waqas/tnl1390-missing-discussion-blackout 
Missing discussion blackout throwing exception
 2015-02-17 20:23:40 +05:00
muzaffaryousaf
f0cfc93a5a Adding the support for '$exists' into the get_items for split mongo. 
TNL-1451
 2015-02-17 17:13:51 +05:00
stv
01bd96512a Remove shadowed class declaration 
It looks like one version of the class was first added [1] and then a
few days later, another was written [2]. The newer declaration appeared
lower in the file, allowing it to hide the other.

This removes the first, hidden declaration.

[1] commit 7aa493ec85
    Date:   Fri Mar 1 10:36:20 2013 -0500
[2] commit f62dad2f57
    Date:   Tue Mar 5 16:31:02 2013 -0500
 2015-02-16 22:55:22 -08:00
Waqas Khalid
a730f81132 Missing discussion blackout throwing exception 
When the list is empty in discussion blackout
on studio side it causes the exception on lms
side when we try to access the discussion. We
were expecting the values and try to parse it
in two values start and end date whereas parsing
empty values to two values causing the exception.
Now values will be parse when value exists. Empty
value will be ignored.

TNL-1390
 2015-02-16 19:43:03 +05:00
Piotr Mitros
7aea582ab0 Merge pull request #6973 from edx/pmitros/add-video-events 
Adds events to video player for CC menu
 2015-02-14 22:22:11 -05:00
John Eskew
e15435ebef Skip import/export mongo call count test - off by one call sometimes. 2015-02-13 16:48:48 -05:00
Clinton Blackburn
052fa8eafc Merge pull request #6935 from edx/clintonb/course-structure 
Generating Course Structure Asynchronously on Course Publish
 2015-02-13 13:37:05 -05:00
John Eskew
d0c9daa4f8 Merge pull request #6920 from edx/jeskew/eager_loading_xblocks_to_depth 
Improve performance of import/export and course traversal with Split modulestore.
 2015-02-13 12:37:25 -05:00
Clinton Blackburn
92ca64fa2a Finishing async course structure work 
- Added tests
- Updated model field specification
- Fixed issue of multiple event emission
- Updated admin page
- Added management command to manually generate course structures
 2015-02-13 12:21:51 -05:00
Martyn James
3a28c5709c Merge pull request #6896 from edx/mjevtic/fixing-video-module-tests-for-search 
Fixed a test_video issue regarding settings
 2015-02-13 12:14:34 -05:00
Piotr Mitros
dc227cb525 Added events for showing and hiding cc menu in videos with translations 2015-02-13 10:30:57 -05:00
Chris Rodriguez
0326c1917a Adding markup for icon fonts; adding custom styles for said icons 2015-02-12 18:50:47 -05:00
John Eskew
2a4a89a9b6 Add course traversal mongo call count for old Mongo. 2015-02-12 15:45:13 -05:00
John Eskew
28e1ecc5c4 Change test filename again. 2015-02-12 13:36:10 -05:00
John Eskew
c3d2962b48 Refactor contentstore/modulestore builders to wrap both in a single 
contextmananger. Add ddt to mongo call count testing.
 2015-02-12 13:34:07 -05:00
marjev
f444d9b5e7 Updated unit tests for video module 2015-02-12 10:51:32 +01:00
David Ormsbee
ba5cbb64d5 Add course publish signal to old Mongo modulestore. 2015-02-11 16:13:10 -05:00
David Ormsbee
574319fa35 Minor update to SignalHandler to better document how it should be used. 2015-02-11 16:13:10 -05:00