Commit Graph

43327 Commits

Author SHA1 Message Date
Harry Rein
dff11d97cc Merge pull request #16379 from edx/HarryRein/responsive-account-settings
Responsive account settings page.
2017-10-30 15:33:22 -04:00
Nimisha Asthagiri
588f3d9d34 Merge pull request #16381 from edx/naa/course-update-tests
Schedules: Tests for Course Update messages
2017-10-30 15:19:09 -04:00
Douglas Hall
4eb490876c Merge pull request #16321 from edx/saleem-latif/ENT-669
ENT-669: Activation email received when skip_email_verification flag is 'True'
2017-10-30 14:49:23 -04:00
Nimisha Asthagiri
da95676e10 Schedules: rename test class variables that aren't test methods 2017-10-30 14:14:00 -04:00
Nimisha Asthagiri
08d31e1a43 Schedules: Tests for Course Update messages 2017-10-30 14:13:59 -04:00
Zubair Afzal
6120c76d99 Merge pull request #16377 from edx/zub/ENT-737-fix-error-for-course-start-date-not-set
bump enterprise version from `0.53.5` to `0.53.6`
2017-10-30 21:25:13 +05:00
Harry Rein
3498cc4e4b Responsive account settings page. 2017-10-30 12:11:04 -04:00
zubair-arbi
9fe65434c0 bump enterprise version from 0.53.5 to 0.53.6 2017-10-30 19:32:15 +05:00
Andy Armstrong
03e496bdbd Merge pull request #16370 from edx/andya/waffle-fix
Allow Waffle flags to work when outside a request context
2017-10-30 09:33:09 -04:00
Nimisha Asthagiri
c7ed394f16 Merge pull request #16374 from edx/naa/refactor-upsell-test
Schedule: Refactor upsell test cases
2017-10-30 09:20:49 -04:00
hamzamunir7300
9c85fcad78 Merge pull request #15988 from edx/footer_design_WIP/LEANER-2311
Footer New design using bootstrap
2017-10-30 16:00:18 +05:00
Hamza Munir
4a3164e2e3 Footer New design using bootstrap
This is a work in progress finished the 320px - 539px mobile
screen design.

LEARNER-2311
2017-10-30 14:55:26 +05:00
Saleem Latif
896da1020b Activation email received when skip_email_verification flag is 'True' 2017-10-30 14:13:42 +05:00
Andy Armstrong
431a91cca6 Merge pull request #16302 from edx/andya/upgrade-edx-bootstrap
Use Bootstrap theme colors and fonts in old stylesheets
2017-10-30 00:13:39 -04:00
Nimisha Asthagiri
de037c9c3c Schedule: refactor upsell test cases 2017-10-29 23:49:43 -04:00
Andy Armstrong
ae1c760ea4 Use Bootstrap theme colors and fonts in old stylesheets
LEARNER-2977

Fixes
2017-10-29 22:22:08 -04:00
Andy Armstrong
dde4ee003f Merge pull request #16357 from edx/HarryRein/responsive-header-dashboard-fixes
Styling fixes for the dashboard and course header.
2017-10-29 16:04:11 -04:00
Harry Rein
58f93cc7cc Styling fixes for the dashboard and course header. 2017-10-29 15:04:29 -04:00
Jeremy Bowman
d0f348d38d Merge pull request #16345 from edx/jmbowman/PLAT-1780
PLAT-1780 Remove dependency on django-extensions
2017-10-27 17:47:55 -04:00
Andy Armstrong
c55dbb2c61 Allow Waffle flags to work when outside a request context 2017-10-27 16:24:33 -04:00
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
Jeremy Bowman
ba06372cac PLAT-1780 Remove dependency on django-extensions 2017-10-27 13:19:12 -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