Commit Graph

603 Commits

Author SHA1 Message Date
Julia Hansbrough
64f1cae64b Merge pull request #2419 from edx/talbs/lms-languagemenu
LMS: Adds Language Selection Menu
2014-02-14 18:32:12 -05:00
thedeadparrot
b61649f9eb Refactor out new lang_pref djangoapp 2014-02-14 22:35:14 +00:00
thedeadparrot
afdd8d68cb Better dashboard display behavior
* Don't show sidebar if only one language is present
* only add in the default language code if it's not already present
2014-02-14 22:35:13 +00:00
thedeadparrot
48686793d7 Clean up tests. 2014-02-14 22:35:12 +00:00
Diana Huang
a07d243fdb Clean up the display and dialog to use user preferences
instead of the current language.
2014-02-14 22:35:11 +00:00
Diana Huang
e94b1a5cfa If we run into issues with languages, use default 2014-02-14 22:35:10 +00:00
Will Daly
c85c4b22ed Revert "Replace rake functions with python paver functions"
This reverts commit df2e410f2a.
2014-02-14 14:25:28 -05:00
David Glance
df2e410f2a Replace rake functions with python paver functions
Deprecated rake functions issue a warning and then call paver
replacements

Bring Paver commands up to date with master for servers, assets, and docs.
Revert deprecation of quality, tests, and i18n for a future pull request.
Deprecate workspace migration
2014-02-14 11:25:55 -05:00
Ned Batchelder
b23e9fb62f Merge pull request #2405 from edx/ned/remove-massemail
Remove unused massemail commands.
2014-02-14 10:50:57 -05:00
Julia Hansbrough
d867e87b72 Acceptance test for language selector
Tests language selection feature for student dashboard
2014-02-14 10:32:11 -05:00
Julia Hansbrough
cb6b52f890 wiring for language selector 2014-02-14 10:32:10 -05:00
cahrens
09d90b16af Clean up of modulestore references (primarly LMS).
STUD-1151
2014-02-11 14:29:22 -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
David Baumgold
1dfd3310f7 Refactor student views
Fix pylint/pep8 warnings, use JsonResponse instead of HttpResponse where useful,
put in TODOs to change HTTP status codes to be more accurate.
2014-02-10 14:50:57 -05:00
Feanil Patel
95f31e5036 Merge remote-tracking branch 'origin/release' 2014-02-07 17:07:29 -05:00
David Baumgold
e52c9b515f Missed some places to change the registration response status code
LMS-2203
2014-02-07 14:29:11 -05:00
Feanil Patel
3731144dc6 Only move students if they aren't in the new course. 2014-02-05 14:32:59 -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
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
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
Ned Batchelder
ddf377cfb9 Remove unused massemail commands. 2014-02-01 07:41:16 -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
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
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
Chris Dodge
8c60f2935a Add optional feature to lock out accounts after N failed login attempts. Lockouts will last M seconds.
add DB migration and fix earlier mistakes in student migration history

add tests and fix bugs that came out of those unit tests

remove unused import

pep8/pylint

address some PR feedback

fix tests

fix broken test

try to mock time

use freeze-gun to overload the system time to simulate the future
2014-01-29 16:54:28 -05:00
chrisndodge
7162aa66f3 Merge pull request #2285 from antoviaque/registration-extra-fields
Registration extra fields: Selectively require/hide registration fields & add optional country/city fields
2014-01-29 08:09:53 -08:00
Calen Pennington
8424f610d5 Merge pull request #2171 from cpennington/pylint-cleanup
Fix pylint violations from #2129
2014-01-29 06:38:17 -08:00
Xavier Antoviaque
386115aecf Selectively require/hide registration fields & add country/city fields
Extend the capabilities of the REGISTRATION_OPTIONAL_FIELDS
configuration variable, to allow to select, for each individual field,
if it should be 'hidden', 'optional' or 'required'.

Rename the configuration variable to REGISTRATION_EXTRA_FIELDS to reflect
the additional capabilities, and updates the defaults.

