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

45 Commits

Author SHA1 Message Date
Calen Pennington
155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py
 2014-05-09 15:29:32 -04:00
Calen Pennington
cd746bf8e5 Make course ids and usage ids opaque to LMS and Studio [partial commit] 
This commit adds the non-courseware lms/djangoapps and lms/lib.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
 2014-05-08 12:09:23 -04:00
Adam Palay
8ad4cdb366 factor out google analytics ids (LMS-2555) 2014-04-28 16:47:17 -04:00
Diana Huang
5cfb42fc0f Change the from address for LinkedIn emails 2014-01-30 11:58:28 -05:00
Diana Huang
5a16817e3c Remove authority name from url. 2014-01-22 10:05:17 -05:00
David Ormsbee
77a315c6a3 Minor data collection tweaks after examining prod course data. 
Add in unicode handling for names.
 2014-01-16 17:03:15 -05:00
Diana Huang
2b6651529a Add in test to test the transactions when we hit an unexpected error. 
Add tests for various error mail sending scenarios
 2014-01-16 17:03:15 -05:00
David Ormsbee
cc1d796b73 Add email send error checking. 
Add manual transaction handling.

Remove grandfather option
 2014-01-16 17:03:15 -05:00
Diana Huang
fdf531aec0 Migrations for LinkedIn. 
Clean up common.

Add the ability to dry-run the command without sending e-mail.

Don't save courses sent during a dry run

Switch to EmailMessage for LinkedIn so we can send HTML emails

Update subject copy.

Use correct name for CertificationName

Fix up certificate url information.
 2014-01-16 17:03:15 -05:00
David Ormsbee
db7308adc1 Remove unused parts of LinkedIn API 
Fix whitelist logic to handle empty lists.
 2014-01-16 17:03:15 -05:00
Diana Huang
f37001275a Clean up the e-mail settings. 2014-01-16 17:03:15 -05:00
Diana Huang
a3f1f6600d Integrate new LinkedIn e-mail template 2014-01-16 17:03:15 -05:00
David Ormsbee
a18bce81f2 Basic cleanup of code to determine whether a user has a LinkedIn account. 2014-01-16 17:03:15 -05:00
Chris Rossi
1a5eb086c9 Remove stray 'I' from generated URL. 2014-01-16 17:03:15 -05:00
Chris Rossi
33f7611341 It looks like LinkedIn pfCertFuture as the date a certificate expires. 
We were using to indicate the date a course ended.  Better to remove it,
since edX certificates don't really expire.
 2014-01-16 17:03:14 -05:00
Chris Rossi
c2651497a2 Pylint 2014-01-16 17:03:14 -05:00
Chris Rossi
f286296568 pep8 2014-01-16 17:03:14 -05:00
Chris Rossi
c5c9554dbc Test LinkedinAPI 2014-01-16 17:03:14 -05:00
Chris Rossi
cf98cb63d6 Squash warning. 2014-01-16 17:03:14 -05:00
Chris Rossi
38ad26d594 Test --force. 2014-01-16 17:03:14 -05:00
Chris Rossi
0a5c25c6ea 100% test coverage for mailusers. 2014-01-16 17:03:14 -05:00
Chris Rossi
fd1d98f7de Fix tests, one bug. Adopt a more Django-ish testing style. 2014-01-16 17:03:14 -05:00
Chris Rossi
dc5dfe6259 Some docs. 2014-01-16 17:03:14 -05:00
Chris Rossi
cf4ae1615b Disambiguate script names. Unfortunately verbose. 2014-01-16 17:03:13 -05:00
Chris Rossi
d7d7327d2b Allow force checking, disregarding LinkedIn's rules. 2014-01-16 17:03:13 -05:00
Chris Rossi
dffa8c6624 LinkedIn API finally works. 2014-01-16 17:03:13 -05:00
Chris Rossi
76b15eae65 Get json data. 2014-01-16 17:03:13 -05:00
Chris Rossi
46657b8f35 Grandfather email. 2014-01-16 17:03:13 -05:00
Chris Rossi
9755216a61 Use whitelist for testing. 2014-01-16 17:03:13 -05:00
Chris Rossi
35fdbf3a1c Send mail. 2014-01-16 17:03:13 -05:00
Chris Rossi
5d7befdebe Generate certificate URLs. 2014-01-16 17:03:13 -05:00
Chris Rossi
bb43d4cae4 House cleaning. 2014-01-16 17:03:13 -05:00
Chris Rossi
ec2678a5c5 Refactor LinkedIn API code to common location for reuse. 2014-01-16 17:03:13 -05:00
Chris Rossi
dc9c52d757 Pep8, pylint. 2014-01-16 17:03:13 -05:00
Chris Rossi
2f9e9e2494 Refactor findusers script to be fully lazy, in hopes we don't run out of memory with huge numbers of users. 2014-01-16 17:03:12 -05:00
Chris Rossi
411d39deea Script to log in to LinkedIn API. 2014-01-16 17:03:12 -05:00
Chris Rossi
b2db05fc89 Initial stab at placeholder email template. 2014-01-16 17:03:12 -05:00
Chris Rossi
fc17ed26d4 Properly handle already emailed courses. 2014-01-16 17:03:12 -05:00
Chris Rossi
2468c99c52 Test grandfather path. 2014-01-16 17:03:12 -05:00
Chris Rossi
2d5c4dae52 Test coverage. 2014-01-16 17:03:12 -05:00
Chris Rossi
e34d131f70 Skeleton for emails script. 2014-01-16 17:03:12 -05:00
vagrant
883563d8df Test max_calls == 0 2014-01-16 17:03:12 -05:00
Chris Rossi
a5d1cb3592 pep8 and pylint 2014-01-16 17:03:12 -05:00
Chris Rossi
64887c6870 Flesh out findusers script, except for LinkedIn API call, with tests. 2014-01-16 17:03:12 -05:00
Chris Rossi
cc53aab4ec Initial app and model for LinkedIn integration. 2014-01-16 17:03:12 -05:00