Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,228 Commits 1 Branch 0 Tags
9725fa94a5d2f5062d1bbc2bc4e22bf2118bbfde
Commit Graph

6953 Commits

Author SHA1 Message Date
Ned Batchelder
d0dcfe12e4 Merge pull request #12621 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-06-02 19:52:51 -04:00
Andy Armstrong
7e2a174eec Move discussion board to the Pattern Library 
TNL-4622
 2016-06-02 12:48:12 -04:00
Ned Batchelder
64828c48c8 Update translations (autogenerated message) 2016-06-02 14:36:45 +00:00
Douglas Hall
a07a762f73 Merge pull request #12555 from edx/hasnain-naveed/MAYN-193 
MAYN-193 Use django_sites_extensions.middleware.RedirectMiddleware to enable redirects
 2016-06-01 21:18:01 -04:00
AlasdairSwan
a7d036f912 Merge pull request #12613 from edx/release 
Release 1st June 2016
 2016-06-01 15:22:19 -04:00
Hasnain
11454640da Added middleware to redirect the user from expired course page to all courses page. 2016-06-01 14:56:27 -04:00
Mushtaq Ali
89a16a41e4 Merge pull request #12042 from edx/mushtaq/safe-templates 
Make templates safer
 2016-06-01 12:37:37 +05:00
Mushtaq Ali
005bee8fbe Make templates safer 2016-05-31 21:58:05 +05:00
Christina Roberts
98fcc4ff9e Merge pull request #12578 from edx/christina/tnl-4561 
Christina/tnl 4561
 2016-05-31 11:06:48 -04:00
Fred Smith
d7af2f119d SES should use the non-smtp endpoint 2016-05-31 09:46:20 -04:00
Ehtesham Kafeel
9cb660a7d2 Merge pull request #12410 from edx/fedx/upgrade-paging-collection 
Upgrade edx-platform's paging collection with new edx-ui-toolkit's paging collection
 2016-05-30 17:44:57 +05:00
cahrens
292cd93131 Focus seems to be flaky when running tests. 
TNL-4561
 2016-05-28 22:03:35 -04:00
Nimisha Asthagiri
4a56fa5fb1 Adding infrastructure to support context-sensitive help links in the LMS. 2016-05-27 11:35:05 -04:00
Afzal Wali
eadd656df0 SOL-1802 Allow proctoring service to create support ticket. 2016-05-27 09:29:06 -04:00
Ehtesham
b31ba9d041 upgrade Pagingcollection to edx-ui-toolkit's PagingCollection 2016-05-27 04:35:44 +05:00
Brian Wilson
a36aa68fd7 Add new export_olx management command. 
This moves the functionality of the 'export_course'  management command from lms/djangoapps/courseware
over to the Studio codebase.  This reflects its use going forward to be run with cms settings, to
export the content of the Studio modulestore instead of the LMS modulestore.  The management
command is used by an analytics workflow to output course content for researchers.
 2016-05-26 17:26:59 -04:00
Ned Batchelder
10f7c9bb2f Update translations (autogenerated message) 2016-05-26 15:57:37 +00:00
Robert Raposa
ebf89d63e9 Merge pull request #12541 from edx/robrap/fix-imports 
Fix import order for HTML, Text.
 2016-05-25 15:23:08 -04:00
Fred Smith
b3462e5b1c Merge pull request #12544 from edx/derf/override_SES_email_region 
override SES email region
 2016-05-25 11:16:47 -04:00
Brian Jacobel
f4bede6c5b Fix library load paths (incl. jquery.scrollTo) 
Simplify paths in karma_cms_squire require paths
 2016-05-24 16:53:59 -04:00
Brian Jacobel
e433aa4e32 Remove this focus test, it's impossible to get it to pass in all envs without breaking something else 2016-05-24 16:53:58 -04:00
Brian Jacobel
4f0aee3f2d Fix unit and acceptance tests broken in upgrade (squashed) 
Fix syntax error in selectors

.attr() now returns a string (though it can still be passed an integer)

Fixes checkbox test failures

Remove remaining references to jquery.min (in wrong folder)

$.ajax now returns 422 if type is json and body is not JSON, e.g. ''

Substitute prop for attr

Remove references to jquery.min, add jquery.migrate (again)

"Fix" jquery karma config

This wasn't suppoed to survive the merge

This throws an error when called with an 'undefined' error

Fix Karma warning about [re|un]loading the window

Fix path for jquery in cms-squire tests

Move jasmine.clock.uninstall() to afterEach so it runs even on failure

Fix test failing due to timezone issues

Do the timeout before the window scrolling (so handler will not be _.throttled)

Fix an alert() triggered by window.onBeforeUnload while testing in Chrome
 2016-05-24 16:53:57 -04:00
Daniel Friedman
230f252bad Fix the way jquery and jquery-migrate are loaded 
Don't use symlinks to include node_modules
 2016-05-24 16:53:51 -04:00
