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

6926 Commits

Author SHA1 Message Date
Fred Smith
fe788bc305 override SES email region and endpoint 2016-05-23 10:38:57 -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
Awais Jibran
db05aeb7e0 Merge pull request #12384 from edx/aj/fix-cms-dashboard-for-ccx 
Studio Edge cannot load the Course Dashboard for CCX courses.
 2016-05-10 17:29:01 +05:00
Awais Jibran
38f1c200ca Fixing test 2016-05-09 17:35:41 +05:00
Ibrahim
a51143fe38 fix height of delete button to match the attached text field 2016-05-09 16:58:01 +05:00
Calen Pennington
ccaafce05b Merge pull request #12205 from cpennington/disable-caching-in-tests 
Disable caching in LMS tests
 2016-05-06 15:22:48 -04:00
Adam
97a893efdf Merge pull request #12334 from edx/adam/escape-library-html-only 
escape library.html
 2016-05-06 13:38:32 -04:00
Diana Huang
07573c5141 Replace old conditional lettuce test with bok choy version. 2016-05-06 09:38:36 -04:00
Adam Palay
9ea24bf5e3 escape library.html 
show_children_previews was not being evaluated before
 2016-05-06 09:24:56 -04:00
Awais Jibran
e6b3f8f895 Studio Edge cannot load the Course Dashboard for CCX courses. 
TNL-4484
 2016-05-06 12:56:36 +05:00
Usman Khalid
a2dadeaaf3 Added some documentation to Karma configuration files. 2016-05-05 22:42:04 +05:00
Usman Khalid
667a9b9ae6 Moved common files into karma.common.conf.js. 2016-05-05 22:42:04 +05:00
Usman Khalid
6ed935383b Remove xmodule_js prefix from paths of edx-ui-toolkit, edx-pattern-library and common. 2016-05-05 22:42:03 +05:00
Usman Khalid
2839a42e0c Moved jasmine addons to common/js/spec_helpers. 2016-05-05 22:42:02 +05:00
Usman Khalid
84412ef8ea Exclude translation files from coverage tracking. 2016-05-05 22:42:02 +05:00
Usman Khalid
15acec2054 Simplify paths patterns in karma config files. 
Files which are loaded via RequireJs do not need to be individually
declared in karma config files. If we give karma directories,
it will serve all the files in them.
 2016-05-05 22:42:00 +05:00
Usman Khalid
713c79e0aa Set included=false by default because we want to move towards RequireJs. 2016-05-05 22:39:59 +05:00
Usman Khalid
855fdbd387 Moved all logic from karma config files to karma.common.conf.js. 
The config files just declare lists of files.
 2016-05-05 22:38:34 +05:00
Usman Khalid
ecf233c1b4 Keep karma config file docs only in karma.common.conf.js. Duplicate stuff tends to get out of sync. 2016-05-05 22:35:54 +05:00
Usman Khalid
bb7b29b308 Deleted js-test-tool config files. 2016-05-05 22:35:53 +05:00
Ned Batchelder
190c2ffc99 Update translations (autogenerated message) 2016-05-05 15:52:25 +00:00
Calen Pennington
853bfe7a36 Add a TestCase mixin for enabling caches in tests 
By default, disable all caching in tests, to preserve test independence.
In order to enable caching, inherit from CacheSetupMixin, and specify
which cache configuration is needed.

[EV-32]
 2016-05-04 14:51:30 -04:00
Calen Pennington
18e1610043 Remove the create_user argument to setUp. 
Instead, use a class attribute to define test behavior. This allows for
easier addition of new mixins over time.
 2016-05-04 11:35:55 -04:00
Usman Khalid
d99978870a Merge pull request #12312 from edx/usman/tnl4398-fix-tests 
Re-enable spec files that were disabled during the Jasmine upgrade.
 2016-05-04 17:16:58 +05:00
John Eskew
b5ab64505a Merge pull request #11331 from CredoReference/invalid-studio-user-permissions 
Invalid StudioPermissionsService object in API to show/save xblock settings in CMS
 2016-05-03 13:16:43 -04:00
Usman Khalid
78af4100cd Fixes for course updates date validation. 
If the first date the user selects is invalid it is not set on the
model. This is because jQuery datepicker's getDate returns the
current date when an invalid value is put in the field and the
model's initial value is also the current date. So always update
the date.
 2016-05-03 15:41:22 +05:00
Usman Khalid
8fef4148a5 Re-enabled videolist_spec, message_manager_spec and file_uploader_spec. 2016-05-02 20:54:59 +05:00
Ayub khan
d45c4d8caf Revert "Implement 'from_string_or_404' in utils" 2016-05-02 14:23:39 +05:00
asadiqbal
a4197eded5 WL-399 Course Details List Fields 2016-05-01 20:02:09 -04:00