Commit Graph

2101 Commits

Author SHA1 Message Date
Waheed Ahmed
4f1fd229fe Flash of text appears when instructor goes to staff grading fixed.
ORA-249
2014-01-28 16:07:08 +05: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
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
polesye
b8eba4192c BLD-699: Fix i18n. 2014-01-27 07:49:22 +02:00
David Ormsbee
42e0ec403e Merge pull request #2251 from edx/release
Merging Release 2014-01-21
2014-01-21 12:41:05 -08:00
Diana Huang
ed64817644 Use correct linkedin button. 2014-01-16 17:03:15 -05:00
Greg Price
f8732a8b3d Internationalize the forums post Markdown editor
This includes removing the "PREVIEW" label for the preview pane from CSS
and adding it to the generated DOM.
2014-01-16 14:10:51 -05:00
Greg Price
0f09a3093e Internationalize our use of jquery.timeago
Also get rid of an unused template and extra copies of jquery.timeago.
2014-01-15 16:46:38 -05:00
Greg Price
3c3ef50e13 Merge pull request #2168 from edx/gprice/forum-coffee-i18n
Internationalize forums CoffeeScript code
2014-01-14 10:55:08 -08:00
Greg Price
a1dc49cc9b Remove defunct forum post tagging code 2014-01-14 13:03:56 -05:00
Brian Talbot
3faf7456b9 Merge pull request #2159 from edx/talbs/lms-fix-certificate-button
LMS: FIX - Add Styling Back to Certificate Download Button
2014-01-14 09:59:16 -08:00
Chris Rossi
831f907c79 Add individual due dates feature.
Adds a feature to the edX platform which allows instructors to set
individual due dates for students on particular coursework. This code is
meant primarily for on-campus use--it is not intended that this feature
would be used for MOOCs. It adds a new tab, "Extensions", to the beta
instructor dashboard which allows changing due dates per student. This
feature is enabled by setting FEATURES['INDIVIDUAL_DUE_DATES'] = True.
2014-01-14 10:19:02 -05:00
Brian Talbot
fd94be6a01 LMS: resolves missing certificate download button styling
* adds in Sass placeholder to mirror older/inherited button styling used in LMS
* uses light theming Sass variables for button styling
* adds specific selector for certificate download button
2014-01-13 16:26:36 -05:00
Usman Khalid
76f4eaf947 Merge pull request #2068 from edx/usman/lms1584-edge-home-page
Fix register button on edge
2014-01-10 11:01:44 -08:00
David Baumgold
85453f703e Fix theme issues in Sass preprocessing 2014-01-10 10:40:09 -05:00
Usman Khalid
a336ae7df6 edge.html inherits from main.html
LMS-1584
2014-01-10 17:29:24 +05:00
Sarina Canelake
674670b687 Remove unused image files from old website 2014-01-09 12:04:35 -05:00
Greg Price
afaa463f7f Merge pull request #2093 from edx/gprice/forum-vote-button-a11y
Improve accessibility of forum vote buttons
2014-01-07 10:54:17 -08:00
frances botsford
1adc4fe253 Merge pull request #2092 from tusbar/course-bottom-university-span
Use <span> for course preview’s university #os
2014-01-07 08:24:33 -08:00
Bertrand Marron
ac1eed4102 Remove hover state on university name in course preview 2014-01-07 11:25:14 +01:00
Greg Price
d4f7cd68d8 Remove redundant URI.min.js fron lms/
A newer version was added to common/, so that is used instead. It is
also added to the set of JS files used in unit tests to allow forums
code in common/ to be tested.
2014-01-06 17:02:31 -05:00
Ned Batchelder
2157b4d8b7 Miscellaneous fixes to strings found during i18n work. 2014-01-03 17:50:16 -05:00
Brian Talbot
fcda913691 LMS: adds in developer-centric Sass file
* provides new .scss file for developers to add temporary/in-progress Sass for further refactor/polish
* cleans up note/import order in all application scss files
2014-01-03 13:52:13 -05:00
polesye
b6808d3d13 BLD-541: Fix video controls on iPad. 2013-12-24 14:59:20 +02:00
Brian Talbot
64fc9cdce8 LMS: changing Open Sans font reference
* uses Google Web Fonts reference rather than local files
* removes unused local font files
* adds in semi-bold weight support
2013-12-17 15:53:02 -05:00
polesye
6e01ce50c9 Add unit tests. 2013-12-17 13:22:08 +02:00
Greg Price
c84164510e Merge pull request #1882 from edx/gprice/remove-moderator-toggle
Remove forum user profile moderator toggle button
2013-12-10 07:40:39 -08:00
Greg Price
8f9f3bb914 Merge pull request #1883 from edx/gprice/markdown-button-keypress
Activate Markdown editor buttons on keypress
2013-12-10 07:38:15 -08:00
Greg Price
cec58f885b Remove forum user profile moderator toggle button
This button has been broken for at least a year, so the code has
suffered from bit rot and should be reimplmemented if the feature is
necessary in the short term (which is unlikely since it has been broken
for so long).
2013-12-09 10:23:21 -05:00
Greg Price
b5eeef01a0 Activate Markdown editor buttons on keypress
The buttons now activate on pressing space or enter.

