Commit Graph

7054 Commits

Author SHA1 Message Date
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
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
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
asadiqbal
63a30a3110 WL-479 Enable Bulk purchase for anonymous user 2016-05-25 10:40:35 -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
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
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
a8f2de8375 Course Dashboard Visual Update
ECOM-4398
2016-05-24 16:17:19 +05:00
Clinton Blackburn
8855f12701 Merge pull request #12435 from mitocw/gdm_certificates_api_key
Authentication and Authorization for Cert Rest APIs fixed
2016-05-23 17:31:45 -04:00
Giovanni Di Milia
3a6167d6c8 Authentication and Authorization for Cert Rest APIs fixed 2016-05-23 16:22:03 -04:00
tasawernawaz
21ff5f4ea1 Merge pull request #12540 from edx/feature/update-learner-dashboard
Feature/update learner dashboard
2016-05-24 03:37:41 +08:00
Peter Fogg
c75bcb23b6 Merge pull request #12546 from edx/peter-fogg/date-summary-unicode-fixes
Fix date summaries with Unicode format issues.
2016-05-23 14:20:58 -04:00
Tasawer
caa5a0ac02 ECOM-4334 Update learner dashboard 2016-05-23 21:41:06 +05:00
Simon Chen
e6137dd6af ECOM-4007 Prevent the issuing of HC certs to verified learners that haven't ID verified 2016-05-23 11:44:14 -04:00
Nimisha Asthagiri
16f89ddae3 Support force update param in generate_course_blocks Management Command 2016-05-23 11:40:03 -04:00
Peter Fogg
c1a59cc0b3 Fix date summaries with Unicode format issues.
This issue would show up when date formatting strings are translated
with Unicode characters (like when testing with fake Esperanto
translations).
2016-05-23 11:15:09 -04:00
Asad Iqbal
18cddf6e1e Merge pull request #12488 from edx/asadiqbal08/WL-477
Got two thumbs up, so merging. 
WL-477 Route direct references to email address configurations through theming.helpers
2016-05-23 17:56:28 +05:00
Robert Raposa
7223ee9316 Fix import order for HTML, Text. 2016-05-23 08:47:08 -04:00
asadiqbal
1c19ebb443 WL-477 2016-05-23 13:24:05 +05: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
9351b302b5 Merge pull request #12492 from edx/ned/fix-csv-headers
Ensure correct CSV headers for non-English
2016-05-19 11:26:38 -04:00
Dmitry Viskov
21bbcc9f35 Connected aside information is included in the emitted event (on check) 2016-05-19 17:37:40 +03:00
Calen Pennington
0ade461f2a Skip course_wiki test which is flaky under randomization
The test TestComprehensiveTheming.test_themed_footer in lms/djangoapps/course_wiki/tests/test_comprehensive_theming.py
fails when run immediately after lms.djangoapps.course_wiki.tests.test_middleware:TestWikiAccessMiddleware.test_url_tranform.

Until we have a chance to fix it, we're going to skip it to expedite merging
concurrent testing.

To reproduce the failure, remove the @skip decorator, and run:

