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

36374 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ben Patterson
76d3f5d8cb Merge pull request #12196 from edx/muddasser/updated_ff/sel_253/test_edit_raw_html 
Use type_in_codemirror instead of ActionChain to set content.
 2016-04-21 20:17:47 -04:00
Giovanni Di Milia
090cefcf44 Added REST API for certificates in LMS (#12055) 2016-04-21 17:15:06 -04:00
Renzo Lucioni
0d27b5ed87 Merge pull request #12215 from edx/renzo/program-factory 
Retrofit programs data mixin with factories
 2016-04-21 15:59:21 -04:00
Renzo Lucioni
1ffa81f746 Retrofit programs data mixin with factories 
This should make it easier to test programs-related features. Preface to ECOM-3200.
 2016-04-21 15:03:38 -04:00
Christine Lytwynec
6e93cee2da add --skip-fetch flag, update start_urls, update auto_auth to include redirect_to param 2016-04-21 14:21:16 -04:00
Andy Armstrong
f8f5e70346 Merge pull request #12217 from edx/revert-12074-derf/clear_existing_assets_before_copying_new_assets 
Revert "clear existing assets before copying new assets"
 2016-04-21 12:36:17 -04:00
Clinton Blackburn
8f82192abf Merge pull request #12162 from edx/clintonb/jwt-updates 
JWT authentication updates
 2016-04-21 12:24:16 -04:00
Muddasser
5aaa045919 Use type_in_codemirror instead of actionchain to set contents in editor 2016-04-21 20:48:36 +05:00
Kevin Falcone
f9637ec135 Revert "clear existing assets before copying new assets" 2016-04-21 11:38:30 -04:00
Diana Huang
67c055e23f Merge pull request #12206 from CredoReference/impossible-to-click-check-without-answer 
Make it impossible to click "final check" without selecting a choice
 2016-04-21 11:00:44 -04:00
attiyaIshaque
fb83cd71f1 Merge pull request #12051 from edx/attiya/safe-templates 
Safe Templates
 2016-04-21 19:06:53 +05:00
Robert Raposa
74346430ba Merge pull request #12176 from edx/robrap/linter-javascript 
TNL-4325: Linter Enhancements for JavaScript files
 2016-04-21 09:25:49 -04:00
Ned Batchelder
c669daa917 Merge pull request #12211 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-04-21 09:11:07 -04:00
attiyaishaque
002ad84d4d Safe Templates 2016-04-21 17:55:29 +05:00
Mushtaq Ali
2291e2139f Merge pull request #12209 from edx/mushtaq/ora2_release 
ORA2 Version 1.1.4 Release
 2016-04-21 17:50:32 +05:00
Ned Batchelder
2248bc6c9c Update translations (autogenerated message) 2016-04-21 10:30:10 +00:00
Awais Qureshi
a3fcc93374 Merge pull request #12192 from edx/revert-12191-revert-12106-awais786/ECOM-3199-xseries-certs-view 
Revert "Revert "Adding background image for xseries certificates on dashboard side bar panel""
 2016-04-21 11:56:49 +05:00
Mushtaq Ali
8e93c69e6d edx-ora2 release version 1.1.4 update 2016-04-21 11:29:58 +05:00
Robert Raposa
d1bda204e4 Enhance Mako linting 
- Lint JavaScript context for JavaScript violations
- Lint for Mako specific JavaScript rules
- Skip commented lines
- Change unicode to decode.utf8
- Count lint violations
 2016-04-21 01:23:50 -04:00
Dmitry Viskov
61127b613b Make it impossible to click "final check" without selecting a choice 2016-04-21 00:15:20 +03:00
Robert Raposa
11982461aa Add JavaScript linting rules 
- check proper use of JQuery functions
- check for concatenation with HTML strings
- add sort for output
- lint CoffeeScript
 2016-04-20 16:29:55 -04:00
Clinton Blackburn
5a7bc01986 JWT authentication updates 
- Using jwt_decode_handler from edx-drf-extensions
- Updated djangorestframework-jwt
- Removed feature flag around JWT auth

ECOM-4221
 2016-04-20 16:25:25 -04:00
Kevin Falcone
b6d5c614dd Merge pull request #12074 from edx/derf/clear_existing_assets_before_copying_new_assets 
clear existing assets before copying new assets
 2016-04-20 16:18:54 -04:00
Cliff Dyer
f1c4a44928 Merge pull request #12152 from edx/cdyer/oauth-toolkit-allow-inactive 
Fix django-oauth-toolkit email and inactive user issues
 2016-04-20 14:13:55 -04:00
Muddasser
72c058f2a9 Merge pull request #12146 from edx/muddasser/updated_ff/sel_253/test_youtube_id_w_different_local_server_sub 
fixed button click issue while repacing subtitles.
 2016-04-20 22:45:33 +05:00
Adam
96cbc7c50f Merge pull request #12202 from edx/adam/fix-pre-1900-course-setting-date 
fix issue with pre-1900 course setting dates (TNL-4397)
 2016-04-20 11:38:41 -04:00
Calen Pennington
498f38779a Merge pull request #11810 from CredoReference/making-asides-values-db-driven 
Dynamic values for the selectboxes with tags (tags are stored in the database tables)
 2016-04-20 11:08:41 -04:00
Adam
49173191f8 Merge pull request #12140 from edx/fix-certificate-query 
Fix certificate query
 2016-04-20 10:45:29 -04:00
Adam Palay
26377a5732 fix issue with pre-1900 course setting dates (TNL-4397) 2016-04-20 10:44:13 -04:00
Adam
88192fd444 Revert "Revert "Adding background image for xseries certificates on dashboard side bar panel"" 2016-04-20 19:21:14 +05:00
Dmitry Viskov
1836065754 Dynamic values for the selectboxes with tags (tags are stored in the database tables) 2016-04-20 16:07:32 +03:00
Adam Palay
9a4f80e5c0 update query for whitelisted users who haven't yet had certs run for them 
remove CertificateStatuses.regenerating
 2016-04-20 09:01:49 -04:00
Chris Rodriguez
665b3dcfdb AC-383 language menu events only when menu opens 2016-04-20 08:56:36 -04:00
Adam
bb5874d5a1 truncate email from addresses if >320 chars when encoded (TNL-4264) (#12171) 
* truncate email from addresses if >320 chars when encoded (TNL-4264)

* use exact lengths
 2016-04-20 08:43:26 -04:00