Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,306 Commits 1 Branch 0 Tags
348605a020779915fd308725ea6ecaefaf9c8cb5
Commit Graph

43306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Mesick
348605a020 Merge pull request #16310 from edx/bmedx/django111_survey_models 
Clean up survey warnings
 2017-10-27 15:07:14 -04:00
Matt Tuchfarber
e88d916c29 Merge pull request #16360 from edx/tuchfarber/marketing_hero 
Add hero to main.html and use it in program page
 2017-10-27 13:45:27 -04:00
Matt Tuchfarber
a93832aabe Add hero to main.html and use for program page 
Adding hero to main.html allows for full width marketing images to be
used. This commit includes the addition of the hero block into
main.html along with the program marketing page's use of that new
hero block.
 2017-10-27 12:26:21 -04:00
Troy Sankey
8afa17f31d Merge pull request #16367 from edx/pwnage101/verify_student_app_startup_2 
Specify the full path to the verify_studen app config
 2017-10-27 12:14:34 -04:00
Jeremy Bowman
e4ef8e0620 Merge pull request #16347 from edx/jmbowman/PLAT-1766 
PLAT-1766 Upgrade django-cas for Django 1.11 compatibility
 2017-10-27 12:14:04 -04:00
Troy Sankey
36a6a5e584 Specify the full path to the verify_studen app config 
This fixes a bug introduced in 3be0fa81
 2017-10-27 11:20:37 -04:00
Saleem Latif
4e131a4266 Merge pull request #16365 from edx/saleem-latif/ENT-735 
ENT-735: Enterprise version upgrade to 0.53.5
 2017-10-27 20:14:06 +05:00
Jeremy Bowman
43fe9f069c Merge pull request #16362 from edx/jmbowman/PLAT-1598 
Exclude .tox directory from quality checks
 2017-10-27 11:12:37 -04:00
Troy Sankey
7bbecfdc3c Merge pull request #16301 from edx/pwnage101/verify_student_app_startup 
Move verify_student signal registration to ready()
 2017-10-27 11:10:30 -04:00
Brian Beggs
3608b86273 Merge pull request #16309 from edx/bbeggs/PLAT-1411 
Replace SubfieldBase functionality PLAT-1411
 2017-10-27 10:41:32 -04:00
Cliff Dyer
2cadbbad0b Merge pull request #16186 from open-craft/cliff/complete-scored-blocks 
Complete scored blocks
 2017-10-27 10:32:05 -04:00
Saleem Latif
b9e622b471 enterprise version upgrade to 0.53.5 2017-10-27 19:09:53 +05:00
Zubair Afzal
a944887622 Merge pull request #16364 from edx/zub/ENT-731-preserve-querystring-dsc-decline-url 
Update enterprise version to `0.53.4`
 2017-10-27 18:28:25 +05:00
Ayub khan
b85b793c18 Merge pull request #16363 from edx/you/update_translations 
Update translations
 2017-10-27 17:50:05 +05:00
M. Rehan
f04594b8f6 Merge pull request #16290 from edx/mrehan/exlude-bumper 
Exclude bumper from VAL handling the transcripts
 2017-10-27 17:37:27 +05:00
Noraiz Anwar
19f9cb15a5 Merge pull request #16353 from edx/noraiz/add-logs-EDUCATOR-1424 
add logs to better understand course listing response time
 2017-10-27 17:19:34 +05:00
zubair-arbi
3d36f3346e Update enterprise version to 0.53.4 2017-10-27 15:42:17 +05:00
ayub-khan
8ba42a3355 Update translations 2017-10-27 15:19:08 +05:00
Awais Jibran
4b4e4f2698 Merge pull request #16319 from edx/aj/fix-capa-show-answer 
Fix Show Answer button display for the value "Answered" in studio
 2017-10-27 14:30:13 +05:00
Nimisha Asthagiri
2c80b1b4f9 Merge pull request #16339 from edx/cale/dry-schedule-tests 
Dry schedule tests
 2017-10-27 05:16:40 -04:00
Rabia Iftikhar
764e598f94 Merge pull request #16283 from edx/ri/EDUCATOR-1542-special-exams-tab 
EDUCATOR-1542 give access to Special Exam tab to the course team
 2017-10-27 13:15:04 +05:00
