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

7399 Commits

Author SHA1 Message Date
chrisndodge
3f43fb6436 Merge pull request #1967 from edx/feature/cdodge/cap-num-enrollments 
Add ability to cap number of enrollments in a course
 2014-02-04 13:38:52 -08:00
Chris Dodge
ad7348ec11 Allow author to cap enrollments in course 
add a test case for enrollment caps

pep8 fix
 2014-02-04 15:32:36 -05:00
Will Daly
cca5b2b63b Merge pull request #2452 from edx/will/pages-setup-script 
Updated bok choy page objects setup.py
 2014-02-04 12:10:07 -08:00
Will Daly
079f3aa5f4 Updated bok choy page objects setup.py 
Fix bug in url method of register page object
Add dist directories to gitignore
 2014-02-04 14:32:42 -05:00
Carson Gee
69097e7b4a Merge pull request #2032 from carsongee/cg/ssl-studio 
More fully integrate and test ssl external auth in CMS
 2014-02-04 09:54:17 -08:00
Carson Gee
8cbe263ca0 Rename of feature AUTH_USE_MIT_CERTIFICATES to AUTH_USE_CERTIFICATES across platform. 
Caution! This is backwards incompatible
 2014-02-04 10:50:48 -05:00
Feanil Patel
5e5c59cab2 Merge remote-tracking branch 'origin/release' 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml.py

Took the changes that were on the release branch.
 2014-02-03 16:39:40 -05:00
Diana Huang
0ee9a72465 Merge pull request #2432 from edx/diana/error-module-i18n 
Clean up strings in the ErrorModule
 2014-02-03 12:57:14 -08:00
Calen Pennington
a3146cd7aa Merge pull request #2388 from cpennington/initial-languages 
Add initial languages, ready for dark-launch
 2014-02-03 11:52:32 -08:00
Will Daly
9fd0fbc783 Merge pull request #2430 from edx/will/fix-bok-choy-register-test 
Fix find courses page title in bok choy test suite
 2014-02-03 11:07:19 -08:00
Carson Gee
2bf6df23c8 More fully integrate and test ssl external auth in CMS 2014-02-03 14:00:40 -05:00
Dave St.Germain
cb7882e0c8 Added test for template tag and breadcrumb function. 2014-02-03 12:01:28 -05:00
Sarina Canelake
7718608741 Fix unicode error in subsection 2014-02-03 12:01:28 -05:00
Diana Huang
40deaa509e Clean up strings in the ErrorModule 2014-02-03 11:56:10 -05:00
Greg Price
4e1c595472 Merge pull request #2377 from edx/gprice/forum-thread-pagination 
Add pagination of responses to forum threads
 2014-02-03 08:55:20 -08:00
Will Daly
8b3538150b Fix find courses page title in bok choy test suite 2014-02-03 11:42:23 -05:00
Calen Pennington
d00314c8bc Handle mixed case language codes coming from the browser or in dark-lang configuration 2014-02-03 11:32:49 -05:00
Calen Pennington
994dde910b Add failing test for different capitalizations of language codes coming from the browser 2014-02-03 11:32:49 -05:00
Will Daly
eae4adeb9b Merge pull request #2361 from edx/will/bok-choy-upgrade-and-lms-tests 
Bok-choy upgrade, LMS tests, cleanup
 2014-02-03 08:11:03 -08:00
Greg Price
5e48aece64 Merge pull request #2392 from edx/gprice/fix-unread-tooltip 
Fix unread comment count tooltip rendering
 2014-02-03 08:05:54 -08:00
Greg Price
062025eeec Add pagination of repsonses to forum threads 
Users will first be shown the first 25 responses of a viewed thread and
then have the option of loading 100 more at a time until all responses
have been loaded. This mitigates the performance impact of very large
threads by avoiding the need to render and transfer over the network
all content of a large thread at once. It will also allow students with
slower browsers to interact with large threads even if they cannot load
all of the responses.
 2014-01-31 18:17:04 -05:00
Julia Hansbrough
17869c5eee Midcourse reverification: i18n fixes 
Fixed i18n in templates
 2014-01-31 22:20:33 +00:00
Julia Hansbrough
69b5b033fd Midcourse reverifications: dismissal banner 
Added a banner that students can use to dismiss the "you have failed reverification" message.  Also, removed unused code, wired up the sidebar for design
 2014-01-31 22:20:32 +00:00
Julia Hansbrough
3aa80654cb Midcourse reverification: fixing broken tests 
Also, refactored code representing ReverifyInfo
 2014-01-31 22:08:09 +00:00
Julia Hansbrough
3e1519c62a Midcourse reverification: increased quality 
Also, removed an unused template
 2014-01-31 22:08:09 +00:00
Julia Hansbrough
0b7594178b Moved reverification windows into common 
Added verification sidebar, banner for major courseware sections, quality & test improvements
 2014-01-31 22:08:08 +00:00
Julia Hansbrough
bf210398e6 Tests and cleanup 
Improved tests, fixed javascript for photocapture, removed extraneous photocapture code, added time & course numbers to templates for design
 2014-01-31 21:48:36 +00:00
Frances Botsford
6c7d715e0e re-verification dashboard styles 2014-01-31 21:48:35 +00:00
Julia Hansbrough
85030467ed Skeleton for follow-on verification behavior 
Quick-and-dirty end-to-end flow, functional for at least the case of one course in need of re-verification.

Ready for design to start taking a look; still needs tests and code cleanup
 2014-01-31 21:08:24 +00:00
Will Daly
e859a37001 Fix an issue with cache being cleared for bok_choy fast test 
Change text in bok_choy scripts to green
Added feedback check for AI-assessment test
Added peer assessment feedback test
Updated Studio/LMS page objects and tests to use bok-choy v0.1.0
Added LMS bok-choy tests from e2e repo
 2014-01-31 14:33:24 -05:00
Chris Rossi
0a1ed11daa Make mako template lookups pluggable. 
This code adds the ability to add Mako template lookup directories on
the fly, allowing third party add-ons to contribute their own Mako templates.
A new API function for registering Mako templates is introduced::

    from edxmako import add_lookup

    add_lookup('main', '/path/to/templates')

    # Or, specify a package to lookup using pkg_resources.  This will
    # add the 'templates' directory inside the current package:
    add_lookup('main', 'templates', package=__name__)
 2014-01-31 13:55:36 -05:00
Greg Price
285d3579bb Fix unread comment count tooltip rendering 
JIRA: FOR-434
 2014-01-31 13:30:39 -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
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
Will Daly
a8a96d3a44 Increase timeout for ORA get feedback promise in bok-choy test. 2014-01-31 09:11:31 -05: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
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
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
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
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
Adam Palay
5372bcff51 Detached pages from XML courses are set to appropriate descriptor class (LMS-2094) 
Add tests
 2014-01-30 13:52:07 -05: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
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
13c19c98e2 Add role parameter to LTI. BLD-583. 2014-01-30 14:37:33 +02:00
Waheed Ahmed
d12e7e8877 Fixed allowing for execution of arbitrary Javascript in student response. 
ORA-256
 2014-01-30 16:17:48 +05:00