Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,235 Commits 1 Branch 0 Tags
67fe47713bf9dc286cd49bdb4f0cbfaac3df009f
Commit Graph

2180 Commits

Author SHA1 Message Date
Jeremy Bowman
7ba83dd533 Merge pull request #16908 from edx/jmbowman/PLAT-1847 
PLAT-1847 Fix cms tests under Django 1.9
 2017-12-14 13:49:55 -05:00
Tasawer Nawaz
0a0a17c8fe Merge pull request #16900 from edx/tasawer/learner-3165-fix-retries-logic-in-award-program-certificate 
Fix retries logic in award program certificate task
 2017-12-14 12:15:50 +05:00
Douglas Hall
6a3227743a Merge pull request #16910 from edx/douglashall/ENT-798 
ENT-798 Update SailThru user with enterprise name on EnterpriseCustomerUser creation.
 2017-12-13 18:38:19 -05:00
Matt Tuchfarber
fc195ddff9 Merge pull request #16736 from edx/tuchfarber/WL_1343_instructor_ordering 
Order program instructors based on new program field
 2017-12-13 17:12:54 -05:00
Jeremy Bowman
d674f9086f Merge pull request #16889 from edx/jmbowman/PLAT-1840-commonlib 
PLAT-1840 Fix common/lib tests under Django 1.9
 2017-12-13 17:11:37 -05:00
Douglas Hall
ada86232c2 ENT-798 Update SailThru user with enterprise name on EnterpriseCustomerUser creation. 2017-12-13 16:24:27 -05:00
Jeremy Bowman
917f877299 PLAT-1840 Fix common/lib tests under Django 1.9 2017-12-13 15:57:00 -05:00
Eric Fischer
39757aa5b0 Merge pull request #16906 from edx/efischer/zendesk_503 
Log payload on 503 errors
 2017-12-13 15:45:54 -05:00
Jeremy Bowman
d44e6297ae PLAT-1847 Fix cms tests under Django 1.9 2017-12-13 15:29:02 -05:00
Matt Tuchfarber
a4f5c14cf9 Order program instructors based on new program field 
This collects the instructors from the courses in the program like before. There is now a field in the program model in discovery that allows you to list instructors for the program.

Depends on this PR: https://github.com/edx/course-discovery/pull/1244
 2017-12-13 14:43:44 -05:00
Eric Fischer
fde7700543 Log payload on 503 errors 
EDUCATOR-1956
 2017-12-13 13:31:23 -05:00
Tasawer Nawaz
a02dac29f1 Fix retries logic in award program certificate task 
LEARNER-3165
 2017-12-13 21:00:27 +05:00
Nimisha Asthagiri
c1d0252999 Merge pull request #16674 from open-craft/tomaszgy/completion_in_blocks_api 
Add block completion value as optional field in course_blocks.api.
 2017-12-13 10:38:36 -05:00
Brian Mesick
e4648bff79 Merge pull request #16860 from edx/bmedx/django111_fix_cms_errors 
Changes to fix various Django 1.11 errors
 2017-12-13 10:07:43 -05:00
Bill Filler
dd4d13af5f Merge pull request #16611 from edx/afzaledx/WL-1219 
Added extended profile fields to the Account settings page.
 2017-12-13 08:48:06 -05:00
Ahsan Ulhaq
50c8a80f32 Show white listed ceretificates on progress page 
White listed certificates should appear on the progress page
even if the user has not passed the course
LEARNER-3546
 2017-12-13 10:06:37 +05:00
Harry Rein
2711fb521a Allowing a user to fulfill their entitlement on the programs dashboard. 
LEARNER-3438

The user can now enroll in a session, unenroll from a session or change session
from a new course enrollment card on the programs dashboard.
 2017-12-12 10:35:26 -05:00
Tomasz Gargas
d4edf33f09 Remove a check for READ_VERSION==0 in BlockStructureBlockData._add_transformer. 
Signed-off-by: Tomasz Gargas <tomasz@opencraft.com>
 2017-12-12 14:22:10 +01:00
Brian Mesick
9b10dd70f2 Merge pull request #16866 from edx/bmedx/TestGetProgramsWithType_maxdiff 
Increase diff output for theses tests to debug potential issues
 2017-12-11 18:40:45 -05:00
Brian Mesick
44703269b5 Merge pull request #16814 from edx/bmedx/course_lang_bulk_update_cmd 
Add command to bulk move user language prefs from one code to another
 2017-12-11 16:53:31 -05:00
bmedx
b1d4daf638 Increase diff output for theses tests to debug potential issues 2017-12-11 15:00:49 -05:00
Brian Mesick
98456e11a1 Merge pull request #16840 from edx/bmedx/django111_conditional_birdcage 
Make all uses of birdcage conditional, should fix 1.11 errors
 2017-12-11 14:51:48 -05:00
