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

20833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
aa105d7a58 translate component tooltips 2014-01-31 14:17:22 -05:00
David Baumgold
597474955b tabs to spaces 2014-01-31 14:15:44 -05:00
srpearce
b95d71ff46 Merge pull request #2390 from edx/markhoeber/documentation/google-hangouts 
Markhoeber/documentation/google hangouts
 2014-01-31 10:51:15 -08:00
Sylvia Pearce
5df7a62b42 Correct a few typos 2014-01-31 13:49:46 -05:00
Will Daly
73cc15fce5 Merge pull request #2389 from edx/will/stabilize-ora-ai-test 
Increase timeout for ORA get feedback promise in bok-choy test.
 2014-01-31 08:11:09 -08:00
David Baumgold
437a389d3c Merge pull request #2378 from glowe/fix-testing-document-link 
Fix link to testing document.
 2014-01-31 08:02:41 -08:00
frances botsford
c938c0adfa Merge pull request #2369 from tusbar/tabindex-login 
Prevent from tabbing on lostpassword link in login page
 2014-01-31 07:46:04 -08:00
Jay Zoldak
9cfd649c08 Merge pull request #2137 from abdoosh00/feature/unicode 
Unicode changes to support R to L script
 2014-01-31 06:48:01 -08:00
Mark Hoeber
48d2b20fdd New chapter for instant hangouts 2014-01-31 09:46:12 -05:00
Will Daly
a8a96d3a44 Increase timeout for ORA get feedback promise in bok-choy test. 2014-01-31 09:11:31 -05:00
chrisndodge
7dbec60829 Merge pull request #2384 from edx/chrisndodge/wire-in-aws-settings 
wire in env settings into aws.py for session inactivity timeouts
 2014-01-31 04:00:57 -08:00
Usman Khalid
6b346a30de Merge pull request #2275 from edx/usman/lms1494-progress-page-value-errors 
For capa modules if weight is 0 don't try to create Progress objects.
 2014-01-31 02:18:16 -08:00
Usman Khalid
ef07e1ed15 For capa if weight is 0 don't try to create Progress objects. 
LMS-1494
 2014-01-31 14:30:51 +05:00
Ned Batchelder
593e8d23db Merge pull request #2385 from edx/ned/fix-pathological-po-growth 
Fix pathological po growth
 2014-01-30 19:45:51 -08:00
davestgermain
5122c292c7 Merge pull request #2343 from edx/dstgermain/a11y-page-titles 
Added more descriptive page titles.
 2014-01-30 14:33:48 -08:00
Dave St.Germain
636eab8b9e Added more descriptive page titles. 2014-01-30 17:32:03 -05:00
Ned Batchelder
79e137c8bd Fix pathological po growth 2014-01-30 16:44:04 -05:00
Chris Dodge
7cd343e031 wire in env settings into aws.py 2014-01-30 16:38:43 -05:00
Will Daly
75bd860a5a Merge pull request #2311 from edx/will/cache-test-db-migrations 
Cache databases to speed up acceptance tests
 2014-01-30 13:32:32 -08:00
Jay Zoldak
bc30addfb9 Unicode changes to support QRF 
fixing unit tests

fixing merge error

fixing xqueue submission issue with unicode url (trial 0.1)

fixing fotmats as commented upon

removing yaml file language selection

Unicode changes to support QRF

removed unnecessary pass in modulestore/init.py

fixing merge error

fixing fotmats as commented upon

removing yaml file language selection

fixing pep8 violations

- fixing pylint violations

pylint violation

fixing line spaces and formats

ignore pylint E1101

remove empty line

fixing pylint violations

 pep8 violations

bulk mail unicode/decode

fix migration error

fix pep8 just to push again

more unicode/decode
Final changes to comments and error messages.
 2014-01-30 16:20:36 -05:00
chrisndodge
5951eb8dae Merge pull request #2379 from edx/chrisndodge/lock-accounts-after-failed-attempts 
Add AWS.py configuration hooks to tie in login failure lockout parameters
 2014-01-30 13:08:48 -08:00
chrisndodge
1ff4671b8f Merge pull request #2312 from edx/cdodge/password-complexity-policy 
Optional Password Policy enforcement
 2014-01-30 12:59:04 -08:00
Graham Lowe
eaa98b2ef8 Add myself as contributor. 2014-01-30 15:45:51 -05:00
Chris Dodge
cdf8b7cf16 add aws.py hooks 2014-01-30 15:38:02 -05:00
Chris Dodge
0d49305c4d add ability to have an optional password policy enforcement on account creation 2014-01-30 15:32:05 -05:00
David Baumgold
1c4d852e13 Merge pull request #2372 from edx/db/create-account-proper-status-code 
Use status code 400 when there is a validation error in creating an account
 2014-01-30 12:24:06 -08:00
