Commit Graph

3357 Commits

Author SHA1 Message Date
polesye
102d1cb253 Persist student progress in video.
Student logins to edx, plays video, selects position, closes
browser, opens video, position is restored.

BLD-385
2014-02-11 13:53:24 +00:00
Oleg Marshev
79ffcb7e94 Refactor stub implementation of LTI Provider. BLD-601. 2014-02-11 12:50:22 +02:00
Ned Batchelder
ce5fd88baa Merge pull request #2488 from edx/ned/i18n-for-wiki
Finish wiki i18n
2014-02-10 17:05:44 -05:00
Don Mitchell
16f0d12a1f Merge pull request #2356 from edx/dhm/mixed_ms_wrapper
MixedModulestore wraps most getters, update_item, delete_item
2014-02-10 16:01:50 -05:00
Ned Batchelder
aff3c47754 i18n fixes for wiki templates. 2014-02-10 15:23:13 -05:00
Ned Batchelder
30aede6fb2 Merge pull request #2541 from edx/ned/remove-unused-imports
Remove unused imports.
2014-02-10 15:00:49 -05:00
Dave St.Germain
01ac04ca60 Merge pull request #2496 from edx/dcs/a11y-hide-things
For a11y, modal dialogs and script templates should be hidden...
2014-02-10 14:50:30 -05:00
Ned Batchelder
1bd213beba Remove unused imports. 2014-02-10 14:07:50 -05:00
Calen Pennington
e0f6b1a24a Merge pull request #2221 from cpennington/xblock-xml-serialization
Enable (and test) xml export of pure XBlocks
2014-02-07 16:46:46 -05:00
Jason Bau
50f7c0ebed Merge pull request #2510 from edx/jbau/fix-timezone-test-breakage
fix tests that were breaking on dev envs due to TIME_ZONE='UTC'
2014-02-07 12:28:36 -08:00
Dave St.Germain
44109d16ab For a11y, modal dialogs and script templates should be hidden from
screen readers. Also, the mathjax message should be wrapped to prevent
non-IE browsers from complaining about a feature that is IE-only.
2014-02-07 11:12:41 -05:00
Greg Price
bc0ca63f7e Avoid requesting unnecessary thread responses
The front-end code for rendering a thread always makes an AJAX request
for the resopnses, regardless of how the thread was accessed (directly
by URL or by selecting it from the thread list). Previously, when
a user accessed a thread directly by URL, the LMS would initially
request the thread from the comments service with responses, but that
response data was never actually used. Now, the responses are not
fetched with that initial query.
2014-02-07 10:50:59 -05:00
Jason Bau
fc8efc3017 fix tests that were breaking on dev envs due to TIME_ZONE='UTC' 2014-02-06 23:07:26 -08:00
Feanil Patel
716b789e06 Merge remote-tracking branch 'origin/release' 2014-02-05 17:26:39 -05:00
Don Mitchell
1de9d55844 Review-driven changes (to-be-squashed) 2014-02-05 16:34:24 -05:00
Julia Hansbrough
a0efe6e0de Make receipt-ids actually generate UUIDs
LMS-2192
2014-02-05 20:41:30 +00:00
Calen Pennington
b0bed170de Enable (and test) xml export of pure XBlocks
[LMS-179]
[LMS-209]
[LMS-1345]
2014-02-05 13:02:40 -05:00
Dave St.Germain
a6797899da Removed inappropriate section tags. Because screen readers announce each section, they should not be used unless they are actually defining meaningful sections. 2014-02-05 11:32:08 -05:00
Don Mitchell
b8ea7f3c43 update_item and other refactorings continued 2014-02-05 10:24:24 -05:00
Don Mitchell
c601b75675 MixedModulestore wraps most getters, update_item, delete_item
with code to translate between addressing schemes based on app
and persistence layer addressing scheme specification.

STUD-1206
2014-02-05 09:34:30 -05:00
Calen Pennington
6d67d0c677 Merge pull request #1949 from cpennington/xblock-studio-js-and-css
Enable XBlock js and css in Studio
2014-02-05 08:19:45 -05:00
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
Julia Hansbrough
aeb7bbf260 Merge pull request #2461 from edx/flowerhack/fix/csv-using-read-replica
Fixed 500ing CSV reports
2014-02-04 11:56:54 -08:00
Usman Khalid
0eb9c34341 Merge pull request #2396 from edx/usman/lms2090-instructor-task-transactions
instructor_task: Distribute extra items among subtasks of last query.
2014-02-04 11:17:20 -08:00
Usman Khalid
95a112a3dd instructor_task: Distribute extra items among subtasks of last query.
When creating an instructor task total_num_items may change between the
time it and the number of subtasks is calculated and the time the
subtasks are actually queued (all of this cannot happen in one transaction).
In such a case the extra items are distributed among the subtasks of the
last query.

LMS-2090
2014-02-04 23:30:02 +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
Julia Hansbrough
891465d1b0 Fixed 500ing CSV reports 2014-02-04 16:38:08 +00: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
Calen Pennington
49217ebe8b Allow multiple client-side runtimes on a single page
Make XBlock client-side runtimes proper classes, so that handlerUrl can
be defined in a per-runtime way, and we can have multiple runtimes on a
single page.

[LMS-1630][LMS-1421][LMS-1517]
2014-02-04 08:55:36 -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
Jay Zoldak
5ab0c9adb5 Mark strings that were causing test failures as unicode 2014-02-03 12:52:45 -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
Julia Hansbrough
cac83948b1 Merge pull request #2156 from edx/flowerhack/feature/basic-reverify-flow
Follow-On Verification
2014-01-31 14:51:16 -08:00
Julia Hansbrough
17869c5eee Midcourse reverification: i18n fixes
Fixed i18n in templates
2014-01-31 22:20:33 +00:00
Julia Hansbrough
e50ef39bee Midcourse reverification: Events 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
Jay Zoldak
9c4a9d8f64 Make code safe for unicode course ids 2014-01-31 16:35:56 -05: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
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
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
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
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
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