Commit Graph

14313 Commits

Author SHA1 Message Date
Brian Jacobel
dfd684ffd0 One more instance of require_module outside block js_extra 2016-06-01 16:11:19 -04:00
Brian Jacobel
47bc8e65f3 Fix actual safe template violations 2016-06-01 12:53:21 -04:00
Brian Jacobel
c281586a29 Fix other usages of require_module outside <%block name="js-extra" 2016-06-01 12:07:17 -04:00
Brian Jacobel
d9c798dca3 Fix JS load order issues for edxnotes 2016-06-01 12:07:17 -04:00
ssemenova
36c867c42a changed icon html from <i> to <span>
TNL-4651
2016-05-31 15:46:23 -04:00
Andy Armstrong
42f44848e5 Merge pull request #12585 from edx/andya/course-navigation-safe-template
Refactor staff preview menu logic out of template
2016-05-31 14:05:24 -04:00
Brian Jacobel
53d31551f6 Merge pull request #12591 from edx/bjacobel/forgot_password_empty
File doesn't do anything
2016-05-31 11:39:05 -04:00
Andy Armstrong
7ee41eafb3 Refactor staff preview menu logic out of template 2016-05-31 11:36:40 -04:00
Brian Jacobel
a799da96f1 This file is empty and hasn't been touched since 2012 2016-05-31 10:27:13 -04:00
Christina Roberts
880206e438 Merge pull request #12577 from edx/christina/4642
Add missing file.
2016-05-31 08:48:40 -04:00
cahrens
3aa7a313fc Move file to common directory.
It is needed by both Studio and LMS.
TNL-4642

x
2016-05-30 12:43:46 -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
Nimisha Asthagiri
4a56fa5fb1 Adding infrastructure to support context-sensitive help links in the LMS. 2016-05-27 11:35:05 -04:00
Douglas Hall
641f29b671 Merge pull request #12525 from edx/afzaledx/sol-1802_zendesk_tickets_for_suspicious_proctored_attempts
(WIP) SOL-1802 Create Zendesk ticket when "Suspicious" proctored exam reviews are received from the proctoring provider
2016-05-27 10:15:16 -04:00
Renzo Lucioni
85ca1f3e03 Merge pull request #12575 from edx/renzo/program-detail-data
Include raw program data on the detail page
2016-05-27 10:01:19 -04:00
Cliff Dyer
4e77d50982 Merge pull request #12396 from edx/cdyer/grading-transformer
Add transformer to collect grades data
2016-05-27 09:39:34 -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
J. Clifford Dyer
7b75d1d452 Add transformer that collects grading data.
TNL-4449
2016-05-26 16:15:34 -04:00
Clinton Blackburn
f6d9c9a324 Added scopes claim to JWT access tokens (#12571)
This will allow API servers to limit access based on scopes.
2016-05-26 15:45:07 -04:00
Renzo Lucioni
a6b972549a Include raw program data on the detail page
Uses the view's ID argument to retrieve and drop unmodified programs API data on the details page. Future work will supplement with CourseOverviews data. Part of ECOM-4415.
2016-05-26 15:33:08 -04:00
Eric Fischer
a9a3fabfe8 Bulk Email Multiselect (#12301)
TNL-4356

Allows multiple bulk email targets to be specified at once.

-The previous "All" option has been split into "Staff" and "Learners"
-The backend changes made here lay the groundwork for cohort emailing
-The data migration, 0005, is somewhat large and requires deploy attention
-Tests have been updated
-Numerous safe-commit-linter fixes are included
2016-05-26 14:22:04 -04:00
Renzo Lucioni
37eedf07db Merge pull request #12572 from edx/renzo/program-detail-routing
Adjust program detail page URL routing
2016-05-26 13:16:16 -04:00
Ned Batchelder
ff6e9b7f3f Merge pull request #12570 from edx/ned/update-translations
Update translations (autogenerated message)
2016-05-26 12:38:27 -04:00
Renzo Lucioni
e77166c2b0 Adjust program detail page URL routing
The new URL pattern expects a program ID and allows a program name to be included, if desired. It will match paths like 'programs/123/' and 'programs/123/foo/', but not 'programs/123/foo/bar/'. The given ID is passed to the view, where it will be used to retrieve program data. Part of ECOM-4415.
2016-05-26 12:17:21 -04:00
Ned Batchelder
10f7c9bb2f Update translations (autogenerated message) 2016-05-26 15:57:37 +00:00
Simon Chen
c60cf3911c ECOM-4218 Draft 1 for Course Cards on program details page 2016-05-26 10:56:30 -04:00
AlasdairSwan
9d3bd8e9cf Merge pull request #12550 from edx/alasdair/ECOM-4216-program-details-header
ECOM-4216 Program Details Header View
2016-05-25 18:21:37 -04:00
AlasdairSwan
dd9d465772 ECOM-4216 Program Details Header View 2016-05-25 16:54:02 -04:00
Clinton Blackburn
079dc97261 Merge pull request #12562 from edx/clintonb/jwt-fix
Added administrator bit to JWT access token
2016-05-25 15:49:00 -04: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
Clinton Blackburn
38148679dc Added administrator bit to JWT access token 2016-05-25 14:35:13 -04:00
Bill DeRusha
5af72a0dea Merge pull request #12557 from edx/release
Merge Hotfix-2016-05-24 into Release
2016-05-25 13:15:52 -04:00
Matt Drayer
f99723817b Merge pull request #12523 from edx/asadiqbal08/WL-479
WL-479 Enable Bulk purchase for anonymous user
2016-05-25 12:01:43 -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
asadiqbal
63a30a3110 WL-479 Enable Bulk purchase for anonymous user 2016-05-25 10:40:35 -04:00
Fred Smith
8a9df36809 update django-ses 2016-05-25 10:12:50 -04:00
Brian Jacobel
182921f1f1 Merge pull request #12433 from edx/bjacobel/upgrade-jquery
Upgrade jQuery to 2.2
2016-05-25 09:07:07 -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
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
Jillian Vogel
a5ef614994 Fixes require.storage.OptimizationError: Error while running r.js optimizer
Removes the jquery dependency on non-existant _jquery.js
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
Chris Rodriguez
9c77c42949 Moving main element up higher to not conflict with chart 2016-05-24 16:43:19 -04:00
Bill DeRusha
136f3d3467 Merge pull request #12552 from edx/release
Merge Release 2016-05-24 to Master
2016-05-24 16:11:35 -04:00
Ahsan Ulhaq
fa7ed070b9 Merge pull request #12468 from edx/ahsan/ECOM-4398-Course-Dashboard-Visual-Update
Course Dashboard Visual Update
2016-05-24 18:07:02 +05:00
Ahsan Ulhaq
a8f2de8375 Course Dashboard Visual Update
ECOM-4398
2016-05-24 16:17:19 +05:00