David Baumgold
751669cbe7 /create_account: use proper HTTP status codes 
Use status code 400 when there is a validation error in creating an account.
 2014-01-30 15:23:57 -05:00
David Baumgold
7b4ea225da Remove periods from error messages 2014-01-30 15:23:57 -05:00
Graham Lowe
47b333dbba Fix link to testing document. 2014-01-30 15:19:04 -05:00
Giulio Gratta
ead1e2329a Merge pull request #2245 from edx/giulio/instructor-forum-role-info 
Note to Instructors on Regular & Beta Dashboard
 2014-01-30 11:09:22 -08:00
Sarina Canelake
b2fb45e6ff Merge pull request #2373 from edx/sarina/fix-course-authorization 
Force unique course_id for bulk email authorization
 2014-01-30 11:00:01 -08:00
Sarina Canelake
640b100200 Force unique course_id for bulk email authorization 
LMS-2134
 2014-01-30 13:59:13 -05:00
David Baumgold
c1e6acd79c Merge pull request #2376 from edx/db/fix-studio-signup-form-action 
/register_post is an invalid URL
 2014-01-30 10:48:02 -08:00
David Baumgold
6c40951cbb /register_post is an invalid URL 2014-01-30 13:42:47 -05:00
Giulio Gratta
300d55cbd5 Note to Instructors on Regular & Beta Dashboard 
- Added note to instructors on Forum Admin page of Instructor Dashboard.
- Made Role Info divs permanently displayed, but under the user list.
 2014-01-30 10:36:05 -08:00
Diana Huang
b3f643a6ff Merge pull request #2371 from edx/diana/linkedin-from 
Change the from address for LinkedIn emails
 2014-01-30 09:49:05 -08:00
Sef Kloninger
952f75909e Merge pull request #2363 from edx/sef/forum_reload_errmsg 
improve error reporting for reload_forum_users cmd (one-liner)
 2014-01-30 09:00:31 -08:00
Diana Huang
5cfb42fc0f Change the from address for LinkedIn emails 2014-01-30 11:58:28 -05:00
Sef Kloninger
5546a7fe12 improve error reporting for reload_forum_users cmd 
If this management command fails it's tough to figure out why without
seeing the text from the exception.  Luckily comment service does
return useful feedback, we just have to show it.  This one-line
change just add the exception text to the error message.

Before (with spurrious debug msgs removed):

    sefk@util1:~$ ./manage.sh reload_forum_users Anthonyhubendurance
    update user info to discussion failed for user with id: Anthonyhubendurance

After:

    sefk@util1:~$ ./manage.sh reload_forum_users Anthonyhubendurance
    update user info to discussion failed for user with id: Anthonyhubendurance, error=u'["Email is already taken"]'

No unit testing (sorry) added since this doesn't have coverage
already, and it's just a simple error case.
 2014-01-30 08:36:23 -08:00
Brian Talbot
43b4cd405d Merge pull request #2359 from edx/talbs/lms-fix-oldhomepage 
LMS: Quick Clean Up of Old Index
 2014-01-30 07:57:46 -08:00
Bertrand Marron
0be4147189 Prevent from tabbing on lostpassword link in login page 2014-01-30 16:41:00 +01:00
chrisndodge
1b7e144beb Merge pull request #2331 from edx/chrisndodge/lock-accounts-after-failed-attempts 
Ability to lock out accounts for N seconds after M failed login attempts
 2014-01-30 07:34:06 -08:00
Chris Dodge
3554c52a20 update test to reflect that the non-microsite homepage has been changed to remove all the partnership content 2014-01-30 10:26:13 -05:00
Brian Talbot
26eefc94c5 LMS: removes broken home header image and replaces with basic gradient background 
LMS-2121
 2014-01-30 10:26:13 -05:00
Brian Talbot
9f8f80b5e9 LMS: removes unused and broken university partner images from old homepage UI 
LMS-2121
 2014-01-30 10:26:12 -05:00
Christina Roberts
088a713788 Merge pull request #2330 from edx/christina/export-commands 
Export conversion script
 2014-01-30 06:59:22 -08:00
David Baumgold
08fb49506a Merge pull request #2302 from edx/db/django-command-migrate-to-split 
Django command for migrating courses to split-mongo (and deleting)
 2014-01-30 06:51:27 -08:00
cahrens
2ee964345f Convert between export formats. 
STUD-1196
 2014-01-30 09:22:43 -05:00
Oleg Marshev
31593699e5 Merge pull request #2080 from edx/oleg/lti_add_roles 
Add role parameter to LTI. BLD-583.
 2014-01-30 05:13:06 -08:00
Oleg Marshev
13c19c98e2 Add role parameter to LTI. BLD-583. 2014-01-30 14:37:33 +02:00