noraiz-anwar
6cda1b2e0a add logs to better understand course listing response time 2017-10-27 12:49:15 +05:00
rabiaiftikhar
9260f8813a EDUCATOR-1542 give access to Special Exam tab to the course team 2017-10-27 07:02:54 +00:00
Nimisha Asthagiri
b461ce0c27 Rename test files and class name 2017-10-26 18:54:50 -04:00
Nimisha Asthagiri
ea8da6737e Update tests to support org queries 2017-10-26 18:41:57 -04:00
Nimisha Asthagiri
f1ceb86fa9 Remove unneeded imports/etc from schedules management command test classes 2017-10-26 18:41:57 -04:00
Nimisha Asthagiri
185f35b17a Optimize remaining tests in schedule management command TestUpgradeReminder class 2017-10-26 18:41:57 -04:00
Nimisha Asthagiri
74307e45e8 Remove query constants from schedules management command test subclasses 2017-10-26 18:41:57 -04:00
Nimisha Asthagiri
a72df1f9d5 Add _get_dates helper method to the schedules management command base test class 2017-10-26 18:41:57 -04:00
Nimisha Asthagiri
346a2bcf2a Move _calculate_bin_for_user into the schedules management command base test class 2017-10-26 18:41:56 -04:00
Nimisha Asthagiri
82978e516c Move test_template into the schedules management command base test classs 2017-10-26 18:41:56 -04:00
Nimisha Asthagiri
1ad8cd01f5 Move test_multiple_enrollments into the schedules management command base test class 2017-10-26 18:41:56 -04:00
Nimisha Asthagiri
b852025ab3 Move test_course_end into the schedules management command base test class 2017-10-26 18:41:56 -04:00
Nimisha Asthagiri
1bb23a1350 Move test_site_config into the schedules management command base test class 2017-10-26 18:41:56 -04:00
Nimisha Asthagiri
81da729af7 Move test_enqeue_config into the schedules management command base test class 2017-10-26 18:41:56 -04:00
Nimisha Asthagiri
9e99489a46 Move test_deliver_config into the schedules management command base test class 2017-10-26 18:41:56 -04:00
Nimisha Asthagiri
2adbac03f8 fixup! Move test_resolver_send into the schedule management command base class 2017-10-26 18:41:55 -04:00
Nimisha Asthagiri
eac5f21cc1 Move test_no_course_overview into the schedules management command base test class 2017-10-26 18:41:55 -04:00
Calen Pennington
e5f84b3dd9 Move test_schedule_bin into the schedules management command base test class 2017-10-26 18:41:55 -04:00
Calen Pennington
c4302df041 Move test_resolver_send into the schedule management command base test class 2017-10-26 18:41:55 -04:00
Calen Pennington
77a2638d68 Move test_handle into the base class for schedule management command tests 2017-10-26 18:41:55 -04:00
Calen Pennington
f2ea6f664e Move the tested_command up to a class attribute, and make sure that it matches with the tested_task 2017-10-26 18:41:55 -04:00
Calen Pennington
c4249c6bc5 Move day-offsets into class attributes of the schedule management commands 2017-10-26 18:41:54 -04:00
Calen Pennington
8afe1ffe17 Move schedule management command log_prefix to a class attribute 2017-10-26 17:43:56 -04:00
Calen Pennington
c68883f009 Move setUp into the baseclass for schedule email command tests 2017-10-26 17:43:56 -04:00
Calen Pennington
3696f5f5fe Remove redundent ScheduleFactory calls in setUp for schedule email tests 2017-10-26 17:43:56 -04:00
Calen Pennington
9b4c0540a1 Move task being tested into a class attribute 2017-10-26 17:43:56 -04:00
Calen Pennington
b774e0a82e Move ENABLED_CACHES into schedule test base class 2017-10-26 17:43:55 -04:00
Calen Pennington
5be19e22c2 Induce a base class for schedule email management command tests 2017-10-26 17:43:55 -04:00
Eric Fischer
8435e7b571 Merge pull request #16343 from edx/efischer/webpack_split_config 
Split webpack configuration files between development and production
 2017-10-26 17:02:25 -04:00