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
Brian Beggs
ca92ffe21d
Remove SubfieldBase metaclass
2017-10-26 16:59:51 -04:00
Eric Fischer
3fc342e6e8
Webpack config prod/dev split
...
EDUCATOR-1448
Modifies paver webpack task to use production configuration in all
non-devstack environments, and a development config in devstack.
2017-10-26 14:03:53 -04:00
Troy Sankey
3be0fa81b8
Move verify_student signal registration to ready()
2017-10-26 13:57:52 -04:00
Dillon-Dumesnil
e712a2f1f1
Merge pull request #16356 from edx/ddumesnil/flaky-test
...
Removing flaky test
2017-10-26 13:55:25 -04:00
Jeremy Bowman
0f51a397cb
Exclude .tox directory from quality checks
2017-10-26 13:48:22 -04:00
Ayub khan
bbeec7b93f
Merge pull request #16352 from edx/LEARNER-717-4
...
LEARNER-717Added flag to exclude mobile applications
2017-10-26 22:45:48 +05:00
Harry Rein
7091ed0f70
Merge pull request #16337 from edx/HarryRein/home-page-styling-fixes
...
Course home page styling with bootstrap.
2017-10-26 13:39:44 -04:00
Tyler Hallada
52897d5808
Merge pull request #16346 from edx/thallada/ret-org-opt-out
...
Org-level schedule upgrade deadline opt-out
2017-10-26 13:31:21 -04:00
ayub-khan
320eb0c6b7
edx_clear_expired_tokens management commands removes
...
all expired tokens added a exlude_application_ids argument which
enable us to not remove expired tokens for given applications.
LEARNER-717
2017-10-26 21:50:14 +05:00
Gabe Mulley
6b37218e23
Merge pull request #16335 from edx/making-dynamic-pacing-emails-accessible
...
Making dynamic pacing emails accessible
2017-10-26 12:28:04 -04:00
Dillon Dumesnil
f54edeff2e
Removing flaky test
2017-10-26 11:31:42 -04:00
Gabe Mulley
05dd63e85a
fix tests, I hope?
2017-10-26 10:32:33 -04:00
Ayub khan
b964b52827
Merge pull request #16341 from edx/LEARNER-717-3
...
LEARNER-717 Add Refresh Token Expiration time
2017-10-26 19:07:37 +05:00
ayub-khan
8ede3a53b3
Added REFRESH_TOKEN_EXPIRE_SECONDS=20160
...
When edx_clear_expired_tokens command will run it will clear
all refresh,access tokens and grants expired before 2 weeks.
2017-10-26 18:43:59 +05:00
Harry Rein
d4e93fc655
Course home page styling with bootstrap.
...
Updates the new bootstrap course home page to match the old course home page.
2017-10-26 09:25:58 -04:00
Gabe Mulley
0fc3589cfa
fix template variable
2017-10-26 09:14:05 -04:00
Qubad786
4aef8d1c7b
exclude bumper
2017-10-26 16:28:25 +05:00
Awais Jibran
fe5a8de55c
Fixing quality
2017-10-26 16:19:10 +05:00
Awais Jibran
a428c08168
Fix Show Answer button display for the value "Answered" in studio
...
In docs it is explained that we should show "Show Answer" button for "Answered" value when the user has correctly submitted the answer. The current behavior is such, even if the learner has answered the question wrong, the "Show Answer" button would be available.
EDUCATOR-1563
2017-10-26 12:35:30 +05:00
Nimisha Asthagiri
a7c4ddfe4b
Merge pull request #16338 from edx/pacing/course-update
...
Schedules: Add upsell to Course Update templates
2017-10-25 19:42:59 -04:00
Nimisha Asthagiri
eb3e173dc8
Schedules: Course Update support bulleted highlights
2017-10-25 17:57:43 -04:00
Nimisha Asthagiri
d3dcca2f49
Schedules: DRY upsell and CTA in templates
2017-10-25 17:57:43 -04:00
Tyler Hallada
806114a3ef
Check org before course deadline config w/ tests
2017-10-25 17:54:47 -04:00
Andy Armstrong
8dc47f5797
Merge pull request #16336 from edx/andya/fix-browser-tab-i18n
...
Fix i18n for the page title in course tabs
2017-10-25 17:40:51 -04:00
Matthew Piatetsky
2cb2e5e3eb
Merge pull request #16344 from edx/LEARNER-2412
...
Fix request to currency endpoint
2017-10-25 16:41:45 -04:00
Jeremy Bowman
de210a57ed
PLAT-1766 Upgrade django-cas for Django 1.11 compatibility
2017-10-25 16:35:44 -04:00
Diana Huang
df89a1d238
Merge pull request #16314 from edx/diana/programs-dashboard-grades
...
ECOM-7387 - Add grade display to the programs dashboard
2017-10-25 16:31:45 -04:00
John Eskew
3dee61ec99
Merge pull request #16342 from edx/jeskew/again_more_django_111_changes
...
More Django 1.11 startup changes - remove django-nose and more.
2017-10-25 16:30:37 -04:00
Tyler Hallada
4c8b257bbb
Add OrgDynamicUpgradeDeadlineConfiguration model
2017-10-25 15:56:28 -04:00
Diana Huang
b0877270bf
Add course grades to programs dashboard.
2017-10-25 15:44:47 -04:00
sandroroux
224cca69ae
Changing the templates to make them more accessible.
2017-10-25 15:44:05 -04:00
Matthew Piatetsky
e1c24084e9
Fix request to currency endpoint
2017-10-25 15:38:10 -04:00
John Eskew
f28542d319
fixup! fixup! Use branched version of edx-sga.
2017-10-25 15:19:39 -04:00
John Eskew
7ede9a325a
fixup! Use branched version of edx-sga.
2017-10-25 12:12:23 -04:00
J. Cliff Dyer
69271d043b
Handle completion of scorable blocks
...
* Add a handler to mark a block complete when a problem is scored.
* Also handle marking incomplete when user problem state is deleted.
* Add score_deleted to published providing_args for PROBLEM_{RAW,WEIGHTED}_SCORE_CHANGED
OC-3089
2017-10-25 11:50:09 -04:00
John Eskew
725418dd38
Used tagged version of ORA2 - 2.1.3
2017-10-25 11:49:13 -04:00
John Eskew
917c3d62bd
FileWrapper indirection has been removed from Django.
2017-10-25 11:49:13 -04:00
John Eskew
8639e95994
Use branched version of edx-sga.
2017-10-25 11:49:13 -04:00
John Eskew
fa6d94d144
Remove NoseTestSuiteRunner - now using pytest.
2017-10-25 11:49:12 -04:00
Andy Armstrong
9cb906cb51
Fix i18n for the page title in course tabs
2017-10-25 11:22:30 -04:00
Calen Pennington
2fafa54662
Merge pull request #16334 from edx/cale/move-org-query-to-resolver
...
Cale/move org query to resolver
2017-10-25 10:28:24 -04:00
Cliff Dyer
ab13544cf2
Merge pull request #16112 from open-craft/cliff/handle-completion-events
...
Handle completion events
2017-10-25 10:13:18 -04:00
Harry Rein
618cf6aec5
Merge pull request #16333 from edx/HarryRein/responsive-updates-bookmarks-page
...
Update bookmarks and updates pages to be responsive.
2017-10-25 10:01:03 -04:00
Waheed Ahmed
892c5af871
Merge pull request #16323 from edx/waheed/LEARNER-2951-fix-unicode-error
...
Fix unicode error on financial assistance page.
2017-10-25 18:38:57 +05:00
Calen Pennington
07bb3ea564
Make the exclude orgs a bit more natural by returning a filtered query
2017-10-25 09:10:17 -04:00
Calen Pennington
fa7b9a132a
Move the org_list and exclude code into the resolvers
2017-10-25 09:10:16 -04:00
Waheed Ahmed
8c0e87ab65
Fix unicode error on financial assistance page.
...
If country name has special character str() raises unicode error.
LEARNER-2951
2017-10-25 17:27:46 +05:00
