Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,515 Commits 1 Branch 0 Tags
209ddc700dfce5bb0aa151c19dafbac8ae7de2d2
Commit Graph

12848 Commits

Author SHA1 Message Date
Waqas Khalid
70b38fc3a3 Merge pull request #6034 from mlkwaqas/waqas/tnl776-multiple-inline-discussion-problem 
In inline discussion two discussion module override actions
 2015-01-13 19:59:23 +05:00
John Eskew
6873c04599 First iteration of code which tests performance of asset metadata 
during course import/export. Uses external code_block_timer module.
   Also, add script which validates XML file against an XSD file.
   Uses the unittest framework - but is currently skipped.
 2015-01-13 08:47:24 -05:00
Shrhawk
c3f789021a Merge pull request #6285 from Shrhawk/shr/bug/TNL-904-tolerance-is-broken 
Fix tolerance broken
 2015-01-13 17:08:52 +05:00
Syed Hassan Raza
66b949b745 Fix tolerance broken 2015-01-13 16:01:46 +05:00
Waqas Khalid
fd0d475b0f Merge pull request #6361 from mlkwaqas/waqas/tnl720-unable-to-report-mark-answer 
Unable to report/vote/endorse after editing response
 2015-01-13 15:45:44 +05:00
Waqas Khalid
2a67632b7b Unable to report/vote/endorse after editing response 
When user update the response after editing he would
be unablt to report/vote/endorse the response. This
problem was caused due to double binding of event in
backbone view.

TNL-720
 2015-01-13 13:47:02 +05:00
Waheed Ahmed
47fbda9dd9 Merge pull request #6370 from edx/waheed/tnl920-fix-code-mirror-xml-editor-height 
Fixed CodeMirror editor view height in studio.
 2015-01-13 13:31:55 +05:00
Aamir
05575ecce4 Merge pull request #6548 from edx/aamir-khan/ECOM-335-caching 
ECOM-335 Created new branch from master and put all changes from aamir-k...
 2015-01-13 12:11:37 +05:00
Waheed Ahmed
05d9d139b5 Fixed CodeMirror editor view height in studio. 
TNL-920
 2015-01-13 12:11:20 +05:00
Christopher Lee
0625b84d12 Merge pull request #6557 from edx/clee-MA-187-value-error 
Clee ma 187 value error
 2015-01-12 16:18:20 -05:00
Clinton Blackburn
64bc0649ce Merge pull request #6566 from edx/clintonb/remove-unicode-file 
Removed Unicode Test Artifact
 2015-01-12 15:42:21 -05:00
Don Mitchell
ed3f609757 Change split to handle dags and fix 
children references on copy and delete w/ more than one parent
 2015-01-12 15:11:45 -05:00
Clinton Blackburn
9e973c75d0 Removed Unicode Test Artifact 
This file should not have been committed by #6447. It is causing issues for Mac OS X users, preventing checkouts and rebases.
 2015-01-12 14:24:38 -05:00
christopher lee
3e5f7bacdd MA-187 ValueError fix 
Fix for MA-187 where a value error was thrown when
a course has a video directly under a section. This
PR handles the situations where a chapter or section
can be none, and then returns the appropriate url
if available.
 2015-01-12 14:15:18 -05:00
Braden MacDonald
05fc6738f6 Add in "previous_count" and "max_count" 2015-01-12 11:14:35 -08:00
Braden MacDonald
10fe9c0180 pylint fixes 2015-01-12 11:00:51 -08:00
Adam Palay
7e45858276 resolve merge conflicts between release and master 2015-01-12 13:47:30 -05:00
Braden MacDonald
3a973d4274 Unit tests for library content analytics 2015-01-12 10:39:12 -08:00
Braden MacDonald
3973317aa9 Report the original LibraryUsageLocator in LMS analytics 2015-01-12 10:39:12 -08:00
Braden MacDonald
407265bc45 Store the usage locator of library blocks in split when they are inherited into a course 2015-01-12 10:39:12 -08:00
Braden MacDonald
91cb371de0 Emit per-student library content events to the tracking log for analytics 2015-01-12 10:39:12 -08:00
Braden MacDonald
e4ea28f7f6 Minor pylint fixes 2015-01-12 10:39:12 -08:00
E. Kolpakov
195d5b57bc pylint fixes 2015-01-12 09:58:51 -08:00
Mark Hoeber
75a26a7e7d Merge pull request #6447 from edx/markhoeber-doc1437 
Enrollment API Doc
 2015-01-12 12:11:32 -05:00