paver test_system -s lms --disable-migrations --test_id='lms.djangoapps.course_wiki.tests.test_middleware lms.djangoapps.course_wiki.tests.test_comprehensive_theming' --no-randomize -v --processes=0
2016-05-19 10:20:20 -04:00
Calen Pennington
084f139113 Remove a redundant setUpClass method that only called super 2016-05-19 10:20:20 -04:00
Calen Pennington
4a3f8358de Make static_template_view.tests an actual module 2016-05-18 14:10:28 -04:00
Calen Pennington
a07f53e020 Run middleware on a RequestFactory generated request in tests 2016-05-18 14:10:28 -04:00
Ned Batchelder
17b16b115d Ensure correct CSV headers for non-English
If we pass non-ASCII strings to create_csv_response, it will call
unicode() on it, and fail with UnicodeDecodeError.  So pass Unicode
strings, or ASCII-only bytestrings for the headers.
2016-05-18 11:10:32 -04:00
attiyaishaque
48e7fc8125 Bokchoy Test Deleted. 2016-05-18 11:40:59 +05:00
attiyaishaque
275a31ec42 Change in Bokchoy test according to new design. 2016-05-18 11:40:58 +05:00
attiyaishaque
19ea9ae9a0 Unit tests added and changes in enroll_staff view. 2016-05-18 11:40:58 +05:00
attiyaishaque
b19264974b Adding unit test 2016-05-18 11:40:58 +05:00
attiyaishaque
94b58c2df6 Adding bokchoy test and change in html file. 2016-05-18 11:40:57 +05:00
Awais Jibran
3fb6592443 SUST-24 Initial commit
Add bokchoy test and changes in html
2016-05-18 11:40:57 +05:00
cahrens
cafc15cf7d Move city and country fields to the very end.
OSPR-1155
2016-05-17 15:41:28 -04:00
Douglas Hall
4bdeaf7696 Always include the course price in the course_about template context 2016-05-17 15:41:27 -04:00
Douglas Hall
defb08e845 Include course price in course_about template context if either the ecommerce service is enabled or shoppingcart is enabled 2016-05-17 15:41:27 -04:00
Waheed Ahmed
ee65c8783d Use CourseOverview instead of modulestore. 2016-05-17 21:00:53 +05:00
Christina Roberts
8c418c62fe Merge pull request #12033 from sigberto/submission-history-tz
Display correct timezone on timestamp for question submission
2016-05-17 10:52:30 -04:00
Peter Fogg
1bd2ec2535 Merge pull request #12474 from edx/peter-fogg/date-summary-fixes
Fixes for courseware date formatting/translation.
2016-05-17 10:13:15 -04:00
Peter Fogg
80bfa36d09 Fixes for courseware date formatting/translation. 2016-05-17 09:20:07 -04:00
Adam
cf8e37b381 Merge pull request #12455 from edx/adam/fix-email-from-addr-length
refine from_addr length limits (TNL-4264)
2016-05-17 08:30:15 -04:00
sigberto
6e0fb24dab Display correct timezone on timestamp for question submission
The view for submission history used to grab the timezone from the database (UTC) and
appeded the TIME_ZONE variable after (could be any time zone). Adjusted displayed
timedate to the TIME_ZONE variable. Added unittest checks the localized datetime
object used by submission history for the expected hour difference.
2016-05-16 12:26:37 -07:00
Calen Pennington
cb2ac42426 Use separate git repos for separate TestCases 2016-05-16 13:29:16 -04:00
Eric Fischer
0cf3e39c31 Replace bulk email settings with admin config models
Moves ENABLE_INSTRUCTOR_EMAIL and REQUIRE_COURSE_EMAIL_AUTH from settings files
to admin-accessible configuration models. This allows for the bulk email settings
to be modified without a new AMI deploy. See TNL-4504.

Also updates tests:
    -python tests mock out the new configurations in place of the old settings
    -lettuce test has been moved to bokchoy
        (note that there was some loss of coverage here - the lettuce tests had
        been doing some voodoo to allow for cross-process inspection of emails
        messages being "sent" by the server, from the client! In discussion with
        testeng, this seems outside the realm of a visual acceptance test. So,
        the bokchoy test simply confirm the successful queueing of the message,
        and leaves the validation of sending messages to the relevant unit tests.)
    -bok choy fixture has been added, to replace the settings in acceptance.py
    -lettuce and bok choy databases have been updated to reflect the backend changes

The new default is to have bulk_email disabled, we'll need to call this out in the
next OpenEdx release to ensure administrators enable this feature if needed.
2016-05-16 11:09:39 -04:00
Adam Palay
c9b0e12d39 use markupspace for escaping 2016-05-13 11:15:00 -04:00
AlasdairSwan
7bca66c23e Merge pull request #12408 from edx/alasdair/ECOM-4215-program-details-page-setup
ECOM-4215 adding setup for new program details page
2016-05-12 18:25:13 -04:00
AlasdairSwan
bc5daffc96 ECOM-4215 adding setup for new program details page 2016-05-12 16:39:23 -04:00