Commit Graph

49248 Commits

Author SHA1 Message Date
Zubair Afzal
24df31402e Merge pull request #16067 from edx/zub/ENT-624-update-enterprise-api-support
Ent 624 update enterprise api support
2017-09-28 13:29:41 +05:00
Saleem Latif
cb7d8dcb86 Create API View for ApiAccessRequest model 2017-09-28 12:27:13 +05:00
Robert Raposa
643d7d2151 Merge pull request #16103 from edx/HarryRein/bok-choy-removal-flaky
Remove Flaky StudentAdminTest test.
2017-09-27 21:38:16 -04:00
Robert Raposa
8c3dd293e9 Merge pull request #16105 from edx/robrap/refactor-course-goal-enum
Refactor Goal Enum to Choices (a.k.a. No Commit Left Behind)
2017-09-27 21:28:09 -04:00
John Eskew
649f3ccd41 Merge pull request #16118 from edx/jeskew/lxml_upgrade_in_another_place
Upgrade lxml in its other versioned requirement location.
2017-09-27 12:16:53 -04:00
John Eskew
b7fc838d6f Upgrade lxml in its other versioned requirement location. 2017-09-27 12:09:24 -04:00
Clinton Blackburn
7d51c194a3 Updated Studio course run API endpoint to allow null enrollment dates
LEARNER-2469
2017-09-27 09:43:07 -04:00
zubair-arbi
4040c45f06 update enterprise api support for request users and enterprise service user
ENT-624
2017-09-27 18:04:44 +05:00
noraiz-anwar
f644593655 update edx-proctoring to 1.2.2 2017-09-27 18:03:54 +05:00
Michael LoTurco
dd949fad4d Merge pull request #16026 from edx/MLoTurco/learner-1995
Include language specific templates in template lookup logic learner-1995
2017-09-27 08:54:14 -04:00
McKenzie Welter
190b2c36fe Changed lookup logic to consider language learner-1995 2017-09-27 07:53:39 -04:00
Robert Raposa
23fbde8ef1 Refactor Goal Enum to Choices. 2017-09-26 15:59:07 -04:00
Uman Shahzad
f94558f464 Merge pull request #16094 from open-craft/uman/ent-0.48.1
[WL-1240] [ENT-640] [ENT-628] [ENT-629] [ENT-630] [ENT-631] [ENT-634] [ENT-644] Bump to edx-enterprise to 0.48.1
2017-09-27 00:16:34 +05:00
Harry Rein
08ab462c4a Remove old messaging wells.
LEARNER-2236
2017-09-26 14:32:06 -04:00
Harry Rein
6ba34f463a Remove Flaky StudentAdminTest test.
EDUCATOR-552
2017-09-26 13:42:29 -04:00
Ned Batchelder
ed9b93ff1a Merge pull request #16100 from edx/nedbat/lazy_format
Have to format lazily for translated constant messages
2017-09-26 13:05:16 -04:00
Ned Batchelder
f8f911ae5c Have to format lazily for translated constant messages 2017-09-26 11:39:36 -04:00
Robert Raposa
fb1d688670 Merge pull request #16091 from edx/robrap/LEARNER-2641
LEARNER-2641: Add course goals bokchoy test.
2017-09-26 11:30:49 -04:00
John Eskew
fe8f7f553d Merge pull request #16022 from edx/jeskew/toxify_edx_platform_testing
Add tox testing to edx-platform.
2017-09-26 11:14:11 -04:00
Tasawer Nawaz
d414693c1f Merge pull request #16074 from edx/tasawer/learner-2296/single-support-form-dynamic-elements
Make username and courses dropdown dynamic  on single support form
2017-09-26 19:46:09 +05:00
Robert Raposa
06aa8d8f38 Merge pull request #16097 from edx/robrap/fix-bokchoy-docker
Fix bokchoy on docker.
2017-09-26 10:44:29 -04:00
Diana Huang
d696677ce8 Merge pull request #15968 from edx/diana/header-updates
LEARNER-2318: As a learner I should have an easy way to get to my learner profile
2017-09-26 10:40:41 -04:00
Daniel Clemente Laboreo
adb6a5ac55 Use correct protocol in shared links (https/http) 2017-09-26 17:23:50 +03:00
Daniel Clemente Laboreo
7f7643b7b4 Encode URLs in shared links
E.g. in "course-v1:edX+DemoX+Demo_Course" the "+" will become "%2B"
2017-09-26 17:23:50 +03:00
Robert Raposa
407a43f827 Add course goals bokchoy test.
LEARNER-2641
2017-09-26 09:12:50 -04:00
Nimisha Asthagiri
9a07227ed2 Merge pull request #16082 from edx/naa/remove-old-waffles
Remove unneeded WRITE_ONLY_IF_ENGAGED waffle switch
2017-09-26 08:40:47 -04:00
tasawernawaz
9d827b7e0c make username and courses dropdown dynamic
LEARNER-2679
2017-09-26 16:51:14 +05:00
Uman Shahzad
ff0374e695 Remove any trace of enterprise_customer_users in ENT API. 2017-09-26 15:22:18 +05:00
Diana Huang
c8706044cc Merge pull request #16090 from edx/diana/remove-waffle-flag
LEARNER-2443 Remove waffle flag for showing certs on profile.
2017-09-25 17:52:32 -04:00
Robert Raposa
cec406e9dd Fix bokchoy on docker. 2017-09-25 17:21:02 -04:00
Diana Huang
de7e1ead7d Clicking the logo brings the user back to the dashboard. 2017-09-25 17:06:08 -04:00
Diana Huang
d26694fb5a Update help link for profile. 2017-09-25 17:06:08 -04:00
Diana Huang
1cfefe2457 Modify the header to show the learner profile.
Remove the profile from the user dropdown.