cahrens
665f983c99 Tweak focus/blur functions for JQuery upgrade. 
Fix incorrectly scoped selector.
 2016-05-24 16:53:42 -04:00
cahrens
4ba07bf7a4 Assorted test and dependency fixes to cms-squire and cms 
isRejected is deprecated.

Actually serve the slick library in LMS jasmine tests

customwmd doesn't need to wait for DOM ready event

... In order to define a class and extend the Markdown class.
 2016-05-24 16:53:34 -04:00
Daniel Friedman
15f148141f Upgrade jQuery 1.7.2 to 2.2.0 
FEDX-25
 2016-05-24 16:52:50 -04:00
Fred Smith
fe788bc305 override SES email region and endpoint 2016-05-23 10:38:57 -04:00
Robert Raposa
7223ee9316 Fix import order for HTML, Text. 2016-05-23 08:47:08 -04:00
Gabe Mulley
1ee87c887a Merge pull request #12212 from CredoReference/assigned-tags-included-in-the-emitted-event 
Connected aside information is included in the emitted event (on check)
 2016-05-20 09:41:10 -04:00
Calen Pennington
2aa9967189 Merge pull request #12386 from cpennington/cale/concurrent-unit-tests 
[EV-12] Run LMS unit tests concurrently on jenkins
 2016-05-19 14:25:24 -04:00
Ned Batchelder
6c60f73124 Update translations (autogenerated message) 2016-05-19 15:01:26 +00:00
Dmitry Viskov
21bbcc9f35 Connected aside information is included in the emitted event (on check) 2016-05-19 17:37:40 +03:00
Douglas Hall
d95ad32532 Merge pull request #12510 from edx/douglashall/WL-450/fixed_timeout_issue 
WL-450 Fix for issue with canceling changes to image upload fields
 2016-05-19 09:24:14 -04:00
Calen Pennington
a45f1f032c Set OAUTH2_PROVIDER_APPLICATION_MODEL for tests so that migrations can run in verbose mode 2016-05-18 14:10:30 -04:00
Calen Pennington
5249504edc Use xunitmp by default, rather than standard xunit 2016-05-18 14:10:29 -04:00
Calen Pennington
09dc884c38 Isolate databases between test processes 2016-05-18 14:10:28 -04:00
Douglas Hall
bb55917f03 WL-450 Fix for issue with canceling changes to image upload fields 2016-05-18 12:29:18 -04:00
Adam Palay
a7d638de9e clear request cache after celery task finishes (TNL-2705) 
set max_num_courses_in_cache on modulestore
 2016-05-18 10:43:54 -04:00
Clinton Blackburn
c67ef7a8fa Merge pull request #12457 from edx/clintonb/user-update 
User administration updates
 2016-05-17 16:35:09 -04:00
cahrens
5f7e1266e7 Safe template cleanup. 2016-05-16 17:13:19 -04:00
Peter Fogg
0e66baf41f Add referral tracking for new registrations. 
ECOM-4325
 2016-05-16 11:17:23 -04:00
Peter Fogg
89838d40ed Merge pull request #12373 from edx/peter-fogg/password-change-session-invalidation 
Expire sessions after a password change.
 2016-05-16 09:17:45 -04:00
Ibrahim
b3411074af show Save and Cancel button when admin change Instructor image asset path from Studio schedule and details page 2016-05-14 16:25:44 -04:00
Ibrahim
2a2560e30e fix the issue where images do not appear when set through asset linkin Studio scheduls and details page 2016-05-13 16:22:44 -04:00
Clinton Blackburn
ebf32dc208 Moved manage_user and manage_group from edx-management-commands 
We need to create a user profile in order for users to be usable. This, coupled with the fact, that edx-platform is the owner of auth information, means these commands belong here.

ECOM-4310
 2016-05-13 09:16:04 -04:00
Peter Fogg
524e229245 Expire sessions after a password change. 
This is slightly more complicated than it should be since we're using
custom authentication middleware (i.e., not Django's standard
middleware class). We have to check that the session auth hash we have
stored is equal to the request's session auth hash (since the stored
hash is a function of the password). Normally this gets handled in
`django.contrib.auth.get_user`, but due to our caching we don't go
through that function, even in the cache miss case.

ECOM-4288
 2016-05-12 16:44:56 -04:00
Ned Batchelder
1ef94b7694 Update translations (autogenerated message) 2016-05-12 14:48:44 +00:00
Robert Raposa
ad4e185f0d Merge pull request #12391 from edx/robrap/jenkins-rule-thresholds 
TNL-4509: Set Jenkins thresholds per rule.
 2016-05-11 09:14:51 -04:00
Robert Raposa
80c3f84262 Fix safe template issues for 0 violations for some rules 2016-05-10 15:35:57 -04:00
Douglas Hall
24b4d5d29f Remove course details field character limits 2016-05-10 13:23:04 -04:00