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

43342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Eskew
dbad9fbcd4 Merge pull request #16400 from edx/jeskew/fix_utc_gmt_acceptance_test 
GMT -> UTC in test
 2017-10-31 14:24:29 -04:00
John Eskew
43150a1d23 GMT -> UTC in test 2017-10-31 12:55:28 -04:00
Gregory Martin
15ced1334e Merge pull request #16388 from edx/yro/a11y_audit_1556 
Fix onload tabindex focus for wiki edits
 2017-10-31 11:28:44 -04:00
John Eskew
0e08525fe9 Merge pull request #16289 from edx/jeskew/move_themeing_startup 
Move comprehensive theming startup code to AppConfig.
 2017-10-31 09:06:20 -04:00
Douglas Hall
719f90e733 Merge pull request #16392 from edx/douglashall/update_edx_enterprise_0_53_7 
Upgrade edx-enterprise to 0.53.7.
 2017-10-31 05:33:04 -04:00
Ayub khan
056191db85 Merge pull request #16375 from edx/LEARNER-2653-make-targets-for-extract-and-push-translations 
LEARNER-2653 Created make targets for extract and push translations
 2017-10-31 14:29:11 +05:00
Awais Jibran
e39451a9a2 Merge pull request #16376 from edx/aj/cleanup-and-logging 
Import Cleanup and Adding Logging message
 2017-10-31 14:21:52 +05:00
Douglas Hall
3b865c92c5 Upgrade edx-enterprise to 0.53.7. 
https://github.com/edx/edx-enterprise/compare/0.53.6...0.53.7
 2017-10-30 20:32:20 -04:00
Harry Rein
b0fd8e2304 Merge pull request #16387 from edx/HarryRein/up-arrow-scrolling 
Allow scrolling up on LMS.
 2017-10-30 17:23:30 -04:00
Gregory Martin
97c1a7580b Fix onload tabindex focus for wiki edits 2017-10-30 16:37:39 -04:00
Harry Rein
4608aee3b3 Allow scrolling up on LMS. 2017-10-30 16:31:56 -04:00
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
John Eskew
b866f35620 Remove support for COMPREHENSIVE_THEME_DIR - 
all dirs must now go into COMPREHENSIVE_THEME_DIRS.
Move comprehensive theming setup section out of startup.py and into
  settings files using new 'derived' functionality.
Add 'derive_settings' at the end of all top-level Django settings files.
Move validation of comprehensive theming settings into new apps.py
  theming file.
Split theming code into code safe to run before settings are initialized
  -and- after settings are initialized.
 2017-10-30 14:36:06 -04:00
John Eskew
9a2e25c370 Add derived/derived_dict_entry/derive_settings and tests. 
- Enables a method of deriving Django settings from other Django
  settings after all other Django settings are stable.
 2017-10-30 14:33:25 -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
Awais Jibran
abe8b7e7b2 Import Cleanups more logging 
This PR is to add more logging when user clicks "Request Certificate" and gets error "Your certificate will be available when you pass the course."

EDUCATOR-1616
 2017-10-30 17:48:28 +05: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
ayub-khan
a0c1a09a14 Created make targets for extract and push translations 2017-10-30 15:21:15 +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