Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,409 Commits 1 Branch 0 Tags
39ac2579dc7dddfd11c5c603597d4de5c40ff78a
Commit Graph

36409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Eskew
39ac2579dc Import test course instead of using XML-backed course. 2016-05-02 13:08:26 -04:00
John Eskew
2090f07344 Remove XML-backed course-specific test. 2016-05-02 13:08:26 -04:00
John Eskew
134fb9c269 Import test course instead of using XML-backed course. 2016-05-02 13:08:26 -04:00
John Eskew
4106528e1a Fix toy course textbook test - use Mongo-backed test course. 2016-05-02 13:08:26 -04:00
John Eskew
71d7f1c81b Skip test with static tabs - seems broken. 2016-05-02 13:08:25 -04:00
John Eskew
dd159bce12 Import test course instead of using XML-backed course. 2016-05-02 13:08:25 -04:00
John Eskew
775723b98a Use ToyCourseFactory instead of the XMLModuleStore-backed toy course. 2016-05-02 13:08:25 -04:00
John Eskew
14a8314adc Remove include_xml option. 2016-05-02 13:08:25 -04:00
John Eskew
0aa9f9062b Remove more XML modulestore test code. 2016-05-02 13:08:25 -04:00
John Eskew
7987b16a18 Remove XML modulestore code - discovery work 2016-05-02 13:08:25 -04:00
Douglas Hall
2d6604a00d Merge pull request #12318 from edx/hotfix/2016-05-02 
Patch Release 2016-05-02 WL Studio Course Details Fields
 2016-05-02 12:42:56 -04:00
asadiqbal
59f70cf85d WL-399 Course Details List Fields 2016-05-01 22:20:24 -04:00
Ibrahim
a13e531042 WL-398 Add Course Background Image and Video Thumbnail Image Fields to Studio 2016-05-01 20:33:40 -04:00
Ibrahim
357a9f8080 add new text fields to schedule and details settings page 2016-05-01 20:31:07 -04:00
David Ormsbee
7d7d5a160d Merge pull request #12232 from edx/rc/2016-04-26 
Release Candidate rc/2016-04-26
 2016-04-27 12:23:34 -04:00
Nimisha Asthagiri
43be14beec Merge pull request #12247 from edx/tnl/block_structure_logging 
Change BlockStructure logging from DEBUG to INFO
 2016-04-25 16:04:17 -04:00
Nimisha Asthagiri
40951bc7f5 Change BlockStructure logging from DEBUG to INFO 2016-04-25 14:30:50 -04:00
Usman Khalid
974233f573 Merge pull request #12229 from edx/usman/include-jquery-ui 
Load jquery-ui by default in LMS suite.
 2016-04-22 21:48:19 +05:00
Usman Khalid
0280b1713f Load jquery-ui by default in LMS suite. 2016-04-22 21:21:21 +05:00
Usman Khalid
51c5b981af Merge pull request #12204 from edx/fedx/krma-conf-tnl4102 
Use Karma as test runner with Jasmine 2.4.
 2016-04-22 20:28:01 +05:00
Ahsan Ulhaq
0cc0a4543f Merge pull request #12213 from edx/ahsan/ECOM-4101-Call-analytics-track-on-receipt-page 
Call analytics.track on receipt page
 2016-04-22 20:06:00 +05:00
