Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,585 Commits 1 Branch 0 Tags
24232dbc8f9e4e8ce371a287d34904b8663e893f
Commit Graph

3268 Commits

Author SHA1 Message Date
Jason Bau
d9f98b84b7 Merge pull request #2226 from edx/jbau/resubscribe-notifer 
resubscribe feature for notifier
 2014-01-23 10:29:00 -08:00
Anton Stupak
5bacfcc32b Merge pull request #2045 from edx/anton/video-merge-fields 
Merge "video sources" and "download video" into the same field
 2014-01-23 09:31:11 -08:00
Jay Zoldak
538ecf4852 Enable microsite tests 
Move microsite test assets to common/test

Rename helper method to not have test in the name
Rename test css file
 2014-01-23 10:42:51 -05:00
polesye
645007f910 BLD-364: Merge "video sources" and "download video" fields. 2014-01-23 11:27:28 +02:00
Carson Gee
ef8671ad7e Merge pull request #2263 from carsongee/cg/gitlog_course_not_found_exception 
Correct exception raising bug for non global staff accessing missing course git logs
 2014-01-22 12:25:58 -08:00
Carson Gee
f688fd319c Merge pull request #2262 from carsongee/cg/improved_git_import_debug_logging 
Add additional logging for importing course from git
 2014-01-22 12:12:50 -08:00
Anton Stupak
2ef095d9b5 Merge pull request #2149 from edx/anton/video-download-transcript 
Allows students to download the transcript of the video without timecodes
 2014-01-22 12:03:41 -08:00
Carson Gee
7d86124586 Add additional logging for importing course from git 2014-01-22 14:22:06 -05:00
Carson Gee
3aecac7adb Correct exception raising bug for non global staff accessing missing course git logs 2014-01-22 14:03:06 -05:00
Jason Bau
dfacbbdd69 Notifier re-subcribe via link 
* fix assertPrefValid in tests to decrypt instead of compare
* rename unsubscribe -> set_subscribe
 2014-01-22 09:54:27 -08:00
polesye
4a36fa892b BLD-368: Turn "download transcript" into a dropdown. 2014-01-22 18:25:03 +02:00
Calen Pennington
4d4288f418 Merge pull request #2249 from cpennington/non-ascii-course-images 
Fix non-ascii course image names
 2014-01-22 07:50:13 -08:00
Diana Huang
5a16817e3c Remove authority name from url. 2014-01-22 10:05:17 -05:00
Calen Pennington
a6035698d5 Correctly compute course image location when using mongo modulestore 
[LMS-2073]
[STUD-1197]
 2014-01-22 07:17:40 -05:00
Calen Pennington
923c2ff46e Add failing tests for course image names 
Tests LMS-2073 (non-ascii course image names) and STUD-1197 (spaces in
course image names)
 2014-01-22 07:16:30 -05:00
Greg Price
f5bdec8ae9 Merge pull request #2204 from edx/gprice/mustache-i18n 
Internationalize forums mustache templates
 2014-01-21 13:49:41 -08:00
Greg Price
f75a7e08cd Internationalize forums mustache templates 2014-01-21 15:57:57 -05:00
David Ormsbee
42e0ec403e Merge pull request #2251 from edx/release 
Merging Release 2014-01-21
 2014-01-21 12:41:05 -08:00
Don Mitchell
003ad76c64 Merge pull request #2209 from edx/db/lms_date_agnostic 
Detached categories don't access control on date
 2014-01-19 08:46:28 -08:00
Jason Bau
8abfdc6309 add undo (resub) to landing page of forum unsub link 2014-01-17 18:07:33 -08:00
Don Mitchell
d999d0af1b Detached categories don't access control on date 2014-01-17 17:53:14 -05:00
Sarina Canelake
3584b246dd Translate strings in xmodule/capa_*.py 
LMS-1744
 2014-01-17 15:01:59 -05:00
Chris Dodge
c9718380ea catch additional FEATURE['ENABLE_MKTG_SITE'] checks and make sure MicrositeConfigurations will override the global setting 
one more faulty login regarding ENABLE_MKTG_SITE=true situations
 2014-01-16 17:04: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