LEARNER-2318
2017-09-25 17:06:08 -04:00
Nimisha Asthagiri
083ccdb95a Remove unneeded WRITE_ONLY_IF_ENGAGED waffle switch 2017-09-25 16:13:07 -04:00
Uman Shahzad
a27688afd0 Bump to edx-enterprise to 0.48.1 2017-09-26 00:43:09 +05:00
Diana Huang
b5a0d0ce0a Remove waffle flag for showing certs on profile.
Certs are displayed by default to everyone.
2017-09-25 15:38:16 -04:00
Gabe Mulley
a2dc27e6b1 fix multi-course emails and update ACE 2017-09-25 14:07:08 -04:00
Sofiya Semenova
71ab4eccef Merge pull request #16087 from edx/ssemenova/ed-1315
Educator-1315 Don't show processing message on dashboard if course is self-paced
2017-09-25 13:59:59 -04:00
Sofiya Semenova
bfb61093a5 Educator-1315 Don't show processing message on dashboard if course is self-paced 2017-09-25 12:41:01 -04:00
John Eskew
be14aef51c Add tox.ini to enable tox testing. 2017-09-25 10:33:15 -04:00
John Eskew
4de2ad4c25 Upgrade lxml to use pre-built pkg - no longer requires Cython. 2017-09-25 10:33:15 -04:00
John Eskew
617085b5d1 Move psutil req from paver to base - used in non-test code. 2017-09-25 10:33:15 -04:00
John Eskew
550c1e0725 Use simpler contract spec to fix parsing error. 2017-09-25 10:33:14 -04:00
John Eskew
2194d390c8 Remove memory dump signal until meliae packaging issues are resolved. 2017-09-25 10:33:14 -04:00
John Eskew
9d93c75089 Remove unused EASE requirement. 2017-09-25 10:33:14 -04:00
John Eskew
8eb5945e39 Move Django requirement into separate file to enable tox testing. 2017-09-25 10:33:14 -04:00
Douglas Hall
167472da84 Merge pull request #16072 from open-craft/uman/ent-0.46.8
[ENT-644] Bump edx-enterprise to 0.46.8.
2017-09-25 10:09:35 -04:00
Brian Beggs
2d19136beb Merge pull request #16009 from edx/jmbowman/pytest_unit_tests
PLAT-1677 Switch to pytest for unit tests
2017-09-25 08:57:01 -04:00
Cliff Dyer
eb463bbd0d Merge branch 'master' into cliff/pb-v2.7.7 2017-09-22 16:29:08 -04:00
Diana Huang
c1bdc75c0c Merge pull request #16080 from edx/HarryRein/profile-section-stacking-issue
LEARNER-2649: Fix issue with stacking on learner profile.
2017-09-22 16:11:52 -04:00