Commit Graph

2224 Commits

Author SHA1 Message Date
Renzo Lucioni
0bf02cabff Fix for the failing acceptance tests 2013-06-19 16:48:25 -04:00
Brian Wilson
fd206a4128 Make sure InstructorTask is committed. 2013-06-18 15:07:15 -04:00
Brian Wilson
77032067ac Refactor test_views from test_api. Pull out pending_tasks.js. 2013-06-18 11:19:25 -04:00
Brian Wilson
eb1fe899e8 Fix progress reporting. 2013-06-18 11:17:17 -04:00
Brian Wilson
b224f4e8cc move test_tasks to test_integration. 2013-06-18 11:17:16 -04:00
Brian Wilson
d2b3977f57 Add dogstat logging to background tasks. 2013-06-18 11:13:55 -04:00
Brian Wilson
c676cfd64a Rename fields in CourseTaskLog, including a task_key column for indexing. Use 'rescore' instead of 'regrade'. Clean up task submission. 2013-06-18 11:13:19 -04:00
Brian Wilson
6cd23875ea Remove delete button from instructor dash. (Also remove last-modified
column from task-in-progress table).
2013-06-18 11:11:34 -04:00
Brian Wilson
0d38789a1d Add additional background tasks: reset attempts, delete state. Update
CourseTaskLog fully after task submission, so it works in Eager mode
(for testing).
2013-06-18 11:05:33 -04:00
Brian Wilson
7711c00e2c Pull task_queue.py methods out from tasks.py, to represent API calls
from client.  Tasks.py remains the task implementations running on the
celery worker.

In particular, move status message generation out of task thread to client side.
2013-06-18 11:04:05 -04:00
Brian Wilson
d503e3313f Add task progress table to instructor dash.
Add call to MakoMiddleware() to initialize templates in celery worker server.

Pass task_ids by POST properties (as a list) to collect task progress status.
2013-06-18 11:04:05 -04:00
Brian Wilson
91ac6e68e8 Define initial celery task on instructor dash.
Add CourseTaskLog, and make calls to regrading.

Add regrading implementation, and hack the marshalling of request.
2013-06-18 11:04:05 -04:00
Valera Rozuvan
72d7c9ca97 Moved the definition of autoplay attribute to videoalpha_module.py file. Changed double negative if statement for autoplay check to simple if. 2013-06-14 11:12:32 +03:00
Valera Rozuvan
66e106a9e2 Copied autoplay attribute from video xmoudle to videoalpha. Now students will have the video autoplaying, and in Studio it will be pause by default. 2013-06-14 11:12:32 +03:00
Renzo Lucioni
d136fdac9a added comment to make clear that leaving the variable analytics outside of the feature flag block is intentional 2013-06-13 11:35:26 -04:00
Renzo Lucioni
8508e3f647 dummy object creation without conditionals 2013-06-13 11:35:26 -04:00
Diana Huang
58d561ac8e Merge pull request #126 from edx/diana/fix-display-text
Fix typo and an unclear description.
2013-06-11 14:36:06 -07:00
Diana Huang
f79d1e215a Fix some typos and unclear descriptions. 2013-06-11 16:48:11 -04:00
caesar2164
646e2bd486 Merge pull request #93 from edx/giulio/accessibility
A number of important accessibility changes
2013-06-11 08:38:53 -07:00
Brian Talbot
443a50845a lms - adds back in missing/previously added .sr screen reader-focused styling and references in place of the .visuallyhidden application 2013-06-10 16:22:21 -07:00
Brian Talbot
8e30981f6f revises the show/hide answer input to use an HTML button element for accessibility purposes 2013-06-10 16:22:14 -07:00
Giulio Gratta
7390b517f0 required labels, active accordion item, move previous arrow to before unit sequence 2013-06-10 16:22:14 -07:00
Giulio Gratta
70332f897b courseware active location, suppress browser form validation, and progress graph accessibilit changes 2013-06-10 16:22:13 -07:00
Giulio Gratta
2cad6fe261 user button and menu accessiblity hidden span addition 2013-06-10 16:22:13 -07:00
Greg Price
ca8927ed67 Tweak text in help modal per request from Mary 2013-06-10 18:01:44 -04:00
Greg Price
7be6880fd2 Add course id tagging to feedback submissions 2013-06-10 18:01:44 -04:00
Greg Price
17647abd5c Add datadog reporting to the feedback submission mechanism 2013-06-10 18:01:43 -04:00
dcadams
0b4e03e8bc Merge pull request #66 from edx/feature-dcadams-usermanagement
Feature user-management autoenroll
2013-06-10 10:10:57 -07:00
Greg Price
2c29481611 Merge pull request #106 from edx/release
Merge hotfix-2013-06-07
2013-06-07 08:05:58 -07:00
Greg Price
625a9581eb Fix XSS vulnerability in instructor dashboard 2013-06-07 10:23:03 -04:00
Valera Rozuvan
d9651d7497 GST fixes. Removed red error messages preseneted to the user. The errors are now displayed when a flag is turned on. Added graphical_slider_tool tag to the list which shows staff debug info. 2013-06-07 16:12:50 +03:00
Alexander Kryklia
d6c772c5aa adds missed } 2013-06-06 14:48:41 -04:00
Brian Talbot
d3965cb3ee removes redundant h2 heading and syncs up h1 value (with broken mak/template syntax) for register view 2013-06-06 14:48:40 -04:00
Victor Shnayder
4ffe3c51b5 Adds segment-io integration into the LMS
Tell segment IO whenever a page is loaded.  Once this works, we
can add more detailed instrumentation for events we care about.

