Commit Graph

3029 Commits

Author SHA1 Message Date
Andy Armstrong
561c57dbe9 Extend preview to support cohorted courseware
TNL-651
2015-01-15 10:33:44 -05:00
polesye
c7153be040 TNL-213: Let Students Add Personal Notes to Course Content.
Co-Authored-By: Jean-Michel Claus <jmc@edx.org>
Co-Authored-By: Brian Talbot <btalbot@edx.org>
Co-Authored-By: Tim Babych <tim@edx.org>
Co-Authored-By: Oleg Marshev <oleg@edx.org>
Co-Authored-By: Chris Rodriguez <crodriguez@edx.org>
2015-01-14 23:34:11 +02:00
Braden MacDonald
6be35e0fc1 Merge pull request #6459 from edx/content-libraries
Content libraries MVP
2015-01-13 11:20:20 -08:00
Adam
2b9b531c16 Merge pull request #6597 from edx/release
Release
2015-01-13 13:46:34 -05:00
Braden MacDonald
bce8ee692f Fix bug when deleting first of two recently added blocks 2015-01-13 10:11:59 -08:00
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
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
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
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
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
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
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
55fb45fb24 Acceptance test 2015-01-12 13:41:02 +03:00
Braden MacDonald
2be036fe0e Simplifications and changes to reduce conflicts with PR 6399 2015-01-12 13:41:01 +03:00
E. Kolpakov
07241aa1de Addressed review notes:
* Added tests for `problem_types` CapaDescriptor property
* Improved indentation in tests
* Improved validation messages
2015-01-12 13:41:01 +03:00
E. Kolpakov
f2f363c8f0 Added reference to TNL ticket mentioned in TODO + improved formatting of XML templates in tests 2015-01-12 13:41:01 +03:00
Jonathan Piacenti
332d2b0368 Addressed notes from reviewers about Library content filters. 2015-01-12 13:41:01 +03:00
E. Kolpakov
b2a17b35b0 Validation warning if library content XBlock configured to fetch more problems
than libraries and filtering allow
2015-01-12 13:41:00 +03:00
E. Kolpakov
620ba8a164 Test for warning message when no content is configured. 2015-01-12 13:41:00 +03:00
E. Kolpakov
ea428273e6 Switched to filtering by response type rather than input type 2015-01-12 13:41:00 +03:00
E. Kolpakov
66874aca34 Fixed typo + combined problem type tests into single test 2015-01-12 13:41:00 +03:00
E. Kolpakov
2b45e10f34 Bok choy acceptance tests 2015-01-12 13:40:59 +03:00
Braden MacDonald
4d454e3078 Documentation updates from catong 2015-01-12 13:40:59 +03:00
Braden MacDonald
7303966c13 Check permissions when updating LibraryContent blocks 2015-01-12 13:40:59 +03:00
Braden MacDonald
d38e69c69a Acceptance & Jasmine tests for library permissions editor 2015-01-12 13:37:59 +03:00
Braden MacDonald
5f5b41d03f Remove state summary from the unit author page until SOL-192 2015-01-12 13:37:58 +03:00
Braden MacDonald
76b6d33b80 Refresh children automatically when library setting is changed 2015-01-12 13:37:57 +03:00
Braden MacDonald
e498872ab1 Move update link to the validation area 2015-01-12 13:37:57 +03:00
E. Kolpakov
d25673ec72 LibraryContent bok choy acceptance tests 2015-01-12 13:37:56 +03:00
Jonathan Piacenti
074e4cfa22 Addressed further review notes for Library Pagination 2015-01-12 13:37:56 +03:00
Jonathan Piacenti
ed3b972078 Added tests for Library pagination. 2015-01-12 13:37:55 +03:00
Jonathan Piacenti
058176144e Removed the ability to add Discussion and advanced components to Content Libraries. 2015-01-12 13:37:55 +03:00
Braden MacDonald
3e0f08ebc2 Studio support for creating and editing libraries (PR 6046)
SOL-1, SOL-2, SOL-3
2015-01-12 13:37:50 +03:00
Jesse Zoldak
ff4f0787ec Merge pull request #6522 from edx/zoldak/video-troubleshooting
Add debug logging to video tests
2015-01-09 16:21:07 -05:00
Jesse Zoldak
586d798069 Fix flakiness on annotation selenium test 2015-01-09 13:53:00 -05:00
Sarina Canelake
76660e3ace Merge pull request #6484 from edx/sarina/move-branded-lms-assets
Remove edX branding from default Open edX LMS [OPEN-307]
2015-01-09 11:59:39 -05:00
David Baumgold
d25a28375e Remove i18n
Since this is a test file
2015-01-09 11:04:08 -05:00
Sarina Canelake
6f5134f711 Move edx branding into edx-theme directory
OPEN-307
2015-01-09 10:48:20 -05:00
David Baumgold
b297b839da Improve i18n for static_templates 2015-01-09 09:42:34 -05:00
Jesse Zoldak
e77acdf401 Add debug logging to video tests 2015-01-09 09:39:02 -05:00
Waqas Khalid
82eed83f64 In inline discussion two discussion module override actions
In inline discussion if we have two discussion module the
new post button open form for both discussions as well as
cancel button of one discussion call the cancel of other.
Click and button actions are now being handled inside view
of each module so that they don't disturb eachother.

TNL-776
2015-01-09 17:10:10 +05:00
Waqas Khalid
1b7d5f347d Test pagination reposition test is failing
Test pagination reposition test is failing on release
and master. It was flaky test and this problem was
caused by the javascript animation. Issue was fixed by
adding the promise that we check the value of window
top after the animation is completed.
2015-01-07 11:23:59 -05:00
Waqas Khalid
ed812f1ca8 Merge pull request #6476 from mlkwaqas/waqas/fix-discussion-flaky-test
Test pagination reposition test is failing
2015-01-07 19:53:42 +05:00