bmedx
2579785a54 Make all uses of birdcage conditional, should fix 1.11 errors 2017-12-11 13:21:06 -05:00
bmedx
0f0b8048b4 Changes to fix various Django 1.11 errors 2017-12-11 13:15:42 -05:00
McKenzie Welter
853cd9a0a7 show programs in which user holds a course entitlement on programs listing page 2017-12-11 12:22:36 -05:00
Eric Fischer
25eb31877b Merge pull request #16843 from edx/why_did_we_not_do_this_sooner 
fix some eslint ish
 2017-12-11 12:08:21 -05:00
Afzal Wali
f589dc9d29 WL-1219 
Added extended profile fields to the Account settings page.
 2017-12-11 18:42:59 +05:00
Tasawer Nawaz
a6f4f1762b update logging in award program certiicate task LEARNER-3165 2017-12-11 17:16:25 +05:00
Dillon-Dumesnil
bb9e5922e1 Merge pull request #16853 from edx/ddumesnil/xblock 
Removing debugging
 2017-12-08 16:40:45 -05:00
Dillon Dumesnil
a03ce146a0 Removing debugging 2017-12-08 15:35:29 -05:00
Dillon-Dumesnil
e61af093a6 Merge pull request #16846 from edx/ddumesnil/xblock 
Updating xblock-review version to include commit for being more defen…
 2017-12-08 14:57:16 -05:00
Eric Fischer
5bc6b31e29 eslint --fix 2017-12-08 14:38:41 -05:00
Dillon Dumesnil
aa8b7ab2ec Fixing correctness text so it doesn't match 'correct' in the word 'correctness' causing my tests to fail. This should be improved soon 2017-12-08 13:34:44 -05:00
Diana Huang
8752480aac Merge pull request #16829 from edx/diana/registration-form-improvements 
LEARNER-3469 - More registration form cleanup.
 2017-12-08 13:00:20 -05:00
Uzair Rasheed
1225bde736 Merge pull request #16807 from edx/LEARNER-3385/content-injection-on-registration 
Verify 'Full Name' field does not allow HTML in Signup form
 2017-12-08 21:34:09 +05:00
Eric Fischer
648bfeae37 Merge pull request #16832 from edx/dahlia/raise_zendesk_rate_limit 
raise zendesk_proxy rate limit
 2017-12-08 09:43:00 -05:00
Diana Huang
0ecc0558a3 More registration form cleanup. 2017-12-08 09:39:01 -05:00
uzairr
8ffac2061d Verify 'Full Name' field does not allow HTML in Signup form 
'Full Name' field in the signup form is allowing HTML as an input
which makes spoofing easily.To avoid it, validation is added
that will ensure 'Full Name' field does not allow HTML.

LEARNER-3385
 2017-12-08 19:18:18 +05:00
Harry Rein
4c352e2f2b Merge pull request #16472 from edx/HarryRein/course-run-selection-dashboard 
Allow users to fulfill entitlements and change enrollments from the course dashboard.
 2017-12-07 16:39:04 -05:00
Eric Fischer
1a7ffc73c2 raise zendesk_proxy rate limit 2017-12-07 16:04:01 -05:00
bmedx
6294baf456 Add command to bulk move user language prefs from one code to another 2017-12-07 15:06:09 -05:00
McKenzie Welter
5d1eecd43c python tests, quality, and html element type fix 2017-12-07 13:50:24 -05:00
Tyler Hallada
95bb6e3db0 Use pytest-style asserts in test_signals.py 2017-12-07 13:43:49 -05:00
Tyler Hallada
6e791c58ea Fix hold back error 
Also add try/except that prevents enroll failure caused by Schedule creation
exception in the future.

Address PR comments

Split one-line docstrings on their own line

Add period to the end of docstring summaries

Use kwargs.get to be more defensive

Disable pylint unused-argument about sender param
 2017-12-07 13:43:47 -05:00
Albert St. Aubin
28837c020f Allowing a user to fulfill their entitlement on the course dashboard. 
The user can now enroll in a session, unenroll from a session or change session
from a new course enrollment card on the course dashboard.
 2017-12-07 12:41:12 -05:00
Albert (AJ) St. Aubin
292848cfe7 Merge pull request #16617 from edx/aj/entitlement_session_backend 
Aj/entitlement session backend
 2017-12-07 12:05:17 -05:00
Albert St. Aubin
0ea3753d94 Added Entitlement enroll and unenroll logic to the Enrollment API 
[LEARNER-3136]

This commit containts the logic and API endpoint for a user to Enroll,
Unenroll, and switch-session on a Course Entitlement.
 2017-12-07 10:54:59 -05:00
Eric Fischer
35611e81ec Merge pull request #16769 from edx/dahlia/zendesk_proxy_client 
Zendesk proxy client
 2017-12-06 15:47:01 -05:00
Jeremy Bowman
0974e5b055 Merge pull request #16812 from edx/jmbowman/PLAT-1749 
PLAT-1749 Support Django 1.10+ CSRF tokens
 2017-12-06 15:31:16 -05:00
Eric Fischer
8743cda0d6 Zendesk Proxy 
This change creates a new lms/cms endpoint which accepts unauthenticated
requests to securely create zendesk tickets. This allows javascript code to
create tickets without exposing ZENDESK_OAUTH_ACCESS_TOKEN

EDUCATOR-1889
 2017-12-06 13:32:44 -05:00