As extra fields, configurable through the REGISTRATION_EXTRA_FIELDS
variable. Hidden by default.

Tickets: MCKIN-168 MCKIN-184

Note: Studio also has a registration page, which uses the same account
creation page. It should be possible to use it without requiring the
variable from the LMS, as the fields are different.
2014-01-29 09:01:28 -05:00
Don Mitchell
14be0b6c7a Cache course location translations 2014-01-28 10:34:31 -05:00
daniel cebrian
7e2652b5a8 annotation tools
First set of fixes from the pull request

This does not include some of the testing files. The textannotation and
videoannotation test files are not ready. waiting for an answer on the
issue.

Deleted token line in api.py and added test for token generator

Added notes_spec.coffee

remove spec file

fixed minor error with the test

fixes some quality errors

fixed unit test

fixed unit test

added advanced module

Added notes_spec.coffee

remove spec file

Quality and  Testing Coverage

1. in test_textannotation.py I already check for line 75 as it states
in the diff in line 43, same with test_videoanntotation
2. Like you said, exceptions cannot be checked for
firebase_token_generator.py. The version of python that is active on
the edx server is 2.7 or higher, but the code is there for correctness.
Error checking works the same way.
3. I added a test for student/views/.py within tests and deleted the
unused secret assignment.
4. test_token_generator.py is now its own file

Added Secret Token data input

fixed token generator

Annotation Tools in Place

The purpose of this pull request is to install two major modules: (1) a
module to annotate text and (2) a module to annotate video. In either
case an instructor can declare them in advanced settings under
advanced_modules and input content (HTML in text, mp4 or YouTube videos
for video). Students will be able to highlight portions and add their
comments as well as reply to each other. There needs to be a storage
server set up per course as well as a secret token to talk with said
storage.

Changes:
1. Added test to check for the creation of a token in tests.py (along
with the rest of the tests for student/view.py)
2. Removed items in cms pertaining to annotation as this will only be
possible in the lms
3. Added more comments to firebase_token_generator.py, the test files,
students/views.py
4. Added some internationalization stuff to textannotation.html and
videoannotation.html. I need some help with doing it in javascript, but
the html is covered.

incorporated lib for traslate

fixed quality errors

fixed my notes with catch token

Text and Video Annotation Modules - First Iteration

The following code-change is the first iteration of the modules for
text and video annotation.

Installing Modules:
1. Under “Advanced Settings”, add “textannotation” and
“videoannotation” to the list of advanced_modules.
2. Add link to an external storage for annotations under
“annotation_storage_url”
3. Add the secret token for talking with said storage under
“annotation_token_secret”

Using Modules
1. When creating  new unit, you can find Text and Video annotation
modules under “Advanced” component
2. Make sure you have either Text or Video in one unit, but not both.
3. Annotations are only allowed on Live/Public version and not Studio.

Added missing templates and fixed more of the quality errors

Fixed annotator not existing issue in cmd and tried to find the get_html() from the annotation module class to the descriptor

Added a space after # in comments

Fixed issue with an empty Module and token links

Added licenses and fixed vis naming scheme and location.
2014-01-27 13:47:58 -05:00
Don Mitchell
9d6ed66e24 Add loc mapper fn from locn to CourseLocator 2014-01-22 11:49:03 -05:00
Don Mitchell
32e0021260 Create mapping for previously unmapped locations in order to get
course_id

STUD-1212
2014-01-21 13:10:07 -05:00
Don Mitchell
3885e6cf78 Merge branch 'release'
Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html
2014-01-16 12:51:22 -05:00
Will Daly
ca180834dc Merge pull request #2128 from edx/will/bok-choy-fixtures-rebase
Bok-choy fixtures, Studio tests, and (some) ORA tests
2014-01-15 12:18:47 -08:00
Calen Pennington
79e1dae0e7 Fix pylint violations from #2129 2014-01-15 11:05:56 -05:00