Commit Graph

7447 Commits

Author SHA1 Message Date
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
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
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
Oleg Marshev
13c19c98e2 Add role parameter to LTI. BLD-583. 2014-01-30 14:37:33 +02:00
Anton Stupak
a077dc815c Merge pull request #2352 from edx/anton/fix-persist-speed-per-video
Video: Fix speed persistence per video.
2014-01-30 00:04:31 -08: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
Matt Drayer
d35667384a Merge branch 'release'
Conflicts:
	requirements/edx/base.txt
2014-01-29 16:19:30 -05:00
Jim Abramson
74067b80e3 Merge pull request #2266 from edx/jsa/forums-response-button
add "Add A Response" button to thread views in discussion tab / inline
2014-01-29 11:48:32 -08:00
Jim Abramson
707f6388f4 Merge pull request #2344 from edx/jsa/forums-new-thread-attrs
Allow new response pagination parameters to pass through thread model.
2014-01-29 11:48:12 -08:00
Calen Pennington
ce19f2887c Merge pull request #2294 from cpennington/language-dark-launch
Add the ability to dark-launch languages
2014-01-29 10:52:06 -08:00
Calen Pennington
271fbdb40a Switch dark_lang to database backed configuration 2014-01-29 13:24:41 -05:00
jorr-at-google
87aa71c450 Merge pull request #2309 from edx/jorr/feature/use-xblock-publish-api
Use the publish() api from xblock.runtime.Runtime
2014-01-29 09:25:33 -08: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
polesye
642c239a01 Fix speed persistence per video. 2014-01-29 16:49:39 +02:00
Will Daly
021bece881 Merge pull request #2239 from edx/will/ora-ai-and-peer-tests
ORA AI and Peer acceptance tests
2014-01-29 06:28:39 -08:00
Calen Pennington
d379b35fa9 Add config_model, a library for database backed configuration
ConfigurationModels can be managed using the admin site. They are
append-only, and track the user who is making the change, and the time
that the change was made. The configuration is stored in the database,
and cached for performance.

[LMS-1220]
2014-01-29 09:17:19 -05:00
Calen Pennington
881e3ba564 Add the ability to dark-launch languages
To mark a language as dark-launched, add it to the DARK_LANGUAGES
django conf setting. To activate a dark-launched language, set he
query parameter `preview-lang` to the language code on any url.

[LMS-2045]
[LMS-2077]
[LMS-2076]
2014-01-29 09:16:16 -05: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
daniel cebrian
38798b91c4 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.

Updating Annotator CSS

The change in the css keeps fonts as they were and does not change them
purely based on annotating a section.

Fixed Annotation issue with static_url oversight
2014-01-29 08:52:44 -05:00
jsa
40fcc6b9a5 Allow new response pagination parameters to pass through thread model.
JIRA: FOR-374
2014-01-28 17:24:37 -05:00
jorr
58c76afa9e Use the publish() api from xblock.runtime.Runtime 2014-01-28 14:16:34 -08:00
jsa
9b54abe308 add "Add A Response" button to thread views in discussion tab / inline
JIRA: FOR-373
2014-01-28 17:13:16 -05:00
davestgermain
b18945d1cf Merge pull request #2332 from edx/dstgermain/a11y-html-lang
Set the HTML language to the browser's specified language
2014-01-28 13:44:21 -08:00
Dave St.Germain
6d50ff7b61 Set the html language to the browser's specified language 2014-01-28 16:43:29 -05:00
Will Daly
b73c6f63fc Added stub XQueue server to bok_choy test suite.
Added feedback check for AI-assessment test

Added peer assessment feedback test
2014-01-28 14:57:28 -05:00
David Ormsbee
6e6a1d5021 Only create loc_cache CACHE entry if it doesn't exist in ENV_TOKENS config. 2014-01-28 12:30:38 -05:00
David Ormsbee
ee5ee92b37 Create local memory caching entry for location mapping. 2014-01-28 10:57:15 -05:00
Waheed Ahmed
a7d3a23f1b Merge pull request #2192 from edx/waheed/ora249-flash-of-text-on-staff-grading
Flash of text appears when instructor goes to staff grading fixed.
2014-01-28 04:11:12 -08:00
Waheed Ahmed
4f1fd229fe Flash of text appears when instructor goes to staff grading fixed.
ORA-249
2014-01-28 16:07:08 +05:00
Waheed Ahmed
d5cadf0008 Really large posts to ORA like peer grading feedback fixed.
ORA-201
2014-01-28 15:50:16 +05:00
Dave St.Germain
e738cc073d settings for i18n and debug toolbar on devstack 2014-01-27 16:14:18 -05:00
Dave St.Germain
cc31695764 settings for i18n and debug toolbar on devstack 2014-01-27 15:53:26 -05:00
Diana Huang
b67a3a8ab6 Merge pull request #2322 from edx/diana/linkedin-type
Fix a typo in the LinkedIn e-mail.
2014-01-27 12:01:32 -08:00
Christina Roberts
cd7f1d92a1 Merge pull request #2299 from lduarte1991/master
Text and Video Annotation Modules - First Iteration
2014-01-27 11:18:32 -08:00
Diana Huang
373244b094 Fix a typo in the LinkedIn e-mail. 2014-01-27 14:06:27 -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
Giulio Gratta
78c85ea3b2 Merge pull request #2308 from edx/giulio/fix-error-msg-typo
Fixed all instances of "occured" typo
2014-01-27 10:46:13 -08:00
polesye
b8eba4192c BLD-699: Fix i18n. 2014-01-27 07:49:22 +02:00
Giulio Gratta
0429ba7da3 Fixed all instances of "occured" typo 2014-01-24 16:13:26 -08:00
Joe Blaylock
e263b33f17 Merge pull request #2227 from edx/jrbl/fix_cert_whitelist_report
Certs - bugfix cert_whitelist output
2014-01-24 15:11:37 -08:00