Mark Hoeber
a28fd30b09 Enrollment API Doc 2015-01-12 11:15:32 -05:00
Awais
beeaec5a55 ECOM-335 Created new branch from master and put all changes from aamir-khan/ECOM-335-caching-api into this branch. 2015-01-12 20:58:48 +05:00
Jesse Zoldak
a8adce13fb Merge pull request #6530 from edx/zoldak/fix-annotation-test 
Fix flakiness on annotation selenium test
 2015-01-12 10:58:04 -05:00
Aamir
ab06f37cfb Merge pull request #6521 from edx/aamir-khan/ECOM-528-donation-verified-courses 
Aamir khan/ecom 528 donation verified courses
 2015-01-12 20:46:11 +05:00
Don Mitchell
2bf3966716 Add a fix_not_found command to get rid 
of dangling children references to blocks.
TNL-1141
 2015-01-12 10:42:52 -05:00
arbisoft
62ea486570 ECOM-528 updated the test cases 2015-01-12 15:55:06 +05:00
Braden MacDonald
134a75b367 Minor tweaks to reduce conflicts with PR 6492 2015-01-12 13:42:56 +03:00
E. Kolpakov
6a2af3ebdc pylint fixes 2015-01-12 13:42:55 +03:00
E. Kolpakov
1a387d8217 Test for paging in items.py 2015-01-12 13:42:55 +03:00
E. Kolpakov
f51329039a Tests for LibraryList 2015-01-12 13:42:55 +03:00
E. Kolpakov
84edced10a Render tests for library content block preview and author views 2015-01-12 13:42:55 +03:00
E. Kolpakov
184fd01ae9 Created dedicated LibraryRoot test file and moved rendering tests from modulestore/tests/test_libraries 2015-01-12 13:42:55 +03:00
E. Kolpakov
23baab6b01 Added test to exercise library root paged rendering 2015-01-12 13:42:54 +03:00
Jonathan Piacenti
5342fa27b9 Quality fixes. 2015-01-12 13:42:54 +03:00
Matjaz Gregoric
a0c590e50c Mark Library 'mode' field non-editable. 
The only supported mode is currently 'random', so it doesn't make sense
to expose the 'mode' in the edit form.
 2015-01-12 13:42:53 +03:00
Jonathan Piacenti
198d099a82 Added 'Display Name' to Library content module. 2015-01-12 13:41:47 +03:00
Matjaz Gregoric
ccc392893e Update tests. 
Most of the updates are related to the My Courses -> Studio Home change.
 2015-01-12 13:41:45 +03:00
Jonathan Piacenti
eabd6c8d27 Quality check and test fixes. 2015-01-12 13:41:03 +03:00
Jonathan Piacenti
fc4eed4240 Added test for /home/ redirect. 2015-01-12 13:41:03 +03:00
Braden MacDonald
4d8251066c Fix bug w/ publishing ( + test), move copy_from_template tests to their own file 2015-01-12 13:41:02 +03:00
Braden MacDonald
55fb45fb24 Acceptance test 2015-01-12 13:41:02 +03:00
Braden MacDonald
ea579bf54b Workaround an issue with capa modules 2015-01-12 13:41:02 +03:00
Braden MacDonald
e768fb9a4b Fix two split mongo bugs that were causing problems... 2015-01-12 13:41:02 +03:00
Braden MacDonald
325c36069a Unrelated: fix two bugs when duplicating a LibraryContentModule 2015-01-12 13:41:02 +03:00
Braden MacDonald
3857a1c1ee Support for overriding Scope.settings values when library content is used in a course 2015-01-12 13:41:02 +03:00
E. Kolpakov
21b02544c0 Added tests for editor_saved library content xblock method 
Retriggering Jenkins
 2015-01-12 13:41:01 +03:00