Will be turned off in prod until the SEGMENT_IO_LMS feature flag is
set to True and a SEGMENT_IO_LMS_KEY is set.
2013-06-06 11:34:03 -04:00
dcadams
bc5d792338 Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-06-05 15:14:48 -07:00
Victor Shnayder
97c788a33a Merge pull request #78 from edx/victor/fix-help-button
Re-insert "if in course" check for displaying paragraph about forums.
2013-06-05 13:04:55 -07:00
Victor Shnayder
1b81d06337 Re-insert "if in course" check for displaying paragraph about forums.
Accidentally got removed in pull request 13.
2013-06-05 16:04:21 -04:00
Nate Hardison
4ea6692e11 Change if ... is not None to if ...
Minor stylistic tweak.
2013-06-05 10:56:24 -07:00
Nate Hardison
2640ab49e0 Stanfordize LMS emails
Adjust language of LMS emails to work specifically for Stanford. Here
there be dragons: lots of ugly conditionals that will need to be
changed once we develop a way to "theme" arbitrary strings throughout
the site.
2013-06-05 10:27:25 -07:00
Nate Hardison
adf9dd3d35 Make email change templates use main layout
Update the email change templates to fit with the rest of the main
site and use the standard notification template. Now they're far
prettier than before.
2013-06-05 10:27:25 -07:00
Nate Hardison
2c90948623 Use settings in LMS emails, not hardcoded values
Instead of hardcoding things like the platform name, use the
corresponding overrideable settings instead. This allows themes to
control emails as well.
2013-06-05 10:27:25 -07:00
Nate Hardison
940888da37 Use bugs email from settings, not hardcoded value 2013-06-05 10:27:25 -07:00
Nate Hardison
2ab00eefa7 Use the contact email setting instead of if/else
Remove the Stanford-specific if/else hack to set the appropriate
contact email address and use the `CONTACT_EMAIL` setting instead.
2013-06-05 10:27:24 -07:00
Nate Hardison
799d56d028 Theme static error pages
Reference the `PLATFORM_NAME` and `TECH_SUPPORT_EMAIL` settings in
the static error pages instead of hardcoded, edX-specific values.
2013-06-05 10:27:24 -07:00
Nate Hardison
d79f064248 Fix forgot password modal for theming
Use the `PLATFORM_NAME` setting instead of "edX"
2013-06-05 10:27:23 -07:00
Nate Hardison
f25fdebe67 Theme the authenticated index view
Much like the work done on the default (unauthenticated) index view,
adjust the background image (actually, let the CSS handle it instead
of an embedded `style` attribute in the HTML). Other adjustments
(language, logo) are made for Stanford specifically and need to be
reworked for general theming.
2013-06-05 10:27:23 -07:00
Nate Hardison
dc8bd32fb2 Theme the individual course about pages
Use the theme's own Google Analytics template (should probably
update to just use parameters once the default GA template is kept
up-to-date). Don't link to the university profile page when a theme
is enabled, as that's an edX-specific feature. Adjust social links
for Stanford, but leave them alone for everyone else (this is just
a hack for the 6/11/13 launch).
2013-06-05 10:27:23 -07:00
Nate Hardison
227271fec6 Theme the courseware dashboard
Again, most of the work here is replacing "edX" with the
`PLATFORM_NAME` setting. Need to ensure that the `news` boolean is
indeed a falsy value as well, or just add a `theme_enabled()` test
to disable the news block entirely (since news is an edX-specific
feature).
2013-06-05 10:27:23 -07:00
Nate Hardison
90ebb4c836 Theme the login page
As with the registration page, the bulk of the theming work here is
replacing instances of "edX" with the `PLATFORM_NAME` setting. There
is also a change to the "help" section, disabling it if the FAQ
marketing link isn't set.
2013-06-05 10:27:22 -07:00
Nate Hardison
8c19b0c98b Theme the base registration page
This mostly involves rewriting all mentions of "edX" to reference the
`PLATFORM_NAME` setting instead. However, there are also some
Stanford-specific rewrite hacks that need to be pulled out
eventually. Additionally, don't display links to marketing pages (or
the sections referencing those marketing pages) if the links are not
defined by the theme.
2013-06-05 10:27:22 -07:00