JIRA: FOR-66
2013-12-06 14:51:43 -05:00
David Baumgold
03d7d0e952 more i18n work 2013-12-05 14:03:02 -05:00
David Baumgold
6af8ecef03 mitx_markdown => edx_markdown 2013-12-04 10:23:47 -05:00
polesye
0dbb7603fb BLD-533: Improve calculator's tooltip accessibility. 2013-12-02 09:56:24 +02:00
Jay Zoldak
a56b9457a0 Rebase to re-prepare PR 2013-11-26 17:04:19 -05:00
Jay Zoldak
341875bb18 Remove code related to Pearson Testing Centers 2013-11-26 17:04:19 -05:00
Jason Bau
f94565d699 Merge pull request #1685 from edx/jbau/shopping-cart/report
CSV Reporting of Shopping Cart Purchases, with tests
2013-11-26 11:45:59 -08:00
Brian Talbot
d2a2aaa716 LMS: adds in collapse/expand UI for dashboard view upsell 2013-11-25 16:40:32 -05:00
Ned Batchelder
cccd61ebf3 Make remaining dialogs in wiki accessible.
All the dialogs in the wiki are now accessible to screen readers.

Also, the "Switch to selected version" button did the odd thing of
reloading the page with the new version selected, but inside a dialog.
That is now fixed.

The merge dialog has a warning that looks kind of funky still, but you
can read it, unlike the previous code.

LMS-1337
2013-11-25 16:05:05 -05:00
Ned Batchelder
9a106a32d5 Merged master to rc/2013-11-21 2013-11-25 14:56:09 -05:00
Sarina Canelake
e2423386cb UX for Data Download tab on instructor dash
Restrict grade report generation to 'is_superuser' users (can be overridden with
feature flag ALLOW_COURSE_STAFF_GRADE_DOWNLOADS); all staff users can download
generated files.

LMS-58
2013-11-22 10:06:22 -05:00
David Ormsbee
e0aa8cf78a Grade report celery task and direct file push to S3 from the new instructor dashboard.
Hook up display of grade files ready for download to new instructor dashboard.

LMS-58
2013-11-22 10:06:10 -05:00
polesye
b7438bc9a4 BLD-400: Update the calculator hints tooltip. 2013-11-22 12:18:52 +02:00
Greg Price
89924c5e61 Alert users when forum AJAX requests fail
AJAX requests on forums pages occasionally fail (usually when a request
to the comments service times out), but the user is not made aware of
the failure. This manifests as either the system not appearing to store
state (e.g. if an attempt to flag a post fails) or something taking
forever to load. Now, a modal will pop up to alert the user that a
request has failed and instruct them to reload the page.

In the longer term, we should fix each user gesture that results in an
AJAX call to gracefully handle a failure by resetting the state of the
world appropriately and aleritng the user.

JIRA: FOR-37
2013-11-19 09:55:49 -05:00
Jason Bau
c8a98051dd CSV Reporting of Shopping Cart Purchases, with tests
squashing to one commit to make cherry-picking by feature possible
2013-11-18 14:45:41 -08:00
dcadams
ddd9e0e451 Merge pull request #1643 from edx/dcadams/fix_invitation_emails
Email port to beta dash and new option for shibboleth courses
2013-11-15 13:49:36 -08:00
David Adams
ed980f2189 Port of invitation/enroll/unenroll email functionality
into beta dashboard.

Also includes new functionality, in both legacy and beta
dashboard, to include appropriate email text for a
Shibboleth course.
2013-11-15 10:10:04 -08:00
Julia Hansbrough
45e80f7eee Removed unused code 2013-11-13 20:57:19 +00:00
Julia Hansbrough
5a572bc0dd Fixed bug where Flash photo taker would fail
LMS-1487
2013-11-13 20:42:19 +00:00
Giulio Gratta
5c0c7ba6bb Merge pull request #1560 from edx/giulio/a11y-user-menu
User menu a11y changes to allow use of spacebar, escape key and arrows to navigate
2013-11-04 08:53:46 -08:00
Diana Huang
0018568799 Merge pull request #1555 from edx/diana/certs-reverification-path
Verified Certificate Reverification Path
2013-11-04 08:31:56 -08:00