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

14247 Commits

Author SHA1 Message Date
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
sanfordstudent
d95a4c8559 Merge pull request #12493 from edx/sstudent/TNL-4468 
Sstudent/tnl 4468
 2016-05-19 16:07:01 -04:00
clrux
d98bc768df Merge pull request #12299 from edx/clrux/ac-413 
AC-413 adding labels to form fields on Instructor dashboard membership page
 2016-05-19 15:58:04 -04:00
Sanford Student
987fe723a4 adding link clicked event and associated tests 2016-05-19 14:58:22 -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
Calen Pennington
927b74e745 Make separate test processes use separate GRADES_DOWNLOAD and FINANCIAL_REPORTS directories 2016-05-19 12:45:28 -04:00
Ned Batchelder
558281a09d Merge pull request #12516 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-05-19 11:51:25 -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
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
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
Awais Jibran
4f46716e42 Merge pull request #12441 from edx/aj/ecom4202-disable-gen-cert-exception-btn 
Disable `Generate Exception Certificate button
 2016-05-19 13:41:13 +05:00
Robert Raposa
94adf7fb74 Merge pull request #12490 from edx/robrap/linter-mako 
TNL-4566: Lint Mako templates outside of expressions
 2016-05-18 16:17:10 -04:00
Robert Raposa
7ecbed43e7 Make _thread_list_template.html safe. 2016-05-18 14:23:56 -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
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
Calen Pennington
09dc884c38 Isolate databases between test processes 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
clrux
7b34f4317d Merge pull request #12502 from edx/clrux/ac-474 
Corrects duplicate main element wrapper on Wiki article template
 2016-05-17 17:36:43 -04:00
John Eskew
e5a5704b38 Merge pull request #12495 from edx/jeskew/release_to_master_merge 
Merge release to master for 2016-05-17 release
 2016-05-17 17:16:16 -04:00
clrux
5db315bebf Merge pull request #12371 from edx/clrux/ac-405 
AC-405 calculator image to icon
 2016-05-17 17:11:56 -04:00
clrux
f7eba02808 Merge pull request #12411 from edx/clrux/ac-396 
AC-396 updating courseware nav to display correctly on high contrast displays
 2016-05-17 17:11:09 -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
Matt Drayer
f2ffbab0ec mattdrayer: Add receipt page + JS test fixes 2016-05-17 15:41:29 -04:00
AlasdairSwan
7a0d7818bc Offscreen a11y test fix 2016-05-17 15:41:28 -04:00
Matt Drayer
c6249f4227 mattdrayer/WL-466: Use LMS Courses API 2016-05-17 15:41:28 -04:00
AlasdairSwan
646d0b9b68 ECOM-4450 Added help tab and model styling to Pattern Library pages 2016-05-17 15:41:28 -04: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
Matt Drayer
fe1e659fb7 mattdrayer/rc/2016-05-17: Check for "code" on receipt line item attribute. 2016-05-17 15:41:27 -04:00
Chris Rodriguez
36cbdf576b Corrects duplicate main element wrapper on Wiki article template 2016-05-17 15:15:58 -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
Ahsan Ulhaq
7a43b57037 Merge pull request #12401 from edx/ahsan/removal-underscore-string-from-commerce-js 
Ahsan/removal underscore string from commerce js
 2016-05-17 19:49:17 +05: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
Ahsan Ulhaq
300002b54d Add js test for analytics event on LMS receipt page 
ECOM-4281
 2016-05-17 18:56:05 +05: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
Awais Jibran
8691c2425f Disable `Generate Exception Certificate button when web certificate config is deactive. 
ECOM-4202
 2016-05-17 16:42:19 +05: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