Ehtesham
5b12f7d3dd fixing quality 2016-04-22 19:09:36 +05:00
Ehtesham
8603026795 making preprocessor files path absolute to have coverage reporter include file only once 2016-04-22 19:09:35 +05:00
Ehtesham
51bf39fc35 adding includeAllSources property in coverage settings 2016-04-22 19:09:35 +05:00
Ehtesham
3507792b78 coverage fixes 2016-04-22 19:09:35 +05:00
Usman Khalid
aee139ae61 Cancel modals in afterEach in UploadDialog spec. 2016-04-22 19:09:34 +05:00
Andy Armstrong
66b53926ff Fix spec initialization ordering 2016-04-22 19:09:34 +05:00
Usman Khalid
fefc88b084 Post-rebase fixes. 2016-04-22 19:09:34 +05:00
muzaffaryousaf
1b0cda2430 Js test fixes for lms and lms-coffee. 2016-04-22 19:09:33 +05:00
Usman Khalid
c728c9d30a Post-rebase fixes. 2016-04-22 19:09:33 +05:00
muzaffaryousaf
c0fef0b0e0 Js test fixes for cms and cms-squire. 2016-04-22 19:09:33 +05:00
Usman Khalid
d28f487235 Post rebase fixes. 2016-04-22 19:09:32 +05:00
Usman Khalid
3929bf50ce Disable video_bumper_spec.js 2016-04-22 19:09:32 +05:00
Usman Khalid
c369e0ea1b Increase Karma's browserNoActivityTimeout to prevent timeouts on Jenkins. 2016-04-22 19:09:32 +05:00
Usman Khalid
7bb96f6685 Added checks in video player methods which may get executed after the player has been destroyed. 2016-04-22 19:09:31 +05:00
muzaffaryousaf
9cbfea2edd Js test fixes for common, common-requirejs, xmodule. 2016-04-22 19:09:31 +05:00
muzaffaryousaf
375f2bfc59 Commenting out lms & cms suites to get a green build. 2016-04-22 19:09:30 +05:00
Usman Khalid
a540259bfa Remove Jasmine libs from monitoring/package.json. 2016-04-22 19:09:30 +05:00
Usman Khalid
afabc44e9e Added karma-spec-reporter. 2016-04-22 19:09:30 +05:00
muzaffaryousaf
db672f4631 Karma configurations for common, lms and cms. 
TNL-4102
 2016-04-22 19:09:27 +05:00
clrux
9f95c35872 Merge pull request #12198 from edx/clrux/ac-383 
AC-383 language menu events only when menu opens
 2016-04-22 09:51:50 -04:00
Christine Lytwynec
66e2d06235 Merge pull request #12060 from edx/clytwynec/ac-367 
Clytwynec/ac 367
 2016-04-22 09:49:26 -04:00
Ben Patterson
0c319efbae Merge pull request #12222 from edx/benp/flaky-notes-condition-ff42 
wait needed for notes pages.
 2016-04-22 08:43:51 -04:00
Usman Khalid
e128ce1681 Merge pull request #12223 from edx/usman/tnl4304-videoplayer-test 
Fix flaky videoplayer bokchoy test.
 2016-04-22 17:32:11 +05:00
Edward Zarecor
9db6b04f2c Merge pull request #11983 from edx/e0d/cookie-updates 
Updating cookies settings
 2016-04-22 07:25:09 -04:00
M. Rehan
d659dd9f6d Merge pull request #12068 from edx/mrehan/sust-40-reduce-peroblem-get-ajax 
SUST-40 – Eliminate unwanted problem_get ajax requests flooding the LMS.
 2016-04-22 14:59:22 +05:00
Ahsan Ulhaq
3bfaf6030f Call analytics.track on receipt page 
ECOM-4101
 2016-04-22 14:31:19 +05:00
Usman Khalid
acd392f040 Fix flaky videoplayer bokchoy test. 2016-04-22 13:12:09 +05:00
Qubad786
dd8ab6eede Keep track of updated problem states. 
An event is being fired on actions (Check/Save/Reset) to keep track of updated problems. On coming back to already visited sequence position, while putting sequence contents in container, only those problems that are found outdated, are going to be updated from earlier tracked problems.

[SUST-40]
 2016-04-22 11:35:21 +05:00
Ben Patterson
d94fe718a8 wait needed for notes pages. 
The page visit requires an ajax request to get the notes. Without
waiting for that to complete, additional navigation results in a
socket error.

Example failure from the stub service:
```python
Traceback (most recent call last):
  File "/usr/lib/python2.7/SocketServer.py", line 295, in _handle_request_noblock
    self.process_request(request, client_address)
  File "/usr/lib/python2.7/SocketServer.py", line 321, in process_request
    self.finish_request(request, client_address)
  File "/usr/lib/python2.7/SocketServer.py", line 334, in finish_request
    self.RequestHandlerClass(request, client_address, self)
  File "/usr/lib/python2.7/SocketServer.py", line 657, in __init__
    self.finish()
  File "/usr/lib/python2.7/SocketServer.py", line 716, in finish
    self.wfile.close()
  File "/usr/lib/python2.7/socket.py", line 283, in close
    self.flush()
  File "/usr/lib/python2.7/socket.py", line 307, in flush
    self._sock.sendall(view[write_offset:write_offset+buffer_size])
error: [Errno 32] Broken pipe
```
 2016-04-21 21:44:17 -04:00