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

7372 Commits

Author SHA1 Message Date
jsa
168445f7c8 i18n: extract strings from underscore templates 
JIRA: FOR-400
 2014-01-22 11:07:35 -05:00
Greg Price
e634586882 Merge pull request #2222 from edx/gprice/forum-new-post-buttons 
Fix forum buttons
 2014-01-22 08:04:35 -08: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
Jason Bau
4e413e4ecb Merge pull request #2190 from edx/jbau/fix-preview-config 
move HOSTNAME_MODULESTORE_DEFAULT_MAPPING to lms.envs.aws (not lms.envs....
 2014-01-21 13:26:10 -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
Diana Huang
d220aaca66 Minor copy change requested by linkedin. 2014-01-21 09:14:00 -05: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
Don Mitchell
d999d0af1b Detached categories don't access control on date 2014-01-17 17:53:14 -05:00
Sarina Canelake
7f74297810 Merge pull request #2219 from edx/sarina/i19-capa-new 
i19 base capa strings
 2014-01-17 14:41:05 -08:00
Greg Price
60fb3cfbb2 Make forum New Post buttons behave as buttons 
JIRA: FOR-205
 2014-01-17 16:38:51 -05:00
Diana Huang
f051e33064 New copy and styling. 2014-01-17 16:23:13 -05:00
Adam
439037d827 Merge pull request #2084 from edx/adam/remove_unsure_button 
removes unsure button (ORA-254)
 2014-01-17 12:24:43 -08:00
Sarina Canelake
3584b246dd Translate strings in xmodule/capa_*.py 
LMS-1744
 2014-01-17 15:01:59 -05:00
Adam Palay
013549a39e removes unsure button (ORA-254) 2014-01-17 14:41:54 -05:00
Adam Palay
981a7f9479 Revert django-debug-toolbar related updates on master, set version to 0.9.4 
(STUD-1201)

Revert "Specific django-toolbar version (stable released) and update the panels in dev envs"

This reverts commit a465b082da.

Revert "Updated settings for devstack django debug toolbar"

This reverts commit 30199e8a61.
 2014-01-17 14:17:38 -05:00
Will Daly
30199e8a61 Updated settings for devstack django debug toolbar 2014-01-16 18:53:11 -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
0726211a30 Use S3 uploaded image for e-mail button. 
Add in a tracking pixel.

Add in alt text for profile image
 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
Diana Huang
469fab5875 Update copy for LinkedIn e-mail. 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
ed64817644 Use correct linkedin button. 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
5803b2e3d3 Don't use linkedin app by default. 2014-01-16 17:03:13 -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