Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,143 Commits 1 Branch 0 Tags
08eb8fa7c19eaff4870cd0bea6d06a80915000eb
Commit Graph

23143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carson Gee
207f3c585c Merge pull request #2196 from carsongee/cg/forum_roles_on_import_command 
Adding missing forum permissions seeding routine to xml_import
 2014-01-17 13:27:19 -08:00
Diana Huang
f051e33064 New copy and styling. 2014-01-17 16:23:13 -05:00
Ned Batchelder
9620e341a2 Merge pull request #2210 from edx/ned/i18n-docs-in-repo 
Ned/i18n docs in repo
 2014-01-17 12:27:40 -08:00
Ned Batchelder
b8a8575d17 Further edits 2014-01-17 15:27:22 -05:00
Ned Batchelder
8c79f13d17 Added more coding details to i18n doc. 2014-01-17 15:27:22 -05:00
Ned Batchelder
53de11d4b5 Conversion of page from wiki to .rst 2014-01-17 15:27:22 -05:00
Ned Batchelder
66794749fb Minor tweaks to home page. 2014-01-17 15:27:22 -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
Carson Gee
1e809a4210 Adding missing forum permissions seeding routine to xml_import 
Currently if a course is only imported from the command line the
forum permissions are not seeded, this adds that functionality
Switched to doing seeding outside of xmodule library
Switched to using course_items
Switching to simpler test class
 2014-01-17 15:17:48 -05:00
Sarina Canelake
3584b246dd Translate strings in xmodule/capa_*.py 
LMS-1744
 2014-01-17 15:01:59 -05:00
Adam
20fdb1ff6a Merge pull request #2218 from edx/adam/revert-ddt 
Revert django-debug-toolbar related updates on master, set version to 0....
 2014-01-17 12:00:03 -08:00
Jim Abramson
264bba94ea Merge pull request #2217 from edx/bug/jsa/for-203 
expand forums' search text input whenever the field receives focus.
 2014-01-17 11:48:45 -08: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
jsa
22d6c6806b expand forums' search text input whenever the field receives focus. 
JIRA: FOR-203
 2014-01-17 14:13:40 -05:00
Ned Batchelder
42c543b7ab Merge pull request #2183 from edx/ned/add-i18n-for-inputtypes 
Ned/add i18n for inputtypes
 2014-01-17 09:57:32 -08:00
Don Mitchell
e74ddf8131 Merge branch 'release' 2014-01-17 12:49:15 -05:00
Ned Batchelder
fe5d2c74f8 Use self.runtime instead of self.system 
[LMS-1597]
 2014-01-17 11:33:23 -05:00
Ned Batchelder
4aa4c514ee Add i18n attribute to LoncapaSystem 
[LMS-1597]
 2014-01-17 11:33:09 -05:00
Ned Batchelder
d2146978ea Give LoncapaProblem its own LoncapaSystem instead of ModuleSystem 
LoncapaProblem was using ModuleSystem directly, but we're about to need
i18n passed in, so this gives LoncapaProblem its own LoncapaSystem
object to better module its dependencies.  This commit simply passes
through the attributes of ModuleSystem that Loncapa needs.

[LMS-1597]
 2014-01-17 11:32:54 -05:00
zubiar-arbi
dc570859da enable tests depending on assert is_css_present(css_selector) 
STUD-1183
 2014-01-17 21:11:17 +05:00
Sarina Canelake
6c0ac477bd Merge pull request #2184 from edx/sarina/translator-documentation 
First pass at Translators guide
 2014-01-17 07:08:19 -08:00
Sarina Canelake
8395dabdf9 Add in a guide for edX Translators 
LMS-1972
 2014-01-17 09:46:35 -05:00
Will Daly
0cba92afd1 Merge pull request #2208 from edx/will/fix-devstack-django-toolbar 
Updated settings for devstack django debug toolbar
 2014-01-17 06:06:18 -08: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